diff options
| -rw-r--r-- | test/089-many-methods/build.py | 28 | ||||
| -rw-r--r-- | test/089-many-methods/expected-stderr.txt | 0 | ||||
| -rw-r--r-- | test/089-many-methods/expected-stdout.txt | 0 | ||||
| -rwxr-xr-x | test/089-many-methods/generate-sources | 44 | ||||
| -rw-r--r-- | test/089-many-methods/info.txt | 2 | ||||
| -rw-r--r-- | test/089-many-methods/run.py | 20 | ||||
| -rw-r--r-- | test/knownfailures.json | 6 | ||||
| -rwxr-xr-x | test/run_test_build.py | 1 |
8 files changed, 0 insertions, 101 deletions
diff --git a/test/089-many-methods/build.py b/test/089-many-methods/build.py deleted file mode 100644 index 414d6de5fa..0000000000 --- a/test/089-many-methods/build.py +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright (C) 2022 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - -def build(ctx): - ctx.bash("./generate-sources") - # Specify old API level as d8 automagically produces a multidex file - # when the API level is above 20. Failing the build here is deliberate. - # Force DEX generation so test also passes with --jvm. - try: - ctx.default_build(api_level=20, need_dex=True) - except Exception as e: - # Check that a build failure happened (the test is not expected to run). - assert "Cannot fit requested classes in a single dex" in str(e), e - return - assert False, "Test was not expected to build successfully" diff --git a/test/089-many-methods/expected-stderr.txt b/test/089-many-methods/expected-stderr.txt deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/089-many-methods/expected-stderr.txt +++ /dev/null diff --git a/test/089-many-methods/expected-stdout.txt b/test/089-many-methods/expected-stdout.txt deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/089-many-methods/expected-stdout.txt +++ /dev/null diff --git a/test/089-many-methods/generate-sources b/test/089-many-methods/generate-sources deleted file mode 100755 index f38a025a93..0000000000 --- a/test/089-many-methods/generate-sources +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2008 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Stop if something fails. -set -e - -# Write out files with 65500 total static fields, instance fields, and methods -# to exceed the dex format's limits. -mkdir src -awk ' -BEGIN { - writeFileField("FillerStatic", "static public int staticInt"); - writeFileField("FillerField", "public int fieldInt"); - writeFileMethod("FillerMethod"); -} -function writeFileField(name, type) { - fileName = "src/" name ".java"; - printf("public class %s {\n", name) > fileName; - for (i = 1; i <= 65500; i++) { - printf(" %s%d;\n", type, i) > fileName; - } - printf("}\n") > fileName; -} -function writeFileMethod(name) { - fileName = "src/" name ".java"; - printf("public class %s {\n", name) > fileName; - for (i = 1; i <= 65500; i++) { - printf(" public void meth%d() { }\n", i) > fileName; - } - printf("}\n") > fileName; -}' diff --git a/test/089-many-methods/info.txt b/test/089-many-methods/info.txt deleted file mode 100644 index 4f73bd605b..0000000000 --- a/test/089-many-methods/info.txt +++ /dev/null @@ -1,2 +0,0 @@ -Test that we print a reasonable message when the application exceeds more -than 65536 methods. diff --git a/test/089-many-methods/run.py b/test/089-many-methods/run.py deleted file mode 100644 index ba0f83a740..0000000000 --- a/test/089-many-methods/run.py +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2021 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - -def run(ctx, args): - # Do nothing - the build intentionally failed. - pass diff --git a/test/knownfailures.json b/test/knownfailures.json index 07f061eb37..b980eacf1a 100644 --- a/test/knownfailures.json +++ b/test/knownfailures.json @@ -339,12 +339,6 @@ "variant": "optimizing | regalloc_gc" }, { - "tests": "089-many-methods", - "description": "The test tests a build failure", - "env_vars": {"ART_TEST_BISECTION": "true"}, - "variant": "optimizing | regalloc_gc" - }, - { "tests": ["018-stack-overflow", "116-nodex2oat", "118-noimage-dex2oat", diff --git a/test/run_test_build.py b/test/run_test_build.py index 6c3a21291b..c19b49b9df 100755 --- a/test/run_test_build.py +++ b/test/run_test_build.py @@ -49,7 +49,6 @@ USE_RBE = 100 # Percentage of tests that can use RBE (between 0 and 100) lock_file = None # Keep alive as long as this process is alive. RBE_D8_DISABLED_FOR = { - "089-many-methods", # D8 compilation intentionally fails. "952-invoke-custom", # b/228312861: RBE uses wrong inputs. "979-const-method-handle", # b/228312861: RBE uses wrong inputs. } |