Disable some ART gtests due to code-vs-test mismatches.
Disable the following tests cases and regenerate ART's Test Mapping file:
* `art_standalone_dexpreopt_tests.DexpreoptTest#ForSystemServer`
* `art_standalone_runtime_tests.OatFileAssistantUtilsTest#DexLocationToOdexFilename`
These tests started to fail in branch `udc-qpr-dev` when the pre-built
ART Module was updated with the version from the M-2023-10 train
(ag/25488923), but the test sources were not updated accordingly.
Output of `art/test/utils/regen-test-files`:
$ art/test/utils/regen-test-files
Generated Blueprint files for 716 ART run-tests out of 1003 (71%).
Generated TEST_MAPPING entries for 445 ART run-tests out of 1003 (44%):
445 ART run-tests (100%) in `mainline-presubmit` test group.
22 ART gtests (100%) in `mainline-presubmit` test group.
445 ART run-tests (100%) in `presubmit` test group.
22 ART gtests (100%) in `presubmit` test group.
Test: atest --test-mapping art:mainline-presubmit
Test: atest --test-mapping art:presubmit
Test: atest --test-mapping art:hwasan-presubmit
Test: atest --test-mapping art:avf-presubmit
Bug: 316207823
Ignore-AOSP-First: Change intended for udc-qpr-dev
Change-Id: I9e2bdf61d9a1edea4f37da91acdf7301d89f1c47
Merged-In: I55666dfab34351c9c38dbe7366acd53a72971af7
diff --git a/TEST_MAPPING b/TEST_MAPPING
index d9d5431..28216d5 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1398,7 +1398,12 @@
"name": "art_standalone_profman_tests[com.google.android.art.apex]"
},
{
- "name": "art_standalone_runtime_tests[com.google.android.art.apex]"
+ "name": "art_standalone_runtime_tests[com.google.android.art.apex]",
+ "options": [
+ {
+ "exclude-filter": "OatFileAssistantUtilsTest#DexLocationToOdexFilename"
+ }
+ ]
},
{
"name": "art_standalone_sigchain_tests[com.google.android.art.apex]"
@@ -1424,7 +1429,12 @@
"name": "art-apex-update-rollback"
},
{
- "name": "art_standalone_dexpreopt_tests"
+ "name": "art_standalone_dexpreopt_tests",
+ "options": [
+ {
+ "exclude-filter": "DexpreoptTest#ForSystemServer"
+ }
+ ]
},
{
"name": "art-run-test-001-HelloWorld"
@@ -2813,7 +2823,12 @@
"name": "art_standalone_profman_tests"
},
{
- "name": "art_standalone_runtime_tests"
+ "name": "art_standalone_runtime_tests",
+ "options": [
+ {
+ "exclude-filter": "OatFileAssistantUtilsTest#DexLocationToOdexFilename"
+ }
+ ]
},
{
"name": "art_standalone_sigchain_tests"
@@ -2833,7 +2848,12 @@
"name": "art-apex-update-rollback"
},
{
- "name": "art_standalone_dexpreopt_tests"
+ "name": "art_standalone_dexpreopt_tests",
+ "options": [
+ {
+ "exclude-filter": "DexpreoptTest#ForSystemServer"
+ }
+ ]
},
{
"name": "art-run-test-001-HelloWorld"
@@ -4222,7 +4242,12 @@
"name": "art_standalone_profman_tests"
},
{
- "name": "art_standalone_runtime_tests"
+ "name": "art_standalone_runtime_tests",
+ "options": [
+ {
+ "exclude-filter": "OatFileAssistantUtilsTest#DexLocationToOdexFilename"
+ }
+ ]
},
{
"name": "art_standalone_sigchain_tests"
diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files
index d047c23..a926ba8 100755
--- a/test/utils/regen-test-files
+++ b/test/utils/regen-test-files
@@ -296,6 +296,13 @@
]
}
+# Tests failing because of code-vs-test mismatches (see b/316207823),
+# excluded from all test mapping test groups.
+failing_tests_excluded_from_test_mapping = {
+ "art_standalone_dexpreopt_tests" : ["DexpreoptTest#ForSystemServer"],
+ "art_standalone_runtime_tests" : ["OatFileAssistantUtilsTest#DexLocationToOdexFilename"],
+}
+
# Tests failing because of linking issues, currently exluded from MTS
# and Mainline Presubmits to minimize noise in continuous runs while
# we investigate.
@@ -307,6 +314,11 @@
"art_standalone_libartpalette_tests": ["PaletteClientJniTest*"],
}
+failing_tests_excluded_from_mainline_presubmits = (
+ failing_tests_excluded_from_test_mapping |
+ failing_tests_excluded_from_mts_and_mainline_presubmits
+)
+
# Is `run_test` a Checker test (i.e. a test containing Checker
# assertions)?
def is_checker_test(run_test):
@@ -585,25 +597,34 @@
run_test_module_names = [ART_RUN_TEST_MODULE_NAME_PREFIX + t for t in art_run_tests]
+ def gen_tests_dict(tests, excluded_test_cases = {}, excluded_test_modules = [], suffix = ""):
+ return [
+ ({"name": t + suffix,
+ "options": [
+ {"exclude-filter": e}
+ for e in excluded_test_cases[t]
+ ]}
+ if t in excluded_test_cases
+ else {"name": t + suffix})
+ for t in tests
+ if t not in excluded_test_modules
+ ]
+
# Mainline presubmits.
mainline_presubmit_apex_suffix = "[com.google.android.art.apex]"
mainline_other_presubmit_tests = []
mainline_presubmit_tests = (mainline_other_presubmit_tests + run_test_module_names +
art_gtests_mainline_presubmit_module_names)
- mainline_presubmit_tests_dict = [
- ({"name": t + mainline_presubmit_apex_suffix,
- "options": [
- {"exclude-filter": e}
- for e in failing_tests_excluded_from_mts_and_mainline_presubmits[t]
- ]}
- if t in failing_tests_excluded_from_mts_and_mainline_presubmits
- else {"name": t + mainline_presubmit_apex_suffix})
- for t in mainline_presubmit_tests
- ]
+ mainline_presubmit_tests_dict = \
+ gen_tests_dict(mainline_presubmit_tests,
+ failing_tests_excluded_from_mainline_presubmits,
+ [],
+ mainline_presubmit_apex_suffix)
# Android Virtualization Framework presubmits
avf_presubmit_tests = ["ComposHostTestCases"]
- avf_presubmit_tests_dict = [{"name": t} for t in avf_presubmit_tests]
+ avf_presubmit_tests_dict = gen_tests_dict(avf_presubmit_tests,
+ failing_tests_excluded_from_test_mapping)
# Presubmits.
other_presubmit_tests = [
@@ -614,9 +635,11 @@
"art_standalone_dexpreopt_tests",
]
presubmit_tests = other_presubmit_tests + run_test_module_names + art_gtest_module_names
- presubmit_tests_dict = [{"name": t} for t in presubmit_tests]
- hwasan_presubmit_tests_dict = [{"name": t} for t in presubmit_tests
- if t not in known_failing_on_hwasan_tests]
+ presubmit_tests_dict = gen_tests_dict(presubmit_tests,
+ failing_tests_excluded_from_test_mapping)
+ hwasan_presubmit_tests_dict = gen_tests_dict(presubmit_tests,
+ failing_tests_excluded_from_test_mapping,
+ known_failing_on_hwasan_tests)
# Use an `OrderedDict` container to preserve the order in which items are inserted.
# Do not produce an entry for a test group if it is empty.
