summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TEST_MAPPING18
-rwxr-xr-xtest/utils/regen-test-files6
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",