summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TEST_MAPPING27
-rw-r--r--test/2258-checker-valid-rti/Android.bp43
-rw-r--r--test/2259-checker-code-sinking-infinite-try-catch/Android.bp43
-rwxr-xr-xtest/utils/regen-test-files5
4 files changed, 105 insertions, 13 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 81535d3fe0..acb11a8e84 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,9 +2,6 @@
{
"mainline-presubmit": [
{
- "name": "ComposHostTestCases[com.google.android.art.apex]"
- },
- {
"name": "art-run-test-001-HelloWorld[com.google.android.art.apex]"
},
{
@@ -482,6 +479,12 @@
"name": "art-run-test-2257-checker-constant-folding-before-codegen[com.google.android.art.apex]"
},
{
+ "name": "art-run-test-2258-checker-valid-rti[com.google.android.art.apex]"
+ },
+ {
+ "name": "art-run-test-2259-checker-code-sinking-infinite-try-catch[com.google.android.art.apex]"
+ },
+ {
"name": "art-run-test-300-package-override[com.google.android.art.apex]"
},
{
@@ -1400,9 +1403,6 @@
"name": "BootImageProfileTest"
},
{
- "name": "ComposHostTestCases"
- },
- {
"name": "CtsJdwpTestCases"
},
{
@@ -1889,6 +1889,12 @@
"name": "art-run-test-2257-checker-constant-folding-before-codegen"
},
{
+ "name": "art-run-test-2258-checker-valid-rti"
+ },
+ {
+ "name": "art-run-test-2259-checker-code-sinking-infinite-try-catch"
+ },
+ {
"name": "art-run-test-300-package-override"
},
{
@@ -2794,9 +2800,6 @@
"name": "ArtServiceTests"
},
{
- "name": "ComposHostTestCases"
- },
- {
"name": "art-apex-update-rollback"
},
{
@@ -3280,6 +3283,12 @@
"name": "art-run-test-2257-checker-constant-folding-before-codegen"
},
{
+ "name": "art-run-test-2258-checker-valid-rti"
+ },
+ {
+ "name": "art-run-test-2259-checker-code-sinking-infinite-try-catch"
+ },
+ {
"name": "art-run-test-300-package-override"
},
{
diff --git a/test/2258-checker-valid-rti/Android.bp b/test/2258-checker-valid-rti/Android.bp
new file mode 100644
index 0000000000..701835dd34
--- /dev/null
+++ b/test/2258-checker-valid-rti/Android.bp
@@ -0,0 +1,43 @@
+// Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `2258-checker-valid-rti`.
+
+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-2258-checker-valid-rti",
+ defaults: ["art-run-test-defaults"],
+ test_config_template: ":art-run-test-target-template",
+ srcs: ["src/**/*.java"],
+ data: [
+ ":art-run-test-2258-checker-valid-rti-expected-stdout",
+ ":art-run-test-2258-checker-valid-rti-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-2258-checker-valid-rti-expected-stdout",
+ out: ["art-run-test-2258-checker-valid-rti-expected-stdout.txt"],
+ srcs: ["expected-stdout.txt"],
+ cmd: "cp -f $(in) $(out)",
+}
+
+// Test's expected standard error.
+genrule {
+ name: "art-run-test-2258-checker-valid-rti-expected-stderr",
+ out: ["art-run-test-2258-checker-valid-rti-expected-stderr.txt"],
+ srcs: ["expected-stderr.txt"],
+ cmd: "cp -f $(in) $(out)",
+}
diff --git a/test/2259-checker-code-sinking-infinite-try-catch/Android.bp b/test/2259-checker-code-sinking-infinite-try-catch/Android.bp
new file mode 100644
index 0000000000..ab53ee38ee
--- /dev/null
+++ b/test/2259-checker-code-sinking-infinite-try-catch/Android.bp
@@ -0,0 +1,43 @@
+// Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `2259-checker-code-sinking-infinite-try-catch`.
+
+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-2259-checker-code-sinking-infinite-try-catch",
+ defaults: ["art-run-test-defaults"],
+ test_config_template: ":art-run-test-target-template",
+ srcs: ["src/**/*.java"],
+ data: [
+ ":art-run-test-2259-checker-code-sinking-infinite-try-catch-expected-stdout",
+ ":art-run-test-2259-checker-code-sinking-infinite-try-catch-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-2259-checker-code-sinking-infinite-try-catch-expected-stdout",
+ out: ["art-run-test-2259-checker-code-sinking-infinite-try-catch-expected-stdout.txt"],
+ srcs: ["expected-stdout.txt"],
+ cmd: "cp -f $(in) $(out)",
+}
+
+// Test's expected standard error.
+genrule {
+ name: "art-run-test-2259-checker-code-sinking-infinite-try-catch-expected-stderr",
+ out: ["art-run-test-2259-checker-code-sinking-infinite-try-catch-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 f21cfbfc75..19f33943bd 100755
--- a/test/utils/regen-test-files
+++ b/test/utils/regen-test-files
@@ -586,9 +586,7 @@ class Generator:
# Mainline presubmits.
mainline_presubmit_apex_suffix = "[com.google.android.art.apex]"
- mainline_other_presubmit_tests = [
- "ComposHostTestCases",
- ]
+ mainline_other_presubmit_tests = []
mainline_presubmit_tests = (mainline_other_presubmit_tests + run_test_module_names +
art_gtests_mainline_presubmit_module_names)
mainline_presubmit_tests_dict = [
@@ -606,7 +604,6 @@ class Generator:
other_presubmit_tests = [
"ArtServiceTests",
"BootImageProfileTest",
- "ComposHostTestCases",
"CtsJdwpTestCases",
"art-apex-update-rollback",
"art_standalone_dexpreopt_tests",