diff options
| -rw-r--r-- | TEST_MAPPING | 18 | ||||
| -rw-r--r-- | test/2274-checker-bitwise-gvn/Android.bp | 43 | ||||
| -rw-r--r-- | test/458-checker-riscv64-shift-add/Android.bp | 43 | ||||
| -rw-r--r-- | test/855-native/Android.bp | 40 | ||||
| -rw-r--r-- | test/856-clone/Android.bp | 40 | ||||
| -rwxr-xr-x | test/utils/regen-test-files | 12 |
6 files changed, 195 insertions, 1 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING index 1b48489d6e..f6921ff686 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1378,6 +1378,9 @@ "name": "art_standalone_dexlist_tests" }, { + "name": "art_standalone_dexopt_chroot_setup_tests" + }, + { "name": "art_standalone_dexoptanalyzer_tests" }, { @@ -1422,6 +1425,9 @@ "name": "art_standalone_sigchain_tests" }, { + "name": "libnativebridge-tests" + }, + { "name": "libnativeloader_e2e_tests" }, { @@ -2806,6 +2812,9 @@ "name": "art_standalone_dexlist_tests[com.google.android.art.apex]" }, { + "name": "art_standalone_dexopt_chroot_setup_tests[com.google.android.art.apex]" + }, + { "name": "art_standalone_dexoptanalyzer_tests[com.google.android.art.apex]" }, { @@ -5742,6 +5751,15 @@ }, { "name": "art-run-test-2273-checker-unreachable-intrinsics" + }, + { + "name": "art-run-test-2274-checker-bitwise-gvn" + }, + { + "name": "art-run-test-458-checker-riscv64-shift-add" + }, + { + "name": "art-run-test-856-clone" } ] } diff --git a/test/2274-checker-bitwise-gvn/Android.bp b/test/2274-checker-bitwise-gvn/Android.bp new file mode 100644 index 0000000000..b2d0fd2742 --- /dev/null +++ b/test/2274-checker-bitwise-gvn/Android.bp @@ -0,0 +1,43 @@ +// Generated by `regen-test-files`. Do not edit manually. + +// Build rules for ART run-test `2274-checker-bitwise-gvn`. + +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "art_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["art_license"], +} + +// Test's Dex code. +java_test { + name: "art-run-test-2274-checker-bitwise-gvn", + defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", + srcs: ["src/**/*.java"], + data: [ + ":art-run-test-2274-checker-bitwise-gvn-expected-stdout", + ":art-run-test-2274-checker-bitwise-gvn-expected-stderr", + ], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, +} + +// Test's expected standard output. +genrule { + name: "art-run-test-2274-checker-bitwise-gvn-expected-stdout", + out: ["art-run-test-2274-checker-bitwise-gvn-expected-stdout.txt"], + srcs: ["expected-stdout.txt"], + cmd: "cp -f $(in) $(out)", +} + +// Test's expected standard error. +genrule { + name: "art-run-test-2274-checker-bitwise-gvn-expected-stderr", + out: ["art-run-test-2274-checker-bitwise-gvn-expected-stderr.txt"], + srcs: ["expected-stderr.txt"], + cmd: "cp -f $(in) $(out)", +} diff --git a/test/458-checker-riscv64-shift-add/Android.bp b/test/458-checker-riscv64-shift-add/Android.bp new file mode 100644 index 0000000000..aafc079d24 --- /dev/null +++ b/test/458-checker-riscv64-shift-add/Android.bp @@ -0,0 +1,43 @@ +// Generated by `regen-test-files`. Do not edit manually. + +// Build rules for ART run-test `458-checker-riscv64-shift-add`. + +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "art_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["art_license"], +} + +// Test's Dex code. +java_test { + name: "art-run-test-458-checker-riscv64-shift-add", + defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", + srcs: ["src/**/*.java"], + data: [ + ":art-run-test-458-checker-riscv64-shift-add-expected-stdout", + ":art-run-test-458-checker-riscv64-shift-add-expected-stderr", + ], + // Include the Java source files in the test's artifacts, to make Checker assertions + // available to the TradeFed test runner. + include_srcs: true, +} + +// Test's expected standard output. +genrule { + name: "art-run-test-458-checker-riscv64-shift-add-expected-stdout", + out: ["art-run-test-458-checker-riscv64-shift-add-expected-stdout.txt"], + srcs: ["expected-stdout.txt"], + cmd: "cp -f $(in) $(out)", +} + +// Test's expected standard error. +genrule { + name: "art-run-test-458-checker-riscv64-shift-add-expected-stderr", + out: ["art-run-test-458-checker-riscv64-shift-add-expected-stderr.txt"], + srcs: ["expected-stderr.txt"], + cmd: "cp -f $(in) $(out)", +} diff --git a/test/855-native/Android.bp b/test/855-native/Android.bp new file mode 100644 index 0000000000..0f1529d6c8 --- /dev/null +++ b/test/855-native/Android.bp @@ -0,0 +1,40 @@ +// Generated by `regen-test-files`. Do not edit manually. + +// Build rules for ART run-test `855-native`. + +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "art_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["art_license"], +} + +// Test's Dex code. +java_test { + name: "art-run-test-855-native", + defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-no-test-suite-tag-template", + srcs: ["src-art/**/*.java"], + data: [ + ":art-run-test-855-native-expected-stdout", + ":art-run-test-855-native-expected-stderr", + ], +} + +// Test's expected standard output. +genrule { + name: "art-run-test-855-native-expected-stdout", + out: ["art-run-test-855-native-expected-stdout.txt"], + srcs: ["expected-stdout.txt"], + cmd: "cp -f $(in) $(out)", +} + +// Test's expected standard error. +genrule { + name: "art-run-test-855-native-expected-stderr", + out: ["art-run-test-855-native-expected-stderr.txt"], + srcs: ["expected-stderr.txt"], + cmd: "cp -f $(in) $(out)", +} diff --git a/test/856-clone/Android.bp b/test/856-clone/Android.bp new file mode 100644 index 0000000000..00e47b727b --- /dev/null +++ b/test/856-clone/Android.bp @@ -0,0 +1,40 @@ +// Generated by `regen-test-files`. Do not edit manually. + +// Build rules for ART run-test `856-clone`. + +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "art_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["art_license"], +} + +// Test's Dex code. +java_test { + name: "art-run-test-856-clone", + defaults: ["art-run-test-defaults"], + test_config_template: ":art-run-test-target-template", + srcs: ["src/**/*.java"], + data: [ + ":art-run-test-856-clone-expected-stdout", + ":art-run-test-856-clone-expected-stderr", + ], +} + +// Test's expected standard output. +genrule { + name: "art-run-test-856-clone-expected-stdout", + out: ["art-run-test-856-clone-expected-stdout.txt"], + srcs: ["expected-stdout.txt"], + cmd: "cp -f $(in) $(out)", +} + +// Test's expected standard error. +genrule { + name: "art-run-test-856-clone-expected-stderr", + out: ["art-run-test-856-clone-expected-stderr.txt"], + srcs: ["expected-stderr.txt"], + cmd: "cp -f $(in) $(out)", +} diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files index 09bae93679..2004161c0f 100755 --- a/test/utils/regen-test-files +++ b/test/utils/regen-test-files @@ -223,8 +223,11 @@ known_failing_tests = frozenset([ # removing them from this set (in order to promote them to # presubmits). postsubmit_only_tests = frozenset([ + "458-checker-riscv64-shift-add", + "856-clone", "2247-checker-write-barrier-elimination", "2273-checker-unreachable-intrinsics", + "2274-checker-bitwise-gvn", ]) known_failing_on_hwasan_tests = frozenset([ @@ -275,8 +278,15 @@ art_gtest_module_names = sorted(art_gtest_user_module_names + art_gtest_eng_only art_gtest_postsubmit_only_module_names = [ ] +# ART gtests not supported in MTS. +art_gtest_modules_excluded_from_mts = [ + # TODO(b/347717488): Consider adding this test to ART MTS. + "libnativebridge-tests", +] + # ART gtests supported in MTS that do not need root access to the device. -art_gtest_mts_user_module_names = copy.copy(art_gtest_user_module_names) +art_gtest_mts_user_module_names = [t for t in art_gtest_user_module_names + if t not in art_gtest_modules_excluded_from_mts] # ART gtests supported in presubmits. art_gtest_presubmit_module_names = [t for t in art_gtest_module_names |