diff options
| author | 2023-02-14 16:29:18 +0000 | |
|---|---|---|
| committer | 2023-02-14 18:15:09 +0000 | |
| commit | bd8aef872c53e61881376ac670f0cb431b8b06fa (patch) | |
| tree | 17fb4e6f55c7079cbefab54fc1570246288ffb4f | |
| parent | c2663420c131a563e47ed4421dbc0df434805baa (diff) | |
Revert "Temporarily disable ART gtests failing with ART module prebuilts."
This reverts regen-test-files from commit 9587cc51 and reruns
art/test/utils/regen-test-files:
Generated Blueprint files for 705 ART run-tests out of 991 (71%).
Generated TEST_MAPPING entries for 439 ART run-tests out of 991 (44%):
439 ART run-tests (100%) in `mainline-presubmit` test group.
22 ART gtests (100%) in `mainline-presubmit` test group.
439 ART run-tests (100%) in `presubmit` test group.
22 ART gtests (100%) in `presubmit` test group.
Commit 9587cc51 originates from http://ag/19717164 which had RESTRICT
AUTOMERGE and wasn't intended to go into AOSP.
Merged-In set from http://ag/21402860 to restrict automerge
appropriately.
Test: Presubmits
Bug: 243510263
Bug: 243507635
Change-Id: I74f2f1ab9daf48e391b80c403758d49119723614
Merged-In: I28d484e35093dca89f63aba5cc08ad8da4bad5f5
| -rw-r--r-- | TEST_MAPPING | 18 | ||||
| -rwxr-xr-x | test/utils/regen-test-files | 6 |
2 files changed, 20 insertions, 4 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING index 81535d3fe0..dd9f9ae55a 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1339,6 +1339,9 @@ ] }, { + "name": "art_standalone_dex2oat_tests[com.google.android.art.apex]" + }, + { "name": "art_standalone_dexdump_tests[com.google.android.art.apex]" }, { @@ -1348,6 +1351,9 @@ "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]", "options": [ { @@ -2741,6 +2747,9 @@ "name": "art_standalone_compiler_tests" }, { + "name": "art_standalone_dex2oat_tests" + }, + { "name": "art_standalone_dexdump_tests" }, { @@ -2750,6 +2759,9 @@ "name": "art_standalone_dexoptanalyzer_tests" }, { + "name": "art_standalone_libartbase_tests" + }, + { "name": "art_standalone_libartpalette_tests" }, { @@ -4132,6 +4144,9 @@ "name": "art_standalone_compiler_tests" }, { + "name": "art_standalone_dex2oat_tests" + }, + { "name": "art_standalone_dexdump_tests" }, { @@ -4141,6 +4156,9 @@ "name": "art_standalone_dexoptanalyzer_tests" }, { + "name": "art_standalone_libartbase_tests" + }, + { "name": "art_standalone_libartpalette_tests" }, { diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files index f21cfbfc75..05dc35e2ec 100755 --- a/test/utils/regen-test-files +++ b/test/utils/regen-test-files @@ -226,12 +226,10 @@ art_gtest_user_module_names = [ "art_standalone_artd_tests", "art_standalone_cmdline_tests", "art_standalone_compiler_tests", - # Temporarily disable this test as it is failing with ART module prebuilts (see b/243510263). - ### "art_standalone_dex2oat_tests", + "art_standalone_dex2oat_tests", "art_standalone_dexdump_tests", "art_standalone_dexlist_tests", - # Temporarily disable this test as it is failing with ART module prebuilts (see b/243507635). - ### "art_standalone_libartbase_tests", + "art_standalone_libartbase_tests", "art_standalone_libartpalette_tests", "art_standalone_libartservice_tests", "art_standalone_libarttools_tests", |