Regenerate ART test files (2023-10-12).

This change: * enables build-time support for the following test: * `art-run-test-848-pattern-match` * enables build- and run-time support in automated executions for the following tests: * in pre- and post-submit runs: * `art-run-test-661-checker-simd-cf-loops` * in post-submit runs only: * `art-run-test-2265-checker-select-binary-unary` * regenerates the following files: * `test/015-checker-switch/Android.bp` * `test/024-illegal-access/Android.bp` * `test/032-concrete-sub/Android.bp` * `test/042-new-instance/Android.bp` * `test/069-field-type/Android.bp` * `test/073-mismatched-field/Android.bp` * `test/075-verification-error/Android.bp` * `test/077-method-override/Android.bp` * `test/182-method-linking/Android.bp` * `test/845-data-image/Android.bp` * `test/536-checker-needs-access-check/Android.bp` * `test/537-checker-inline-and-unverified/Android.bp` * `test/823-cha-inlining/Android.bp` * `test/843-default-interface/Android.bp` * `test/845-data-image/Android.bp` * `test/965-default-verify/Android.bp` * `test/966-default-conflict/Android.bp` * `test/967-default-ame/Android.bp` * `test/2240-tracing-non-invokable-method/Android.bp` * `test/2262-default-conflict-methods/Android.bp` * `test/2262-miranda-methods/Android.bp` Output of `art/test/utils/regen-test-files`: $ art/test/utils/regen-test-files Generated Blueprint files for 722 ART run-tests out of 1011 (71%). Generated TEST_MAPPING entries for 446 ART run-tests out of 1011 (44%): 445 ART run-tests (99%) in `mainline-presubmit` test group. 22 ART gtests (100%) in `mainline-presubmit` test group. 445 ART run-tests (99%) in `presubmit` test group. 1 ART run-tests (0%) in `postsubmit` test group. 22 ART gtests (100%) in `presubmit` test group. Note: Tests in `*presubmit` test groups are executed in pre- and post-submit test runs. Tests in the `postsubmit` test group are only executed in post-submit test runs. Test: m art-run-test-823-cha-inlining Test: m art-run-test-845-data-image Test: m art-run-test-848-pattern-match Test: m art-run-test-966-default-conflict Test: m art-run-test-2240-tracing-non-invokable-method Test: m art-run-test-2262-default-conflict-methods Test: m art-run-test-2262-miranda-methods Test: atest -a art-run-test-015-checker-switch Test: atest -a art-run-test-024-illegal-access Test: atest -a art-run-test-032-concrete-sub Test: atest -a art-run-test-042-new-instance Test: atest -a art-run-test-069-field-type Test: atest -a art-run-test-073-mismatched-field Test: atest -a art-run-test-075-verification-error Test: atest -a art-run-test-077-method-override Test: atest -a art-run-test-182-method-linking Test: atest -a art-run-test-536-checker-needs-access-check Test: atest -a art-run-test-537-checker-inline-and-unverified Test: atest -a art-run-test-661-checker-simd-cf-loops Test: atest -a art-run-test-843-default-interface Test: atest -a art-run-test-965-default-verify Test: atest -a art-run-test-967-default-ame Test: atest -a art-run-test-2265-checker-select-binary-unary Test: atest --test-mapping art:presubmit Test: atest --test-mapping art:postsubmit Bug: 147812905 Bug: 152374989 Change-Id: I690783f3143fa90f968c8208846409c8f10949d9
AOSPA · Oct 18, 2023 · 141efea · 141efea
1 parent 2dc37a7
commit 141efea
Show file tree

Hide file tree

Showing 23 changed files with 123 additions and 19 deletions.
diff --git a/TEST_MAPPING b/TEST_MAPPING
@@ -4023,6 +4023,9 @@
     {
       "name": "art-run-test-660-checker-simd-sad"
     },
+    {
+      "name": "art-run-test-661-checker-simd-cf-loops"
+    },
     {
       "name": "art-run-test-661-checker-simd-reduc"
     },
@@ -4247,5 +4250,10 @@
     {
       "name": "ComposHostTestCases"
     }
+  ],
+  "postsubmit": [
+    {
+      "name": "art-run-test-2265-checker-select-binary-unary"
+    }
   ]
 }
diff --git a/test/015-checker-switch/Android.bp b/test/015-checker-switch/Android.bp
@@ -21,6 +21,9 @@ java_test {
         ":art-run-test-015-checker-switch-expected-stdout",
         ":art-run-test-015-checker-switch-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.

diff --git a/test/024-illegal-access/Android.bp b/test/024-illegal-access/Android.bp
@@ -25,7 +25,7 @@ java_test {
     test_config_template: ":art-run-test-target-template",
     srcs: ["src2/**/*.java"],
     static_libs: [
-        "art-run-test-024-illegal-access-src"
+        "art-run-test-024-illegal-access-src",
     ],
     data: [
         ":art-run-test-024-illegal-access-expected-stdout",

diff --git a/test/032-concrete-sub/Android.bp b/test/032-concrete-sub/Android.bp
@@ -25,7 +25,7 @@ java_test {
     test_config_template: ":art-run-test-target-template",
     srcs: ["src2/**/*.java"],
     static_libs: [
-        "art-run-test-032-concrete-sub-src"
+        "art-run-test-032-concrete-sub-src",
     ],
     data: [
         ":art-run-test-032-concrete-sub-expected-stdout",

diff --git a/test/042-new-instance/Android.bp b/test/042-new-instance/Android.bp
@@ -25,7 +25,7 @@ java_test {
     test_config_template: ":art-run-test-target-template",
     srcs: ["src2/**/*.java"],
     static_libs: [
-        "art-run-test-042-new-instance-src"
+        "art-run-test-042-new-instance-src",
     ],
     data: [
         ":art-run-test-042-new-instance-expected-stdout",

diff --git a/test/069-field-type/Android.bp b/test/069-field-type/Android.bp
@@ -25,7 +25,7 @@ java_test {
     test_config_template: ":art-run-test-target-template",
     srcs: ["src2/**/*.java"],
     static_libs: [
-        "art-run-test-069-field-type-src"
+        "art-run-test-069-field-type-src",
     ],
     data: [
         ":art-run-test-069-field-type-expected-stdout",

diff --git a/test/073-mismatched-field/Android.bp b/test/073-mismatched-field/Android.bp
@@ -25,7 +25,7 @@ java_test {
     test_config_template: ":art-run-test-target-template",
     srcs: ["src2/**/*.java"],
     static_libs: [
-        "art-run-test-073-mismatched-field-src"
+        "art-run-test-073-mismatched-field-src",
     ],
     data: [
         ":art-run-test-073-mismatched-field-expected-stdout",

diff --git a/test/075-verification-error/Android.bp b/test/075-verification-error/Android.bp
@@ -25,7 +25,7 @@ java_test {
     test_config_template: ":art-run-test-target-template",
     srcs: ["src2/**/*.java"],
     static_libs: [
-        "art-run-test-075-verification-error-src"
+        "art-run-test-075-verification-error-src",
     ],
     data: [
         ":art-run-test-075-verification-error-expected-stdout",

diff --git a/test/077-method-override/Android.bp b/test/077-method-override/Android.bp
@@ -25,7 +25,7 @@ java_test {
     test_config_template: ":art-run-test-target-template",
     srcs: ["src2/**/*.java"],
     static_libs: [
-        "art-run-test-077-method-override-src"
+        "art-run-test-077-method-override-src",
     ],
     data: [
         ":art-run-test-077-method-override-expected-stdout",

diff --git a/test/182-method-linking/Android.bp b/test/182-method-linking/Android.bp
@@ -25,7 +25,7 @@ java_test {
     test_config_template: ":art-run-test-target-template",
     srcs: ["src2/**/*.java"],
     static_libs: [
-        "art-run-test-182-method-linking-src"
+        "art-run-test-182-method-linking-src",
     ],
     data: [
         ":art-run-test-182-method-linking-expected-stdout",

diff --git a/test/2240-tracing-non-invokable-method/Android.bp b/test/2240-tracing-non-invokable-method/Android.bp
@@ -25,7 +25,7 @@ java_test {
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src2/**/*.java"],
     static_libs: [
-        "art-run-test-2240-tracing-non-invokable-method-src"
+        "art-run-test-2240-tracing-non-invokable-method-src",
     ],
     data: [
         ":art-run-test-2240-tracing-non-invokable-method-expected-stdout",

diff --git a/test/2262-default-conflict-methods/Android.bp b/test/2262-default-conflict-methods/Android.bp
@@ -25,7 +25,7 @@ java_test {
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src2/**/*.java"],
     static_libs: [
-        "art-run-test-2262-default-conflict-methods-src"
+        "art-run-test-2262-default-conflict-methods-src",
     ],
     data: [
         ":art-run-test-2262-default-conflict-methods-expected-stdout",

diff --git a/test/2262-miranda-methods/Android.bp b/test/2262-miranda-methods/Android.bp
@@ -25,7 +25,7 @@ java_test {
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src2/**/*.java"],
     static_libs: [
-        "art-run-test-2262-miranda-methods-src"
+        "art-run-test-2262-miranda-methods-src",
     ],
     data: [
         ":art-run-test-2262-miranda-methods-expected-stdout",

diff --git a/test/2265-checker-select-binary-unary/Android.bp b/test/2265-checker-select-binary-unary/Android.bp
@@ -0,0 +1,43 @@
+// Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `2265-checker-select-binary-unary`.
+
+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-2265-checker-select-binary-unary",
+    defaults: ["art-run-test-defaults"],
+    test_config_template: ":art-run-test-target-template",
+    srcs: ["src/**/*.java"],
+    data: [
+        ":art-run-test-2265-checker-select-binary-unary-expected-stdout",
+        ":art-run-test-2265-checker-select-binary-unary-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-2265-checker-select-binary-unary-expected-stdout",
+    out: ["art-run-test-2265-checker-select-binary-unary-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
+    cmd: "cp -f $(in) $(out)",
+}
+
+// Test's expected standard error.
+genrule {
+    name: "art-run-test-2265-checker-select-binary-unary-expected-stderr",
+    out: ["art-run-test-2265-checker-select-binary-unary-expected-stderr.txt"],
+    srcs: ["expected-stderr.txt"],
+    cmd: "cp -f $(in) $(out)",
+}
diff --git a/test/536-checker-needs-access-check/Android.bp b/test/536-checker-needs-access-check/Android.bp
@@ -25,7 +25,7 @@ java_test {
     test_config_template: ":art-run-test-target-template",
     srcs: ["src2/**/*.java"],
     static_libs: [
-        "art-run-test-536-checker-needs-access-check-src"
+        "art-run-test-536-checker-needs-access-check-src",
     ],
     data: [
         ":art-run-test-536-checker-needs-access-check-expected-stdout",

diff --git a/test/537-checker-inline-and-unverified/Android.bp b/test/537-checker-inline-and-unverified/Android.bp
@@ -25,7 +25,7 @@ java_test {
     test_config_template: ":art-run-test-target-template",
     srcs: ["src2/**/*.java"],
     static_libs: [
-        "art-run-test-537-checker-inline-and-unverified-src"
+        "art-run-test-537-checker-inline-and-unverified-src",
     ],
     data: [
         ":art-run-test-537-checker-inline-and-unverified-expected-stdout",

diff --git a/test/823-cha-inlining/Android.bp b/test/823-cha-inlining/Android.bp
@@ -25,7 +25,7 @@ java_test {
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src2/**/*.java"],
     static_libs: [
-        "art-run-test-823-cha-inlining-src"
+        "art-run-test-823-cha-inlining-src",
     ],
     data: [
         ":art-run-test-823-cha-inlining-expected-stdout",

diff --git a/test/843-default-interface/Android.bp b/test/843-default-interface/Android.bp
@@ -25,7 +25,7 @@ java_test {
     test_config_template: ":art-run-test-target-template",
     srcs: ["src2/**/*.java"],
     static_libs: [
-        "art-run-test-843-default-interface-src"
+        "art-run-test-843-default-interface-src",
     ],
     data: [
         ":art-run-test-843-default-interface-expected-stdout",

diff --git a/test/845-data-image/Android.bp b/test/845-data-image/Android.bp
@@ -11,12 +11,22 @@ package {
     default_applicable_licenses: ["art_license"],
 }
 
+// Library with src-art/ sources for the test.
+java_library {
+    name: "art-run-test-845-data-image-src-art",
+    defaults: ["art-run-test-defaults"],
+    srcs: ["src-art/**/*.java"],
+}
+
 // Test's Dex code.
 java_test {
     name: "art-run-test-845-data-image",
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
-    srcs: ["src-art/**/*.java"],
+    srcs: ["src2/**/*.java"],
+    static_libs: [
+        "art-run-test-845-data-image-src-art",
+    ],
     data: [
         ":art-run-test-845-data-image-expected-stdout",
         ":art-run-test-845-data-image-expected-stderr",

diff --git a/test/848-pattern-match/Android.bp b/test/848-pattern-match/Android.bp
@@ -0,0 +1,40 @@
+// Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `848-pattern-match`.
+
+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-848-pattern-match",
+    defaults: ["art-run-test-defaults"],
+    test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+    srcs: ["src/**/*.java"],
+    data: [
+        ":art-run-test-848-pattern-match-expected-stdout",
+        ":art-run-test-848-pattern-match-expected-stderr",
+    ],
+}
+
+// Test's expected standard output.
+genrule {
+    name: "art-run-test-848-pattern-match-expected-stdout",
+    out: ["art-run-test-848-pattern-match-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
+    cmd: "cp -f $(in) $(out)",
+}
+
+// Test's expected standard error.
+genrule {
+    name: "art-run-test-848-pattern-match-expected-stderr",
+    out: ["art-run-test-848-pattern-match-expected-stderr.txt"],
+    srcs: ["expected-stderr.txt"],
+    cmd: "cp -f $(in) $(out)",
+}
diff --git a/test/965-default-verify/Android.bp b/test/965-default-verify/Android.bp
@@ -25,7 +25,7 @@ java_test {
     test_config_template: ":art-run-test-target-template",
     srcs: ["src2/**/*.java"],
     static_libs: [
-        "art-run-test-965-default-verify-src"
+        "art-run-test-965-default-verify-src",
     ],
     data: [
         ":art-run-test-965-default-verify-expected-stdout",

diff --git a/test/966-default-conflict/Android.bp b/test/966-default-conflict/Android.bp
@@ -25,7 +25,7 @@ java_test {
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src2/**/*.java"],
     static_libs: [
-        "art-run-test-966-default-conflict-src"
+        "art-run-test-966-default-conflict-src",
     ],
     data: [
         ":art-run-test-966-default-conflict-expected-stdout",

diff --git a/test/967-default-ame/Android.bp b/test/967-default-ame/Android.bp
@@ -25,7 +25,7 @@ java_test {
     test_config_template: ":art-run-test-target-template",
     srcs: ["src2/**/*.java"],
     static_libs: [
-        "art-run-test-967-default-ame-src"
+        "art-run-test-967-default-ame-src",
     ],
     data: [
         ":art-run-test-967-default-ame-expected-stdout",