From 1eb37aaa0382e05e687e666d8934826ee1aeb6de Mon Sep 17 00:00:00 2001 From: Roland Levillain Date: Wed, 15 Sep 2021 16:47:30 +0000 Subject: Revert "Add standalone ART gtests to `TEST_MAPPING` group `mainline-presubmit`." This reverts commit 506b64c3b001dc32c59b8e63ce2e6d6cf4451fcb. Reason for revert: Some standalone ART gtests are failing in presubmits when built from sources where the Oat file version has been updated -- compared to current prebuilt ART APEXes -- and run against such a prebuilt ART APEX, that does not include that Oat version change. Test: Rely on TreeHugger presubmits Bug: 193218514 Bug: 152379281 Bug: 194403904 Change-Id: I6166e7146a4bd07fce8acde381caa9a741ecc254 Merged-In: Ibfcf212a4bc3094ca74f8f3c0f98469810c6ea19 --- TEST_MAPPING | 51 --------------------------------------------- test/utils/regen-test-files | 11 ++++------ 2 files changed, 4 insertions(+), 58 deletions(-) diff --git a/TEST_MAPPING b/TEST_MAPPING index 3c07c656b4..fba7a0be70 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1128,57 +1128,6 @@ }, { "name": "art-run-test-963-default-range-smali[com.google.android.art.apex]" - }, - { - "name": "art_standalone_cmdline_tests[com.google.android.art.apex]" - }, - { - "name": "art_standalone_compiler_tests[com.google.android.art.apex]" - }, - { - "name": "art_standalone_dex2oat_tests[com.google.android.art.apex]" - }, - { - "name": "art_standalone_dexdump_tests[com.google.android.art.apex]" - }, - { - "name": "art_standalone_dexlist_tests[com.google.android.art.apex]" - }, - { - "name": "art_standalone_dexoptanalyzer_tests[com.google.android.art.apex]" - }, - { - "name": "art_standalone_libartbase_tests[com.google.android.art.apex]" - }, - { - "name": "art_standalone_libartpalette_tests[com.google.android.art.apex]" - }, - { - "name": "art_standalone_libdexfile_support_tests[com.google.android.art.apex]" - }, - { - "name": "art_standalone_libdexfile_tests[com.google.android.art.apex]" - }, - { - "name": "art_standalone_libprofile_tests[com.google.android.art.apex]" - }, - { - "name": "art_standalone_oatdump_tests[com.google.android.art.apex]" - }, - { - "name": "art_standalone_odrefresh_tests[com.google.android.art.apex]" - }, - { - "name": "art_standalone_profman_tests[com.google.android.art.apex]" - }, - { - "name": "art_standalone_runtime_compiler_tests[com.google.android.art.apex]" - }, - { - "name": "art_standalone_runtime_tests[com.google.android.art.apex]" - }, - { - "name": "art_standalone_sigchain_tests[com.google.android.art.apex]" } ], "presubmit": [ diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files index 3fe9bac545..0341cf5cd7 100755 --- a/test/utils/regen-test-files +++ b/test/utils/regen-test-files @@ -636,12 +636,10 @@ class Generator: run_test_module_names = [ART_RUN_TEST_MODULE_NAME_PREFIX + t for t in art_run_tests] # Mainline presubmits. - mainline_presubmit_run_tests = run_test_module_names[0:num_mainline_presubmit_run_tests] - mainline_presubmit_tests = mainline_presubmit_run_tests + art_gtest_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_run_tests = [t + "[com.google.android.art.apex]" + for t + in run_test_module_names[0:num_mainline_presubmit_run_tests]] + mainline_presubmit_tests_dict = [{"name": t} for t in mainline_presubmit_run_tests] # Presubmits. other_presubmit_tests = [ @@ -943,7 +941,6 @@ class Generator: for (num_tests, test_kind, tests_percentage, test_group_name) in [ (num_mainline_presubmit_run_tests, "ART run-tests", mainline_presubmit_tests_percentage, "mainline-presubmit"), - (len(art_gtest_module_names), "ART gtests", 100, "mainline-presubmit"), (num_presubmit_run_tests, "ART run-tests", presubmit_tests_percentage, "presubmit"), (len(art_gtest_module_names), "ART gtests", 100, "presubmit"), (num_postsubmit_tests, "ART run-tests", postsubmit_tests_percentage, "postsubmit"), -- cgit v1.2.3