Add `art_libnativebridge_cts_tests` to ART's `TEST_MAPPING` and ART MTS.
In ART MTS, add this test module to shard 00 (along with other ART
gtests).
Output of `art/test/utils/regen-test-files`:
$ art/test/utils/regen-test-files
Generated Blueprint files for 657 ART run-tests out of 950 (69%).
Generated TEST_MAPPING entries for 404 ART run-tests out of 950 (42%):
404 ART run-tests (100%) in `mainline-presubmit` test group.
20 ART gtests (95%) in `mainline-presubmit` test group.
404 ART run-tests (100%) in `presubmit` test group.
21 ART gtests (100%) in `presubmit` test group.
Test: atest --test-mapping art:presubmit
Test: m mts && mts-tradefed run commandAndExit mts-art
Test: m mts && mts-tradefed run commandAndExit mts-art-shard-00
Test: m mts \
&& mts-tradefed run commandAndExit mts-art \
--module art_libnativebridge_cts_tests
Test: art/libnativebridge/tests/runtests.sh
Bug: 143943613
Bug: 167385698
Change-Id: I3fe63bcf4f40c80f30a11636e31f63bda0651d17
diff --git a/TEST_MAPPING b/TEST_MAPPING
index c5f1627..5ac2d14 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1217,6 +1217,9 @@
"name": "art-run-test-963-default-range-smali[com.google.android.art.apex]"
},
{
+ "name": "art_libnativebridge_cts_tests[com.google.android.art.apex]"
+ },
+ {
"name": "art_standalone_cmdline_tests[com.google.android.art.apex]"
},
{
@@ -2503,6 +2506,9 @@
"name": "art-run-test-963-default-range-smali"
},
{
+ "name": "art_libnativebridge_cts_tests"
+ },
+ {
"name": "art_standalone_cmdline_tests"
},
{
diff --git a/libnativebridge/tests/Android.bp b/libnativebridge/tests/Android.bp
index dfacae8..b787fba 100644
--- a/libnativebridge/tests/Android.bp
+++ b/libnativebridge/tests/Android.bp
@@ -187,7 +187,11 @@
},
test_config_template: ":art-gtests-target-standalone-cts-template",
- test_suites: ["cts"],
+ test_suites: [
+ "cts",
+ "general-tests",
+ "mts-art",
+ ],
}
cc_test {
diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files
index 4ab13d0..c3538d2 100755
--- a/test/utils/regen-test-files
+++ b/test/utils/regen-test-files
@@ -207,6 +207,7 @@
# ART gtests that do not need root access to the device.
art_gtest_user_module_names = [
+ "art_libnativebridge_cts_tests",
"art_standalone_cmdline_tests",
"art_standalone_compiler_tests",
"art_standalone_dex2oat_tests",