summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TEST_MAPPING51
-rwxr-xr-xtest/utils/regen-test-files11
2 files changed, 58 insertions, 4 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING
index fba7a0be70..3c07c656b4 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1128,6 +1128,57 @@
},
{
"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 9e21d7b081..a285e78b1e 100755
--- a/test/utils/regen-test-files
+++ b/test/utils/regen-test-files
@@ -636,10 +636,12 @@ 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 = [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]
+ 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]
# Presubmits.
other_presubmit_tests = [
@@ -939,6 +941,7 @@ 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"),