diff options
| -rw-r--r-- | TEST_MAPPING | 12 | ||||
| -rw-r--r-- | test/055-enum-performance/Android.bp | 5 | ||||
| -rwxr-xr-x | test/utils/regen-test-files | 3 |
3 files changed, 3 insertions, 17 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING index 095baad00c..9bb66bf864 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -140,9 +140,6 @@ "name": "art-run-test-053-wait-some" }, { - "name": "art-run-test-055-enum-performance" - }, - { "name": "art-run-test-057-math-intrinsics" }, { @@ -1631,9 +1628,6 @@ "name": "art-run-test-053-wait-some[com.google.android.art.apex]" }, { - "name": "art-run-test-055-enum-performance[com.google.android.art.apex]" - }, - { "name": "art-run-test-057-math-intrinsics[com.google.android.art.apex]" }, { @@ -3137,9 +3131,6 @@ "name": "art-run-test-053-wait-some" }, { - "name": "art-run-test-055-enum-performance" - }, - { "name": "art-run-test-057-math-intrinsics" }, { @@ -4630,9 +4621,6 @@ "name": "art-run-test-053-wait-some" }, { - "name": "art-run-test-055-enum-performance" - }, - { "name": "art-run-test-057-math-intrinsics" }, { diff --git a/test/055-enum-performance/Android.bp b/test/055-enum-performance/Android.bp index b56c8d7db7..bb8e11d2ab 100644 --- a/test/055-enum-performance/Android.bp +++ b/test/055-enum-performance/Android.bp @@ -15,15 +15,12 @@ package { java_test { name: "art-run-test-055-enum-performance", defaults: ["art-run-test-defaults"], - test_config_template: ":art-run-test-target-template", + test_config_template: ":art-run-test-target-no-test-suite-tag-template", srcs: ["src/**/*.java"], data: [ ":art-run-test-055-enum-performance-expected-stdout", ":art-run-test-055-enum-performance-expected-stderr", ], - test_suites: [ - "mts-art", - ], } // Test's expected standard output. diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files index c7c32c401a..4e5a9723c2 100755 --- a/test/utils/regen-test-files +++ b/test/utils/regen-test-files @@ -97,7 +97,6 @@ LINT_BASELINE_FILENAME = "lint-baseline.xml" # when ignoring their `run` script), even if not exactly as they would # with the original ART run-test harness. runnable_test_exceptions = frozenset([ - "055-enum-performance", "059-finalizer-throw", "080-oom-throw", "133-static-invoke-super", @@ -133,6 +132,8 @@ known_failing_tests = frozenset([ "004-SignalTest", "004-UnsafeTest", "051-thread", + # 055-enum-performance is time sensitive and disabled in test.py + "055-enum-performance", "086-null-super", "087-gc-after-link", "136-daemon-jni-shutdown", |