Temporarily exclude `JniCompilerTests` in in Mainline Presubmits.
Test cases `JniCompilerTests` from ART gtest
`art_standalone_compiler_tests` are currently failing because of
linking issues on configurations where the copies of `libunwindstack`
in the non-Mainline-updatable Android platform and in the ART Mainline
Module differ (see b/247108425).
This is currently affecting Mainline Presubmit runs. Temporarily
exlude these test cases from this configuration to minimize noise in
automated runs while we investigate.
Output of `art/test/utils/regen-test-files`:
$ art/test/utils/regen-test-files
Generated Blueprint files for 675 ART run-tests out of 974 (69%).
Generated TEST_MAPPING entries for 415 ART run-tests out of 974 (42%):
415 ART run-tests (100%) in `mainline-presubmit` test group.
21 ART gtests (95%) in `mainline-presubmit` test group.
415 ART run-tests (100%) in `presubmit` test group.
22 ART gtests (100%) in `presubmit` test group.
Test: atest --test-mapping art:mainline-presubmit
Bug: 247108425
Change-Id: If0b2f246cf99b071d8aaf5efeb7d70fd2b732c6c
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 741e4d1..d63ad60 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1259,7 +1259,12 @@
"name": "art_standalone_cmdline_tests[com.google.android.art.apex]"
},
{
- "name": "art_standalone_compiler_tests[com.google.android.art.apex]"
+ "name": "art_standalone_compiler_tests[com.google.android.art.apex]",
+ "options": [
+ {
+ "exclude-filter": "JniCompilerTest*"
+ }
+ ]
},
{
"name": "art_standalone_dex2oat_tests[com.google.android.art.apex]"
diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files
index 76ccc79..718b772 100755
--- a/test/utils/regen-test-files
+++ b/test/utils/regen-test-files
@@ -296,13 +296,14 @@
]
# Tests failing because of linking issues, currently exluded from MTS
-# to minimize noise in continuous runs while we investigate.
+# and Mainline Presubmits to minimize noise in continuous runs while
+# we investigate.
#
# TODO(b/247108425): Address the linking issues and re-enable these
# tests.
-failing_tests_excluded_from_mts = [
- "art_standalone_compiler_tests JniCompilerTest*",
-]
+failing_tests_excluded_from_mts_and_mainline_presubmits = {
+ "art_standalone_compiler_tests": ["JniCompilerTest*"],
+}
# Is `run_test` a Checker test (i.e. a test containing Checker
# assertions)?
@@ -547,15 +548,22 @@
run_test_module_names = [ART_RUN_TEST_MODULE_NAME_PREFIX + t for t in art_run_tests]
# Mainline presubmits.
+ mainline_presubmit_apex_suffix = "[com.google.android.art.apex]"
mainline_other_presubmit_tests = [
"ComposHostTestCases",
]
mainline_presubmit_tests = (mainline_other_presubmit_tests + run_test_module_names +
art_gtests_mainline_presubmit_module_names)
- mainline_presubmit_tests_with_apex = [t + "[com.google.android.art.apex]"
- for t
- in mainline_presubmit_tests]
- mainline_presubmit_tests_dict = [{"name": t} for t in mainline_presubmit_tests_with_apex]
+ 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
+ ]
# Presubmits.
other_presubmit_tests = [
@@ -744,8 +752,9 @@
# Excluded failing tests.
xml_comment = root.createComment(" Excluded failing tests (b/247108425). ")
configuration.appendChild(xml_comment)
- for t in failing_tests_excluded_from_mts:
- append_test_exclusion(t)
+ for module in failing_tests_excluded_from_mts_and_mainline_presubmits:
+ for testcase in failing_tests_excluded_from_mts_and_mainline_presubmits[module]:
+ append_test_exclusion(f"{module} {testcase}")
xml_str = root.toprettyxml(indent = XML_INDENT, encoding = "utf-8")