Rename the expected-output text file in built TradeFed ART run-tests.

Test suite packages (e.g. `android-mts.zip`) flatten tests artifacts
into a single `testcases` directory, therefore each included file must
have a unique name. Have the build system rename every `expected.txt`
file to a unique name when building TradeFed-style ART run-tests.

Test: atest art-run-test-001-HelloWorld
Bug: 147812905
Change-Id: I0d433d0a611cb5214ae366e2c1af214e41c127f0
diff --git a/test/001-HelloWorld/Android.bp b/test/001-HelloWorld/Android.bp
index c4dbe4c..3aa7b31 100644
--- a/test/001-HelloWorld/Android.bp
+++ b/test/001-HelloWorld/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `001-HelloWorld`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-001-HelloWorld",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-001-HelloWorld-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-001-HelloWorld-expected",
+    out: ["art-run-test-001-HelloWorld-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/001-Main/Android.bp b/test/001-Main/Android.bp
index e8c7244..8df9718 100644
--- a/test/001-Main/Android.bp
+++ b/test/001-Main/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `001-Main`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-001-Main",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-001-Main-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-001-Main-expected",
+    out: ["art-run-test-001-Main-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/002-sleep/Android.bp b/test/002-sleep/Android.bp
index 48b1d49..c353931 100644
--- a/test/002-sleep/Android.bp
+++ b/test/002-sleep/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `002-sleep`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-002-sleep",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-002-sleep-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-002-sleep-expected",
+    out: ["art-run-test-002-sleep-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/004-InterfaceTest/Android.bp b/test/004-InterfaceTest/Android.bp
index 83ad3e8..3ba252e 100644
--- a/test/004-InterfaceTest/Android.bp
+++ b/test/004-InterfaceTest/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `004-InterfaceTest`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-004-InterfaceTest",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-004-InterfaceTest-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-004-InterfaceTest-expected",
+    out: ["art-run-test-004-InterfaceTest-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/004-SignalTest/Android.bp b/test/004-SignalTest/Android.bp
index 37c6420..8be1625 100644
--- a/test/004-SignalTest/Android.bp
+++ b/test/004-SignalTest/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `004-SignalTest`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-004-SignalTest",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-004-SignalTest-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-004-SignalTest-expected",
+    out: ["art-run-test-004-SignalTest-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/004-UnsafeTest/Android.bp b/test/004-UnsafeTest/Android.bp
index cbb5689..21a3a3e 100644
--- a/test/004-UnsafeTest/Android.bp
+++ b/test/004-UnsafeTest/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `004-UnsafeTest`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-004-UnsafeTest",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-004-UnsafeTest-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-004-UnsafeTest-expected",
+    out: ["art-run-test-004-UnsafeTest-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/004-checker-UnsafeTest18/Android.bp b/test/004-checker-UnsafeTest18/Android.bp
index a49be1d..57b20a4 100644
--- a/test/004-checker-UnsafeTest18/Android.bp
+++ b/test/004-checker-UnsafeTest18/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `004-checker-UnsafeTest18`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-004-checker-UnsafeTest18",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-004-checker-UnsafeTest18-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-004-checker-UnsafeTest18-expected",
+    out: ["art-run-test-004-checker-UnsafeTest18-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/006-args/Android.bp b/test/006-args/Android.bp
index c6c6c0f..1f70413 100644
--- a/test/006-args/Android.bp
+++ b/test/006-args/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `006-args`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-006-args",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-006-args-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-006-args-expected",
+    out: ["art-run-test-006-args-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/007-count10/Android.bp b/test/007-count10/Android.bp
index c749d61..5015eb9 100644
--- a/test/007-count10/Android.bp
+++ b/test/007-count10/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `007-count10`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-007-count10",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-007-count10-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-007-count10-expected",
+    out: ["art-run-test-007-count10-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/009-instanceof/Android.bp b/test/009-instanceof/Android.bp
index 7aab045..3158843 100644
--- a/test/009-instanceof/Android.bp
+++ b/test/009-instanceof/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `009-instanceof`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-009-instanceof",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-009-instanceof-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-009-instanceof-expected",
+    out: ["art-run-test-009-instanceof-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/010-instance/Android.bp b/test/010-instance/Android.bp
index ecb0715..34e1cb7 100644
--- a/test/010-instance/Android.bp
+++ b/test/010-instance/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `010-instance`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-010-instance",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-010-instance-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-010-instance-expected",
+    out: ["art-run-test-010-instance-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/011-array-copy/Android.bp b/test/011-array-copy/Android.bp
index a18209d..2fd3e31 100644
--- a/test/011-array-copy/Android.bp
+++ b/test/011-array-copy/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `011-array-copy`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-011-array-copy",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-011-array-copy-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-011-array-copy-expected",
+    out: ["art-run-test-011-array-copy-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/012-math/Android.bp b/test/012-math/Android.bp
index dac6281..5b323d1 100644
--- a/test/012-math/Android.bp
+++ b/test/012-math/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `012-math`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-012-math",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-012-math-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-012-math-expected",
+    out: ["art-run-test-012-math-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/013-math2/Android.bp b/test/013-math2/Android.bp
index 4c99253..a8a1424 100644
--- a/test/013-math2/Android.bp
+++ b/test/013-math2/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `013-math2`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-013-math2",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-013-math2-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-013-math2-expected",
+    out: ["art-run-test-013-math2-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/014-math3/Android.bp b/test/014-math3/Android.bp
index 5d455a6..609c1c3 100644
--- a/test/014-math3/Android.bp
+++ b/test/014-math3/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `014-math3`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-014-math3",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-014-math3-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-014-math3-expected",
+    out: ["art-run-test-014-math3-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/015-switch/Android.bp b/test/015-switch/Android.bp
index 022d9a4..7b6e2f6 100644
--- a/test/015-switch/Android.bp
+++ b/test/015-switch/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `015-switch`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-015-switch",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-015-switch-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-015-switch-expected",
+    out: ["art-run-test-015-switch-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/016-intern/Android.bp b/test/016-intern/Android.bp
index 4ce25e5..73081a7 100644
--- a/test/016-intern/Android.bp
+++ b/test/016-intern/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `016-intern`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-016-intern",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-016-intern-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-016-intern-expected",
+    out: ["art-run-test-016-intern-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/017-float/Android.bp b/test/017-float/Android.bp
index 26294a4..8ae9c6d 100644
--- a/test/017-float/Android.bp
+++ b/test/017-float/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `017-float`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-017-float",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-017-float-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-017-float-expected",
+    out: ["art-run-test-017-float-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/018-stack-overflow/Android.bp b/test/018-stack-overflow/Android.bp
index c6ba039..738236b 100644
--- a/test/018-stack-overflow/Android.bp
+++ b/test/018-stack-overflow/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `018-stack-overflow`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-018-stack-overflow",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-018-stack-overflow-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-018-stack-overflow-expected",
+    out: ["art-run-test-018-stack-overflow-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/019-wrong-array-type/Android.bp b/test/019-wrong-array-type/Android.bp
index 17c5b07..c460dce 100644
--- a/test/019-wrong-array-type/Android.bp
+++ b/test/019-wrong-array-type/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `019-wrong-array-type`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-019-wrong-array-type",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-019-wrong-array-type-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-019-wrong-array-type-expected",
+    out: ["art-run-test-019-wrong-array-type-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/020-string/Android.bp b/test/020-string/Android.bp
index d159aeb..bbf91b1 100644
--- a/test/020-string/Android.bp
+++ b/test/020-string/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `020-string`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-020-string",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-020-string-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-020-string-expected",
+    out: ["art-run-test-020-string-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/021-string2/Android.bp b/test/021-string2/Android.bp
index 1935543..d07f52b 100644
--- a/test/021-string2/Android.bp
+++ b/test/021-string2/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `021-string2`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-021-string2",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-021-string2-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-021-string2-expected",
+    out: ["art-run-test-021-string2-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/022-interface/Android.bp b/test/022-interface/Android.bp
index 64350fc..53a9b27 100644
--- a/test/022-interface/Android.bp
+++ b/test/022-interface/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `022-interface`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-022-interface",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-022-interface-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-022-interface-expected",
+    out: ["art-run-test-022-interface-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/025-access-controller/Android.bp b/test/025-access-controller/Android.bp
index fb793fe..bc332b7 100644
--- a/test/025-access-controller/Android.bp
+++ b/test/025-access-controller/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `025-access-controller`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-025-access-controller",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-025-access-controller-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-025-access-controller-expected",
+    out: ["art-run-test-025-access-controller-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/026-access/Android.bp b/test/026-access/Android.bp
index 3bad86f..494f518 100644
--- a/test/026-access/Android.bp
+++ b/test/026-access/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `026-access`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-026-access",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-026-access-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-026-access-expected",
+    out: ["art-run-test-026-access-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/027-arithmetic/Android.bp b/test/027-arithmetic/Android.bp
index 99f8571..1489fc9 100644
--- a/test/027-arithmetic/Android.bp
+++ b/test/027-arithmetic/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `027-arithmetic`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-027-arithmetic",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-027-arithmetic-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-027-arithmetic-expected",
+    out: ["art-run-test-027-arithmetic-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/028-array-write/Android.bp b/test/028-array-write/Android.bp
index 0d5c8ca..91db917 100644
--- a/test/028-array-write/Android.bp
+++ b/test/028-array-write/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `028-array-write`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-028-array-write",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-028-array-write-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-028-array-write-expected",
+    out: ["art-run-test-028-array-write-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/029-assert/Android.bp b/test/029-assert/Android.bp
index 2cd8ce1..b0eb6b5 100644
--- a/test/029-assert/Android.bp
+++ b/test/029-assert/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `029-assert`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-029-assert",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-029-assert-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-029-assert-expected",
+    out: ["art-run-test-029-assert-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/030-bad-finalizer/Android.bp b/test/030-bad-finalizer/Android.bp
index 5a6f908..ed6bce5 100644
--- a/test/030-bad-finalizer/Android.bp
+++ b/test/030-bad-finalizer/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `030-bad-finalizer`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-030-bad-finalizer",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-030-bad-finalizer-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-030-bad-finalizer-expected",
+    out: ["art-run-test-030-bad-finalizer-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/033-class-init-deadlock/Android.bp b/test/033-class-init-deadlock/Android.bp
index 1eeb73e..2ad09c8 100644
--- a/test/033-class-init-deadlock/Android.bp
+++ b/test/033-class-init-deadlock/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `033-class-init-deadlock`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-033-class-init-deadlock",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-033-class-init-deadlock-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-033-class-init-deadlock-expected",
+    out: ["art-run-test-033-class-init-deadlock-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/034-call-null/Android.bp b/test/034-call-null/Android.bp
index 2f108d0..272e6ba 100644
--- a/test/034-call-null/Android.bp
+++ b/test/034-call-null/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `034-call-null`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-034-call-null",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-034-call-null-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-034-call-null-expected",
+    out: ["art-run-test-034-call-null-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/035-enum/Android.bp b/test/035-enum/Android.bp
index fd9d7e6..d23012d 100644
--- a/test/035-enum/Android.bp
+++ b/test/035-enum/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `035-enum`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-035-enum",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-035-enum-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-035-enum-expected",
+    out: ["art-run-test-035-enum-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/036-finalizer/Android.bp b/test/036-finalizer/Android.bp
index 3c44686..ccf3de3 100644
--- a/test/036-finalizer/Android.bp
+++ b/test/036-finalizer/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `036-finalizer`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-036-finalizer",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-036-finalizer-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-036-finalizer-expected",
+    out: ["art-run-test-036-finalizer-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/037-inherit/Android.bp b/test/037-inherit/Android.bp
index eceb3c6..e193c5b 100644
--- a/test/037-inherit/Android.bp
+++ b/test/037-inherit/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `037-inherit`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-037-inherit",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-037-inherit-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-037-inherit-expected",
+    out: ["art-run-test-037-inherit-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/038-inner-null/Android.bp b/test/038-inner-null/Android.bp
index 345720c..2d84c31 100644
--- a/test/038-inner-null/Android.bp
+++ b/test/038-inner-null/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `038-inner-null`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-038-inner-null",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-038-inner-null-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-038-inner-null-expected",
+    out: ["art-run-test-038-inner-null-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/039-join-main/Android.bp b/test/039-join-main/Android.bp
index 338b31b..5e63a03 100644
--- a/test/039-join-main/Android.bp
+++ b/test/039-join-main/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `039-join-main`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-039-join-main",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-039-join-main-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-039-join-main-expected",
+    out: ["art-run-test-039-join-main-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/040-miranda/Android.bp b/test/040-miranda/Android.bp
index 35b4fb4..61bfe8a 100644
--- a/test/040-miranda/Android.bp
+++ b/test/040-miranda/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `040-miranda`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-040-miranda",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-040-miranda-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-040-miranda-expected",
+    out: ["art-run-test-040-miranda-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/041-narrowing/Android.bp b/test/041-narrowing/Android.bp
index 051d796..fc38c15 100644
--- a/test/041-narrowing/Android.bp
+++ b/test/041-narrowing/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `041-narrowing`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-041-narrowing",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-041-narrowing-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-041-narrowing-expected",
+    out: ["art-run-test-041-narrowing-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/043-privates/Android.bp b/test/043-privates/Android.bp
index 88c99af..8f9ddd9 100644
--- a/test/043-privates/Android.bp
+++ b/test/043-privates/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `043-privates`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-043-privates",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-043-privates-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-043-privates-expected",
+    out: ["art-run-test-043-privates-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/044-proxy/Android.bp b/test/044-proxy/Android.bp
index c516c89..2cd53b0 100644
--- a/test/044-proxy/Android.bp
+++ b/test/044-proxy/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `044-proxy`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-044-proxy",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-044-proxy-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-044-proxy-expected",
+    out: ["art-run-test-044-proxy-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/045-reflect-array/Android.bp b/test/045-reflect-array/Android.bp
index 5c22d68..d0cce72 100644
--- a/test/045-reflect-array/Android.bp
+++ b/test/045-reflect-array/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `045-reflect-array`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-045-reflect-array",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-045-reflect-array-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-045-reflect-array-expected",
+    out: ["art-run-test-045-reflect-array-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/046-reflect/Android.bp b/test/046-reflect/Android.bp
index 6919381..253648d 100644
--- a/test/046-reflect/Android.bp
+++ b/test/046-reflect/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `046-reflect`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-046-reflect",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-046-reflect-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-046-reflect-expected",
+    out: ["art-run-test-046-reflect-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/047-returns/Android.bp b/test/047-returns/Android.bp
index c6cdc9f..1c37e5b 100644
--- a/test/047-returns/Android.bp
+++ b/test/047-returns/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `047-returns`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-047-returns",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-047-returns-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-047-returns-expected",
+    out: ["art-run-test-047-returns-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/048-reflect-v8/Android.bp b/test/048-reflect-v8/Android.bp
index 5faf5c9..d6183d5 100644
--- a/test/048-reflect-v8/Android.bp
+++ b/test/048-reflect-v8/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `048-reflect-v8`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-048-reflect-v8",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-048-reflect-v8-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-048-reflect-v8-expected",
+    out: ["art-run-test-048-reflect-v8-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/049-show-object/Android.bp b/test/049-show-object/Android.bp
index f380e5a..103fd02 100644
--- a/test/049-show-object/Android.bp
+++ b/test/049-show-object/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `049-show-object`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-049-show-object",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-049-show-object-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-049-show-object-expected",
+    out: ["art-run-test-049-show-object-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/050-sync-test/Android.bp b/test/050-sync-test/Android.bp
index 5d66318..2752ec8 100644
--- a/test/050-sync-test/Android.bp
+++ b/test/050-sync-test/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `050-sync-test`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-050-sync-test",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-050-sync-test-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-050-sync-test-expected",
+    out: ["art-run-test-050-sync-test-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/051-thread/Android.bp b/test/051-thread/Android.bp
index 6ae8cb7..a47b0da 100644
--- a/test/051-thread/Android.bp
+++ b/test/051-thread/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `051-thread`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-051-thread",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-051-thread-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-051-thread-expected",
+    out: ["art-run-test-051-thread-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/052-verifier-fun/Android.bp b/test/052-verifier-fun/Android.bp
index 353f61d..545d0aa 100644
--- a/test/052-verifier-fun/Android.bp
+++ b/test/052-verifier-fun/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `052-verifier-fun`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-052-verifier-fun",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-052-verifier-fun-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-052-verifier-fun-expected",
+    out: ["art-run-test-052-verifier-fun-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/053-wait-some/Android.bp b/test/053-wait-some/Android.bp
index 5c5773e..11e44e9 100644
--- a/test/053-wait-some/Android.bp
+++ b/test/053-wait-some/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `053-wait-some`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-053-wait-some",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-053-wait-some-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-053-wait-some-expected",
+    out: ["art-run-test-053-wait-some-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/054-uncaught/Android.bp b/test/054-uncaught/Android.bp
index ce659a7..9e10f23 100644
--- a/test/054-uncaught/Android.bp
+++ b/test/054-uncaught/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `054-uncaught`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-054-uncaught",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-054-uncaught-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-054-uncaught-expected",
+    out: ["art-run-test-054-uncaught-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/055-enum-performance/Android.bp b/test/055-enum-performance/Android.bp
index 3ee51e3..d4322a4 100644
--- a/test/055-enum-performance/Android.bp
+++ b/test/055-enum-performance/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `055-enum-performance`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-055-enum-performance",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-055-enum-performance-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-055-enum-performance-expected",
+    out: ["art-run-test-055-enum-performance-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/058-enum-order/Android.bp b/test/058-enum-order/Android.bp
index eee260f..4b749ee 100644
--- a/test/058-enum-order/Android.bp
+++ b/test/058-enum-order/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `058-enum-order`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-058-enum-order",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-058-enum-order-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-058-enum-order-expected",
+    out: ["art-run-test-058-enum-order-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/059-finalizer-throw/Android.bp b/test/059-finalizer-throw/Android.bp
index 38687e6..d573fbe 100644
--- a/test/059-finalizer-throw/Android.bp
+++ b/test/059-finalizer-throw/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `059-finalizer-throw`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-059-finalizer-throw",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-059-finalizer-throw-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-059-finalizer-throw-expected",
+    out: ["art-run-test-059-finalizer-throw-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/061-out-of-memory/Android.bp b/test/061-out-of-memory/Android.bp
index affcac8..9858b1e 100644
--- a/test/061-out-of-memory/Android.bp
+++ b/test/061-out-of-memory/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `061-out-of-memory`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-061-out-of-memory",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-061-out-of-memory-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-061-out-of-memory-expected",
+    out: ["art-run-test-061-out-of-memory-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/062-character-encodings/Android.bp b/test/062-character-encodings/Android.bp
index 87d63cc..b0ba862 100644
--- a/test/062-character-encodings/Android.bp
+++ b/test/062-character-encodings/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `062-character-encodings`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-062-character-encodings",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-062-character-encodings-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-062-character-encodings-expected",
+    out: ["art-run-test-062-character-encodings-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/063-process-manager/Android.bp b/test/063-process-manager/Android.bp
index cc51292..b287dad 100644
--- a/test/063-process-manager/Android.bp
+++ b/test/063-process-manager/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `063-process-manager`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-063-process-manager",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-063-process-manager-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-063-process-manager-expected",
+    out: ["art-run-test-063-process-manager-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/067-preemptive-unpark/Android.bp b/test/067-preemptive-unpark/Android.bp
index 8f335e9..de2a274 100644
--- a/test/067-preemptive-unpark/Android.bp
+++ b/test/067-preemptive-unpark/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `067-preemptive-unpark`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-067-preemptive-unpark",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-067-preemptive-unpark-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-067-preemptive-unpark-expected",
+    out: ["art-run-test-067-preemptive-unpark-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/070-nio-buffer/Android.bp b/test/070-nio-buffer/Android.bp
index cb589a8..4f355ac 100644
--- a/test/070-nio-buffer/Android.bp
+++ b/test/070-nio-buffer/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `070-nio-buffer`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-070-nio-buffer",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-070-nio-buffer-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-070-nio-buffer-expected",
+    out: ["art-run-test-070-nio-buffer-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/072-precise-gc/Android.bp b/test/072-precise-gc/Android.bp
index 25f8d03..91762ca 100644
--- a/test/072-precise-gc/Android.bp
+++ b/test/072-precise-gc/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `072-precise-gc`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-072-precise-gc",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-072-precise-gc-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-072-precise-gc-expected",
+    out: ["art-run-test-072-precise-gc-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/072-reachability-fence/Android.bp b/test/072-reachability-fence/Android.bp
index d65f189..26e952a 100644
--- a/test/072-reachability-fence/Android.bp
+++ b/test/072-reachability-fence/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `072-reachability-fence`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-072-reachability-fence",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-072-reachability-fence-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-072-reachability-fence-expected",
+    out: ["art-run-test-072-reachability-fence-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/074-gc-thrash/Android.bp b/test/074-gc-thrash/Android.bp
index 3af7e48..9a2a552 100644
--- a/test/074-gc-thrash/Android.bp
+++ b/test/074-gc-thrash/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `074-gc-thrash`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-074-gc-thrash",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-074-gc-thrash-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-074-gc-thrash-expected",
+    out: ["art-run-test-074-gc-thrash-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/076-boolean-put/Android.bp b/test/076-boolean-put/Android.bp
index 65147a2..67bf41f 100644
--- a/test/076-boolean-put/Android.bp
+++ b/test/076-boolean-put/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `076-boolean-put`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-076-boolean-put",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-076-boolean-put-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-076-boolean-put-expected",
+    out: ["art-run-test-076-boolean-put-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/078-polymorphic-virtual/Android.bp b/test/078-polymorphic-virtual/Android.bp
index 33d7cf4..bf84e8a 100644
--- a/test/078-polymorphic-virtual/Android.bp
+++ b/test/078-polymorphic-virtual/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `078-polymorphic-virtual`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-078-polymorphic-virtual",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-078-polymorphic-virtual-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-078-polymorphic-virtual-expected",
+    out: ["art-run-test-078-polymorphic-virtual-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/079-phantom/Android.bp b/test/079-phantom/Android.bp
index 99138e2..960ab68 100644
--- a/test/079-phantom/Android.bp
+++ b/test/079-phantom/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `079-phantom`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-079-phantom",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-079-phantom-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-079-phantom-expected",
+    out: ["art-run-test-079-phantom-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/080-oom-fragmentation/Android.bp b/test/080-oom-fragmentation/Android.bp
index 893934e..85e4fb4 100644
--- a/test/080-oom-fragmentation/Android.bp
+++ b/test/080-oom-fragmentation/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `080-oom-fragmentation`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-080-oom-fragmentation",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-080-oom-fragmentation-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-080-oom-fragmentation-expected",
+    out: ["art-run-test-080-oom-fragmentation-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/080-oom-throw-with-finalizer/Android.bp b/test/080-oom-throw-with-finalizer/Android.bp
index bac5807..2bb2111 100644
--- a/test/080-oom-throw-with-finalizer/Android.bp
+++ b/test/080-oom-throw-with-finalizer/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `080-oom-throw-with-finalizer`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-080-oom-throw-with-finalizer",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-080-oom-throw-with-finalizer-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-080-oom-throw-with-finalizer-expected",
+    out: ["art-run-test-080-oom-throw-with-finalizer-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/080-oom-throw/Android.bp b/test/080-oom-throw/Android.bp
index 060affe..1fd84ce 100644
--- a/test/080-oom-throw/Android.bp
+++ b/test/080-oom-throw/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `080-oom-throw`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-080-oom-throw",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-080-oom-throw-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-080-oom-throw-expected",
+    out: ["art-run-test-080-oom-throw-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/081-hot-exceptions/Android.bp b/test/081-hot-exceptions/Android.bp
index 8111891..992d5f5 100644
--- a/test/081-hot-exceptions/Android.bp
+++ b/test/081-hot-exceptions/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `081-hot-exceptions`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-081-hot-exceptions",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-081-hot-exceptions-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-081-hot-exceptions-expected",
+    out: ["art-run-test-081-hot-exceptions-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/082-inline-execute/Android.bp b/test/082-inline-execute/Android.bp
index c0dedde..e65314b 100644
--- a/test/082-inline-execute/Android.bp
+++ b/test/082-inline-execute/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `082-inline-execute`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-082-inline-execute",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-082-inline-execute-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-082-inline-execute-expected",
+    out: ["art-run-test-082-inline-execute-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/083-compiler-regressions/Android.bp b/test/083-compiler-regressions/Android.bp
index 90dbc5f..f1ccb9a 100644
--- a/test/083-compiler-regressions/Android.bp
+++ b/test/083-compiler-regressions/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `083-compiler-regressions`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-083-compiler-regressions",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-083-compiler-regressions-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-083-compiler-regressions-expected",
+    out: ["art-run-test-083-compiler-regressions-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/084-class-init/Android.bp b/test/084-class-init/Android.bp
index 32be48f..e4daee7 100644
--- a/test/084-class-init/Android.bp
+++ b/test/084-class-init/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `084-class-init`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-084-class-init",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-084-class-init-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-084-class-init-expected",
+    out: ["art-run-test-084-class-init-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/086-null-super/Android.bp b/test/086-null-super/Android.bp
index 809bc4c..5cff6cd 100644
--- a/test/086-null-super/Android.bp
+++ b/test/086-null-super/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `086-null-super`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-086-null-super",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-086-null-super-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-086-null-super-expected",
+    out: ["art-run-test-086-null-super-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/087-gc-after-link/Android.bp b/test/087-gc-after-link/Android.bp
index a1b13ed..6b827dd 100644
--- a/test/087-gc-after-link/Android.bp
+++ b/test/087-gc-after-link/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `087-gc-after-link`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-087-gc-after-link",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-087-gc-after-link-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-087-gc-after-link-expected",
+    out: ["art-run-test-087-gc-after-link-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/090-loop-formation/Android.bp b/test/090-loop-formation/Android.bp
index 580db4e..bca7c60 100644
--- a/test/090-loop-formation/Android.bp
+++ b/test/090-loop-formation/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `090-loop-formation`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-090-loop-formation",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-090-loop-formation-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-090-loop-formation-expected",
+    out: ["art-run-test-090-loop-formation-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/092-locale/Android.bp b/test/092-locale/Android.bp
index 1b939c0..f610e7f 100644
--- a/test/092-locale/Android.bp
+++ b/test/092-locale/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `092-locale`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-092-locale",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-092-locale-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-092-locale-expected",
+    out: ["art-run-test-092-locale-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/093-serialization/Android.bp b/test/093-serialization/Android.bp
index 4a1f1e3..b65c508 100644
--- a/test/093-serialization/Android.bp
+++ b/test/093-serialization/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `093-serialization`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-093-serialization",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-093-serialization-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-093-serialization-expected",
+    out: ["art-run-test-093-serialization-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/094-pattern/Android.bp b/test/094-pattern/Android.bp
index f0354ca..ade2916 100644
--- a/test/094-pattern/Android.bp
+++ b/test/094-pattern/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `094-pattern`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-094-pattern",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-094-pattern-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-094-pattern-expected",
+    out: ["art-run-test-094-pattern-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/095-switch-MAX_INT/Android.bp b/test/095-switch-MAX_INT/Android.bp
index 18e78f8..deba27e 100644
--- a/test/095-switch-MAX_INT/Android.bp
+++ b/test/095-switch-MAX_INT/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `095-switch-MAX_INT`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-095-switch-MAX_INT",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-095-switch-MAX_INT-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-095-switch-MAX_INT-expected",
+    out: ["art-run-test-095-switch-MAX_INT-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/096-array-copy-concurrent-gc/Android.bp b/test/096-array-copy-concurrent-gc/Android.bp
index af1ce5b..6164d0c 100644
--- a/test/096-array-copy-concurrent-gc/Android.bp
+++ b/test/096-array-copy-concurrent-gc/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `096-array-copy-concurrent-gc`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-096-array-copy-concurrent-gc",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-096-array-copy-concurrent-gc-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-096-array-copy-concurrent-gc-expected",
+    out: ["art-run-test-096-array-copy-concurrent-gc-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/098-ddmc/Android.bp b/test/098-ddmc/Android.bp
index c8c8862..8abc8af 100644
--- a/test/098-ddmc/Android.bp
+++ b/test/098-ddmc/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `098-ddmc`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-098-ddmc",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-098-ddmc-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-098-ddmc-expected",
+    out: ["art-run-test-098-ddmc-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/099-vmdebug/Android.bp b/test/099-vmdebug/Android.bp
index dcf98ab..cca3cc1 100644
--- a/test/099-vmdebug/Android.bp
+++ b/test/099-vmdebug/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `099-vmdebug`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-099-vmdebug",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-099-vmdebug-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-099-vmdebug-expected",
+    out: ["art-run-test-099-vmdebug-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/100-reflect2/Android.bp b/test/100-reflect2/Android.bp
index d276d0d..cf1a92a 100644
--- a/test/100-reflect2/Android.bp
+++ b/test/100-reflect2/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `100-reflect2`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-100-reflect2",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-100-reflect2-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-100-reflect2-expected",
+    out: ["art-run-test-100-reflect2-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1004-checker-volatile-ref-load/Android.bp b/test/1004-checker-volatile-ref-load/Android.bp
index 38120c0..fe02b47 100644
--- a/test/1004-checker-volatile-ref-load/Android.bp
+++ b/test/1004-checker-volatile-ref-load/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1004-checker-volatile-ref-load`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1004-checker-volatile-ref-load",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1004-checker-volatile-ref-load-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1004-checker-volatile-ref-load-expected",
+    out: ["art-run-test-1004-checker-volatile-ref-load-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/101-fibonacci/Android.bp b/test/101-fibonacci/Android.bp
index bef422c..bef6813 100644
--- a/test/101-fibonacci/Android.bp
+++ b/test/101-fibonacci/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `101-fibonacci`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-101-fibonacci",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-101-fibonacci-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-101-fibonacci-expected",
+    out: ["art-run-test-101-fibonacci-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/102-concurrent-gc/Android.bp b/test/102-concurrent-gc/Android.bp
index 598aa80..60640e0 100644
--- a/test/102-concurrent-gc/Android.bp
+++ b/test/102-concurrent-gc/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `102-concurrent-gc`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-102-concurrent-gc",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-102-concurrent-gc-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-102-concurrent-gc-expected",
+    out: ["art-run-test-102-concurrent-gc-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/103-string-append/Android.bp b/test/103-string-append/Android.bp
index 1c5d2c9..d8d21fe 100644
--- a/test/103-string-append/Android.bp
+++ b/test/103-string-append/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `103-string-append`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-103-string-append",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-103-string-append-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-103-string-append-expected",
+    out: ["art-run-test-103-string-append-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/104-growth-limit/Android.bp b/test/104-growth-limit/Android.bp
index d56b31b..9c6dcad 100644
--- a/test/104-growth-limit/Android.bp
+++ b/test/104-growth-limit/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `104-growth-limit`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-104-growth-limit",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-104-growth-limit-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-104-growth-limit-expected",
+    out: ["art-run-test-104-growth-limit-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/105-invoke/Android.bp b/test/105-invoke/Android.bp
index 504bcfc..04944bc 100644
--- a/test/105-invoke/Android.bp
+++ b/test/105-invoke/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `105-invoke`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-105-invoke",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-105-invoke-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-105-invoke-expected",
+    out: ["art-run-test-105-invoke-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/106-exceptions2/Android.bp b/test/106-exceptions2/Android.bp
index 77a5596..d1dfb57 100644
--- a/test/106-exceptions2/Android.bp
+++ b/test/106-exceptions2/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `106-exceptions2`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-106-exceptions2",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-106-exceptions2-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-106-exceptions2-expected",
+    out: ["art-run-test-106-exceptions2-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/107-int-math2/Android.bp b/test/107-int-math2/Android.bp
index 50f8ecf..417f294 100644
--- a/test/107-int-math2/Android.bp
+++ b/test/107-int-math2/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `107-int-math2`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-107-int-math2",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-107-int-math2-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-107-int-math2-expected",
+    out: ["art-run-test-107-int-math2-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/108-check-cast/Android.bp b/test/108-check-cast/Android.bp
index 125405b..2a533b5 100644
--- a/test/108-check-cast/Android.bp
+++ b/test/108-check-cast/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `108-check-cast`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-108-check-cast",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-108-check-cast-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-108-check-cast-expected",
+    out: ["art-run-test-108-check-cast-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/109-suspend-check/Android.bp b/test/109-suspend-check/Android.bp
index e4df66a..79d680b 100644
--- a/test/109-suspend-check/Android.bp
+++ b/test/109-suspend-check/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `109-suspend-check`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-109-suspend-check",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-109-suspend-check-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-109-suspend-check-expected",
+    out: ["art-run-test-109-suspend-check-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/110-field-access/Android.bp b/test/110-field-access/Android.bp
index 34a739b..209a934 100644
--- a/test/110-field-access/Android.bp
+++ b/test/110-field-access/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `110-field-access`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-110-field-access",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-110-field-access-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-110-field-access-expected",
+    out: ["art-run-test-110-field-access-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/112-double-math/Android.bp b/test/112-double-math/Android.bp
index 17f748a..e979551 100644
--- a/test/112-double-math/Android.bp
+++ b/test/112-double-math/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `112-double-math`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-112-double-math",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-112-double-math-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-112-double-math-expected",
+    out: ["art-run-test-112-double-math-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/114-ParallelGC/Android.bp b/test/114-ParallelGC/Android.bp
index 3ef6487..cddeb03 100644
--- a/test/114-ParallelGC/Android.bp
+++ b/test/114-ParallelGC/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `114-ParallelGC`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-114-ParallelGC",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-114-ParallelGC-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-114-ParallelGC-expected",
+    out: ["art-run-test-114-ParallelGC-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/115-native-bridge/Android.bp b/test/115-native-bridge/Android.bp
index 9804dd7..9444afc 100644
--- a/test/115-native-bridge/Android.bp
+++ b/test/115-native-bridge/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `115-native-bridge`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-115-native-bridge",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-115-native-bridge-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-115-native-bridge-expected",
+    out: ["art-run-test-115-native-bridge-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/116-nodex2oat/Android.bp b/test/116-nodex2oat/Android.bp
index 5c1d9f4..262d12d 100644
--- a/test/116-nodex2oat/Android.bp
+++ b/test/116-nodex2oat/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `116-nodex2oat`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-116-nodex2oat",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-116-nodex2oat-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-116-nodex2oat-expected",
+    out: ["art-run-test-116-nodex2oat-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/120-hashcode/Android.bp b/test/120-hashcode/Android.bp
index 3e5c990..73c9d6a 100644
--- a/test/120-hashcode/Android.bp
+++ b/test/120-hashcode/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `120-hashcode`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-120-hashcode",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-120-hashcode-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-120-hashcode-expected",
+    out: ["art-run-test-120-hashcode-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/121-simple-suspend-check/Android.bp b/test/121-simple-suspend-check/Android.bp
index a233d19..d31deb2 100644
--- a/test/121-simple-suspend-check/Android.bp
+++ b/test/121-simple-suspend-check/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `121-simple-suspend-check`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-121-simple-suspend-check",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-121-simple-suspend-check-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-121-simple-suspend-check-expected",
+    out: ["art-run-test-121-simple-suspend-check-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/122-npe/Android.bp b/test/122-npe/Android.bp
index 47ccaf4..aca030c 100644
--- a/test/122-npe/Android.bp
+++ b/test/122-npe/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `122-npe`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-122-npe",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-122-npe-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-122-npe-expected",
+    out: ["art-run-test-122-npe-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/123-compiler-regressions-mt/Android.bp b/test/123-compiler-regressions-mt/Android.bp
index bf221bc..80e3a52 100644
--- a/test/123-compiler-regressions-mt/Android.bp
+++ b/test/123-compiler-regressions-mt/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `123-compiler-regressions-mt`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-123-compiler-regressions-mt",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-123-compiler-regressions-mt-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-123-compiler-regressions-mt-expected",
+    out: ["art-run-test-123-compiler-regressions-mt-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/123-inline-execute2/Android.bp b/test/123-inline-execute2/Android.bp
index 589d477..0220cc1 100644
--- a/test/123-inline-execute2/Android.bp
+++ b/test/123-inline-execute2/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `123-inline-execute2`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-123-inline-execute2",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-123-inline-execute2-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-123-inline-execute2-expected",
+    out: ["art-run-test-123-inline-execute2-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/125-gc-and-classloading/Android.bp b/test/125-gc-and-classloading/Android.bp
index add9dea..f6e273e 100644
--- a/test/125-gc-and-classloading/Android.bp
+++ b/test/125-gc-and-classloading/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `125-gc-and-classloading`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-125-gc-and-classloading",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-125-gc-and-classloading-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-125-gc-and-classloading-expected",
+    out: ["art-run-test-125-gc-and-classloading-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/128-reg-spill-on-implicit-nullcheck/Android.bp b/test/128-reg-spill-on-implicit-nullcheck/Android.bp
index 312fe83..646bd36 100644
--- a/test/128-reg-spill-on-implicit-nullcheck/Android.bp
+++ b/test/128-reg-spill-on-implicit-nullcheck/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `128-reg-spill-on-implicit-nullcheck`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-128-reg-spill-on-implicit-nullcheck",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-128-reg-spill-on-implicit-nullcheck-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-128-reg-spill-on-implicit-nullcheck-expected",
+    out: ["art-run-test-128-reg-spill-on-implicit-nullcheck-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/129-ThreadGetId/Android.bp b/test/129-ThreadGetId/Android.bp
index a8a2c45..cb11a36 100644
--- a/test/129-ThreadGetId/Android.bp
+++ b/test/129-ThreadGetId/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `129-ThreadGetId`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-129-ThreadGetId",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-129-ThreadGetId-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-129-ThreadGetId-expected",
+    out: ["art-run-test-129-ThreadGetId-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/132-daemon-locks-shutdown/Android.bp b/test/132-daemon-locks-shutdown/Android.bp
index c4db65d..d281024 100644
--- a/test/132-daemon-locks-shutdown/Android.bp
+++ b/test/132-daemon-locks-shutdown/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `132-daemon-locks-shutdown`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-132-daemon-locks-shutdown",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-132-daemon-locks-shutdown-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-132-daemon-locks-shutdown-expected",
+    out: ["art-run-test-132-daemon-locks-shutdown-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/133-static-invoke-super/Android.bp b/test/133-static-invoke-super/Android.bp
index d462553..511a38b 100644
--- a/test/133-static-invoke-super/Android.bp
+++ b/test/133-static-invoke-super/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `133-static-invoke-super`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-133-static-invoke-super",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-133-static-invoke-super-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-133-static-invoke-super-expected",
+    out: ["art-run-test-133-static-invoke-super-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1336-short-finalizer-timeout/Android.bp b/test/1336-short-finalizer-timeout/Android.bp
index 1784537..3387cab 100644
--- a/test/1336-short-finalizer-timeout/Android.bp
+++ b/test/1336-short-finalizer-timeout/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1336-short-finalizer-timeout`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1336-short-finalizer-timeout",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1336-short-finalizer-timeout-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1336-short-finalizer-timeout-expected",
+    out: ["art-run-test-1336-short-finalizer-timeout-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1337-gc-coverage/Android.bp b/test/1337-gc-coverage/Android.bp
index 3ee597a..6dee596 100644
--- a/test/1337-gc-coverage/Android.bp
+++ b/test/1337-gc-coverage/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1337-gc-coverage`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1337-gc-coverage",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1337-gc-coverage-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1337-gc-coverage-expected",
+    out: ["art-run-test-1337-gc-coverage-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1339-dead-reference-safe/Android.bp b/test/1339-dead-reference-safe/Android.bp
index 5b403cc..9a2ca72 100644
--- a/test/1339-dead-reference-safe/Android.bp
+++ b/test/1339-dead-reference-safe/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1339-dead-reference-safe`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1339-dead-reference-safe",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1339-dead-reference-safe-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1339-dead-reference-safe-expected",
+    out: ["art-run-test-1339-dead-reference-safe-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/136-daemon-jni-shutdown/Android.bp b/test/136-daemon-jni-shutdown/Android.bp
index bdf36d2..6741460 100644
--- a/test/136-daemon-jni-shutdown/Android.bp
+++ b/test/136-daemon-jni-shutdown/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `136-daemon-jni-shutdown`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-136-daemon-jni-shutdown",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-136-daemon-jni-shutdown-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-136-daemon-jni-shutdown-expected",
+    out: ["art-run-test-136-daemon-jni-shutdown-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/139-register-natives/Android.bp b/test/139-register-natives/Android.bp
index 00c4f32..15ad83b 100644
--- a/test/139-register-natives/Android.bp
+++ b/test/139-register-natives/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `139-register-natives`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-139-register-natives",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-139-register-natives-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-139-register-natives-expected",
+    out: ["art-run-test-139-register-natives-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/140-dce-regression/Android.bp b/test/140-dce-regression/Android.bp
index 6901dba..e94bad6 100644
--- a/test/140-dce-regression/Android.bp
+++ b/test/140-dce-regression/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `140-dce-regression`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-140-dce-regression",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-140-dce-regression-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-140-dce-regression-expected",
+    out: ["art-run-test-140-dce-regression-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/140-field-packing/Android.bp b/test/140-field-packing/Android.bp
index f27c651..baa9c0e 100644
--- a/test/140-field-packing/Android.bp
+++ b/test/140-field-packing/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `140-field-packing`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-140-field-packing",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-140-field-packing-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-140-field-packing-expected",
+    out: ["art-run-test-140-field-packing-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/143-string-value/Android.bp b/test/143-string-value/Android.bp
index a0a095d..6d0b746 100644
--- a/test/143-string-value/Android.bp
+++ b/test/143-string-value/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `143-string-value`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-143-string-value",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-143-string-value-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-143-string-value-expected",
+    out: ["art-run-test-143-string-value-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/144-static-field-sigquit/Android.bp b/test/144-static-field-sigquit/Android.bp
index a550587..e52efe8 100644
--- a/test/144-static-field-sigquit/Android.bp
+++ b/test/144-static-field-sigquit/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `144-static-field-sigquit`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-144-static-field-sigquit",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-144-static-field-sigquit-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-144-static-field-sigquit-expected",
+    out: ["art-run-test-144-static-field-sigquit-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/148-multithread-gc-annotations/Android.bp b/test/148-multithread-gc-annotations/Android.bp
index 20c6115..c27800a 100644
--- a/test/148-multithread-gc-annotations/Android.bp
+++ b/test/148-multithread-gc-annotations/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `148-multithread-gc-annotations`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-148-multithread-gc-annotations",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-148-multithread-gc-annotations-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-148-multithread-gc-annotations-expected",
+    out: ["art-run-test-148-multithread-gc-annotations-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/149-suspend-all-stress/Android.bp b/test/149-suspend-all-stress/Android.bp
index 8cd59f6..980cc6b 100644
--- a/test/149-suspend-all-stress/Android.bp
+++ b/test/149-suspend-all-stress/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `149-suspend-all-stress`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-149-suspend-all-stress",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-149-suspend-all-stress-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-149-suspend-all-stress-expected",
+    out: ["art-run-test-149-suspend-all-stress-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/150-loadlibrary/Android.bp b/test/150-loadlibrary/Android.bp
index 5bbaf9a..257e8dc 100644
--- a/test/150-loadlibrary/Android.bp
+++ b/test/150-loadlibrary/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `150-loadlibrary`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-150-loadlibrary",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-150-loadlibrary-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-150-loadlibrary-expected",
+    out: ["art-run-test-150-loadlibrary-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/151-OpenFileLimit/Android.bp b/test/151-OpenFileLimit/Android.bp
index 055e46b..8c822f3 100644
--- a/test/151-OpenFileLimit/Android.bp
+++ b/test/151-OpenFileLimit/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `151-OpenFileLimit`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-151-OpenFileLimit",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-151-OpenFileLimit-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-151-OpenFileLimit-expected",
+    out: ["art-run-test-151-OpenFileLimit-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/152-dead-large-object/Android.bp b/test/152-dead-large-object/Android.bp
index 9b2d7e2..3271e3c 100644
--- a/test/152-dead-large-object/Android.bp
+++ b/test/152-dead-large-object/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `152-dead-large-object`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-152-dead-large-object",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-152-dead-large-object-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-152-dead-large-object-expected",
+    out: ["art-run-test-152-dead-large-object-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/153-reference-stress/Android.bp b/test/153-reference-stress/Android.bp
index 9731153..0a563f4 100644
--- a/test/153-reference-stress/Android.bp
+++ b/test/153-reference-stress/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `153-reference-stress`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-153-reference-stress",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-153-reference-stress-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-153-reference-stress-expected",
+    out: ["art-run-test-153-reference-stress-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/154-gc-loop/Android.bp b/test/154-gc-loop/Android.bp
index 8a80dd3..992e2d8 100644
--- a/test/154-gc-loop/Android.bp
+++ b/test/154-gc-loop/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `154-gc-loop`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-154-gc-loop",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-154-gc-loop-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-154-gc-loop-expected",
+    out: ["art-run-test-154-gc-loop-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/156-register-dex-file-multi-loader/Android.bp b/test/156-register-dex-file-multi-loader/Android.bp
index f04c928..2a79255 100644
--- a/test/156-register-dex-file-multi-loader/Android.bp
+++ b/test/156-register-dex-file-multi-loader/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `156-register-dex-file-multi-loader`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-156-register-dex-file-multi-loader",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-156-register-dex-file-multi-loader-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-156-register-dex-file-multi-loader-expected",
+    out: ["art-run-test-156-register-dex-file-multi-loader-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/158-app-image-class-table/Android.bp b/test/158-app-image-class-table/Android.bp
index d9da847..52b9217 100644
--- a/test/158-app-image-class-table/Android.bp
+++ b/test/158-app-image-class-table/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `158-app-image-class-table`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-158-app-image-class-table",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-158-app-image-class-table-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-158-app-image-class-table-expected",
+    out: ["art-run-test-158-app-image-class-table-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/159-app-image-fields/Android.bp b/test/159-app-image-fields/Android.bp
index 8c9c2f6..7b9638e 100644
--- a/test/159-app-image-fields/Android.bp
+++ b/test/159-app-image-fields/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `159-app-image-fields`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-159-app-image-fields",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-159-app-image-fields-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-159-app-image-fields-expected",
+    out: ["art-run-test-159-app-image-fields-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/160-read-barrier-stress/Android.bp b/test/160-read-barrier-stress/Android.bp
index a134562..c8438da 100644
--- a/test/160-read-barrier-stress/Android.bp
+++ b/test/160-read-barrier-stress/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `160-read-barrier-stress`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-160-read-barrier-stress",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-160-read-barrier-stress-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-160-read-barrier-stress-expected",
+    out: ["art-run-test-160-read-barrier-stress-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/163-app-image-methods/Android.bp b/test/163-app-image-methods/Android.bp
index e9c08bc..698ab66 100644
--- a/test/163-app-image-methods/Android.bp
+++ b/test/163-app-image-methods/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `163-app-image-methods`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-163-app-image-methods",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-163-app-image-methods-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-163-app-image-methods-expected",
+    out: ["art-run-test-163-app-image-methods-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/165-lock-owner-proxy/Android.bp b/test/165-lock-owner-proxy/Android.bp
index ee7ed85..170268f 100644
--- a/test/165-lock-owner-proxy/Android.bp
+++ b/test/165-lock-owner-proxy/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `165-lock-owner-proxy`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-165-lock-owner-proxy",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-165-lock-owner-proxy-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-165-lock-owner-proxy-expected",
+    out: ["art-run-test-165-lock-owner-proxy-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/168-vmstack-annotated/Android.bp b/test/168-vmstack-annotated/Android.bp
index 7e20b55..8715e56 100644
--- a/test/168-vmstack-annotated/Android.bp
+++ b/test/168-vmstack-annotated/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `168-vmstack-annotated`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-168-vmstack-annotated",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-168-vmstack-annotated-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-168-vmstack-annotated-expected",
+    out: ["art-run-test-168-vmstack-annotated-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/169-threadgroup-jni/Android.bp b/test/169-threadgroup-jni/Android.bp
index 8a3ff15..4904eb9 100644
--- a/test/169-threadgroup-jni/Android.bp
+++ b/test/169-threadgroup-jni/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `169-threadgroup-jni`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-169-threadgroup-jni",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-169-threadgroup-jni-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-169-threadgroup-jni-expected",
+    out: ["art-run-test-169-threadgroup-jni-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/170-interface-init/Android.bp b/test/170-interface-init/Android.bp
index f6eb760..51438a8 100644
--- a/test/170-interface-init/Android.bp
+++ b/test/170-interface-init/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `170-interface-init`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-170-interface-init",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-170-interface-init-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-170-interface-init-expected",
+    out: ["art-run-test-170-interface-init-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/172-app-image-twice/Android.bp b/test/172-app-image-twice/Android.bp
index b9b613a..a1481a4 100644
--- a/test/172-app-image-twice/Android.bp
+++ b/test/172-app-image-twice/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `172-app-image-twice`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-172-app-image-twice",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-172-app-image-twice-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-172-app-image-twice-expected",
+    out: ["art-run-test-172-app-image-twice-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/174-escaping-instance-of-bad-class/Android.bp b/test/174-escaping-instance-of-bad-class/Android.bp
index c32960b..9abb4dd 100644
--- a/test/174-escaping-instance-of-bad-class/Android.bp
+++ b/test/174-escaping-instance-of-bad-class/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `174-escaping-instance-of-bad-class`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-174-escaping-instance-of-bad-class",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-174-escaping-instance-of-bad-class-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-174-escaping-instance-of-bad-class-expected",
+    out: ["art-run-test-174-escaping-instance-of-bad-class-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/175-alloc-big-bignums/Android.bp b/test/175-alloc-big-bignums/Android.bp
index c85942b..7f58a27 100644
--- a/test/175-alloc-big-bignums/Android.bp
+++ b/test/175-alloc-big-bignums/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `175-alloc-big-bignums`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-175-alloc-big-bignums",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-175-alloc-big-bignums-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-175-alloc-big-bignums-expected",
+    out: ["art-run-test-175-alloc-big-bignums-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/176-app-image-string/Android.bp b/test/176-app-image-string/Android.bp
index b634576..af7ffd2 100644
--- a/test/176-app-image-string/Android.bp
+++ b/test/176-app-image-string/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `176-app-image-string`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-176-app-image-string",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-176-app-image-string-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-176-app-image-string-expected",
+    out: ["art-run-test-176-app-image-string-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/177-visibly-initialized-deadlock/Android.bp b/test/177-visibly-initialized-deadlock/Android.bp
index facf0e2..c63b4ac 100644
--- a/test/177-visibly-initialized-deadlock/Android.bp
+++ b/test/177-visibly-initialized-deadlock/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `177-visibly-initialized-deadlock`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-177-visibly-initialized-deadlock",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-177-visibly-initialized-deadlock-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-177-visibly-initialized-deadlock-expected",
+    out: ["art-run-test-177-visibly-initialized-deadlock-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/178-app-image-native-method/Android.bp b/test/178-app-image-native-method/Android.bp
index 27b3b0b..dbe97cc 100644
--- a/test/178-app-image-native-method/Android.bp
+++ b/test/178-app-image-native-method/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `178-app-image-native-method`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-178-app-image-native-method",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-178-app-image-native-method-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-178-app-image-native-method-expected",
+    out: ["art-run-test-178-app-image-native-method-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/179-nonvirtual-jni/Android.bp b/test/179-nonvirtual-jni/Android.bp
index 5de8970..d43a52d 100644
--- a/test/179-nonvirtual-jni/Android.bp
+++ b/test/179-nonvirtual-jni/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `179-nonvirtual-jni`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-179-nonvirtual-jni",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-179-nonvirtual-jni-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-179-nonvirtual-jni-expected",
+    out: ["art-run-test-179-nonvirtual-jni-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1900-track-alloc/Android.bp b/test/1900-track-alloc/Android.bp
index 54b6f9b..1185287 100644
--- a/test/1900-track-alloc/Android.bp
+++ b/test/1900-track-alloc/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1900-track-alloc`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1900-track-alloc",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1900-track-alloc-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1900-track-alloc-expected",
+    out: ["art-run-test-1900-track-alloc-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1901-get-bytecodes/Android.bp b/test/1901-get-bytecodes/Android.bp
index 59aa4c8..962f3a7 100644
--- a/test/1901-get-bytecodes/Android.bp
+++ b/test/1901-get-bytecodes/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1901-get-bytecodes`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1901-get-bytecodes",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1901-get-bytecodes-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1901-get-bytecodes-expected",
+    out: ["art-run-test-1901-get-bytecodes-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1902-suspend/Android.bp b/test/1902-suspend/Android.bp
index 46e5717..d24e1ac 100644
--- a/test/1902-suspend/Android.bp
+++ b/test/1902-suspend/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1902-suspend`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1902-suspend",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1902-suspend-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1902-suspend-expected",
+    out: ["art-run-test-1902-suspend-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1903-suspend-self/Android.bp b/test/1903-suspend-self/Android.bp
index 65f2993..fa5e06a 100644
--- a/test/1903-suspend-self/Android.bp
+++ b/test/1903-suspend-self/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1903-suspend-self`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1903-suspend-self",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1903-suspend-self-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1903-suspend-self-expected",
+    out: ["art-run-test-1903-suspend-self-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1904-double-suspend/Android.bp b/test/1904-double-suspend/Android.bp
index bdce451..fd10124 100644
--- a/test/1904-double-suspend/Android.bp
+++ b/test/1904-double-suspend/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1904-double-suspend`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1904-double-suspend",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1904-double-suspend-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1904-double-suspend-expected",
+    out: ["art-run-test-1904-double-suspend-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1905-suspend-native/Android.bp b/test/1905-suspend-native/Android.bp
index 248cbf6..589dd3a 100644
--- a/test/1905-suspend-native/Android.bp
+++ b/test/1905-suspend-native/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1905-suspend-native`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1905-suspend-native",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1905-suspend-native-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1905-suspend-native-expected",
+    out: ["art-run-test-1905-suspend-native-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1906-suspend-list-me-first/Android.bp b/test/1906-suspend-list-me-first/Android.bp
index f92a6e7..a39e8f3 100644
--- a/test/1906-suspend-list-me-first/Android.bp
+++ b/test/1906-suspend-list-me-first/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1906-suspend-list-me-first`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1906-suspend-list-me-first",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1906-suspend-list-me-first-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1906-suspend-list-me-first-expected",
+    out: ["art-run-test-1906-suspend-list-me-first-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1907-suspend-list-self-twice/Android.bp b/test/1907-suspend-list-self-twice/Android.bp
index d0c61ab..5628bd6 100644
--- a/test/1907-suspend-list-self-twice/Android.bp
+++ b/test/1907-suspend-list-self-twice/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1907-suspend-list-self-twice`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1907-suspend-list-self-twice",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1907-suspend-list-self-twice-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1907-suspend-list-self-twice-expected",
+    out: ["art-run-test-1907-suspend-list-self-twice-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1908-suspend-native-resume-self/Android.bp b/test/1908-suspend-native-resume-self/Android.bp
index d9b8662..7aa6b9c 100644
--- a/test/1908-suspend-native-resume-self/Android.bp
+++ b/test/1908-suspend-native-resume-self/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1908-suspend-native-resume-self`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1908-suspend-native-resume-self",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1908-suspend-native-resume-self-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1908-suspend-native-resume-self-expected",
+    out: ["art-run-test-1908-suspend-native-resume-self-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1909-per-agent-tls/Android.bp b/test/1909-per-agent-tls/Android.bp
index 53d8822..2bd51a8 100644
--- a/test/1909-per-agent-tls/Android.bp
+++ b/test/1909-per-agent-tls/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1909-per-agent-tls`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1909-per-agent-tls",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1909-per-agent-tls-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1909-per-agent-tls-expected",
+    out: ["art-run-test-1909-per-agent-tls-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1910-transform-with-default/Android.bp b/test/1910-transform-with-default/Android.bp
index c765379..b4945d6 100644
--- a/test/1910-transform-with-default/Android.bp
+++ b/test/1910-transform-with-default/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1910-transform-with-default`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1910-transform-with-default",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1910-transform-with-default-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1910-transform-with-default-expected",
+    out: ["art-run-test-1910-transform-with-default-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1911-get-local-var-table/Android.bp b/test/1911-get-local-var-table/Android.bp
index ec3fd38..b89695e 100644
--- a/test/1911-get-local-var-table/Android.bp
+++ b/test/1911-get-local-var-table/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1911-get-local-var-table`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1911-get-local-var-table",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1911-get-local-var-table-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1911-get-local-var-table-expected",
+    out: ["art-run-test-1911-get-local-var-table-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1912-get-set-local-primitive/Android.bp b/test/1912-get-set-local-primitive/Android.bp
index ace9a3b..c8e2f91 100644
--- a/test/1912-get-set-local-primitive/Android.bp
+++ b/test/1912-get-set-local-primitive/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1912-get-set-local-primitive`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1912-get-set-local-primitive",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1912-get-set-local-primitive-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1912-get-set-local-primitive-expected",
+    out: ["art-run-test-1912-get-set-local-primitive-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1913-get-set-local-objects/Android.bp b/test/1913-get-set-local-objects/Android.bp
index 5d4073b..a54ff41 100644
--- a/test/1913-get-set-local-objects/Android.bp
+++ b/test/1913-get-set-local-objects/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1913-get-set-local-objects`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1913-get-set-local-objects",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1913-get-set-local-objects-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1913-get-set-local-objects-expected",
+    out: ["art-run-test-1913-get-set-local-objects-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1914-get-local-instance/Android.bp b/test/1914-get-local-instance/Android.bp
index 8b2a9ba..a34c5e8 100644
--- a/test/1914-get-local-instance/Android.bp
+++ b/test/1914-get-local-instance/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1914-get-local-instance`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1914-get-local-instance",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1914-get-local-instance-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1914-get-local-instance-expected",
+    out: ["art-run-test-1914-get-local-instance-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1915-get-set-local-current-thread/Android.bp b/test/1915-get-set-local-current-thread/Android.bp
index 467ae04..0590283 100644
--- a/test/1915-get-set-local-current-thread/Android.bp
+++ b/test/1915-get-set-local-current-thread/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1915-get-set-local-current-thread`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1915-get-set-local-current-thread",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1915-get-set-local-current-thread-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1915-get-set-local-current-thread-expected",
+    out: ["art-run-test-1915-get-set-local-current-thread-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1916-get-set-current-frame/Android.bp b/test/1916-get-set-current-frame/Android.bp
index ca22797..1b0dfca 100644
--- a/test/1916-get-set-current-frame/Android.bp
+++ b/test/1916-get-set-current-frame/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1916-get-set-current-frame`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1916-get-set-current-frame",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1916-get-set-current-frame-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1916-get-set-current-frame-expected",
+    out: ["art-run-test-1916-get-set-current-frame-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1917-get-stack-frame/Android.bp b/test/1917-get-stack-frame/Android.bp
index bc27ffc..b6ab60a 100644
--- a/test/1917-get-stack-frame/Android.bp
+++ b/test/1917-get-stack-frame/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1917-get-stack-frame`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1917-get-stack-frame",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1917-get-stack-frame-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1917-get-stack-frame-expected",
+    out: ["art-run-test-1917-get-stack-frame-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1919-vminit-thread-start-timing/Android.bp b/test/1919-vminit-thread-start-timing/Android.bp
index 7a43dae..d9c5dee 100644
--- a/test/1919-vminit-thread-start-timing/Android.bp
+++ b/test/1919-vminit-thread-start-timing/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1919-vminit-thread-start-timing`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1919-vminit-thread-start-timing",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1919-vminit-thread-start-timing-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1919-vminit-thread-start-timing-expected",
+    out: ["art-run-test-1919-vminit-thread-start-timing-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1920-suspend-native-monitor/Android.bp b/test/1920-suspend-native-monitor/Android.bp
index b6386da..dbbc674 100644
--- a/test/1920-suspend-native-monitor/Android.bp
+++ b/test/1920-suspend-native-monitor/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1920-suspend-native-monitor`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1920-suspend-native-monitor",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1920-suspend-native-monitor-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1920-suspend-native-monitor-expected",
+    out: ["art-run-test-1920-suspend-native-monitor-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1921-suspend-native-recursive-monitor/Android.bp b/test/1921-suspend-native-recursive-monitor/Android.bp
index f2e028b..02dadc8 100644
--- a/test/1921-suspend-native-recursive-monitor/Android.bp
+++ b/test/1921-suspend-native-recursive-monitor/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1921-suspend-native-recursive-monitor`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1921-suspend-native-recursive-monitor",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1921-suspend-native-recursive-monitor-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1921-suspend-native-recursive-monitor-expected",
+    out: ["art-run-test-1921-suspend-native-recursive-monitor-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1922-owned-monitors-info/Android.bp b/test/1922-owned-monitors-info/Android.bp
index 377d059..7486413 100644
--- a/test/1922-owned-monitors-info/Android.bp
+++ b/test/1922-owned-monitors-info/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1922-owned-monitors-info`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1922-owned-monitors-info",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1922-owned-monitors-info-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1922-owned-monitors-info-expected",
+    out: ["art-run-test-1922-owned-monitors-info-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1923-frame-pop/Android.bp b/test/1923-frame-pop/Android.bp
index a622ee0..2ede0ba 100644
--- a/test/1923-frame-pop/Android.bp
+++ b/test/1923-frame-pop/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1923-frame-pop`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1923-frame-pop",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1923-frame-pop-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1923-frame-pop-expected",
+    out: ["art-run-test-1923-frame-pop-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1924-frame-pop-toggle/Android.bp b/test/1924-frame-pop-toggle/Android.bp
index a51febc..553eeb8 100644
--- a/test/1924-frame-pop-toggle/Android.bp
+++ b/test/1924-frame-pop-toggle/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1924-frame-pop-toggle`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1924-frame-pop-toggle",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1924-frame-pop-toggle-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1924-frame-pop-toggle-expected",
+    out: ["art-run-test-1924-frame-pop-toggle-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1925-self-frame-pop/Android.bp b/test/1925-self-frame-pop/Android.bp
index 93b794b..1f9b951 100644
--- a/test/1925-self-frame-pop/Android.bp
+++ b/test/1925-self-frame-pop/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1925-self-frame-pop`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1925-self-frame-pop",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1925-self-frame-pop-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1925-self-frame-pop-expected",
+    out: ["art-run-test-1925-self-frame-pop-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1926-missed-frame-pop/Android.bp b/test/1926-missed-frame-pop/Android.bp
index 088c77b..979b10f 100644
--- a/test/1926-missed-frame-pop/Android.bp
+++ b/test/1926-missed-frame-pop/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1926-missed-frame-pop`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1926-missed-frame-pop",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1926-missed-frame-pop-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1926-missed-frame-pop-expected",
+    out: ["art-run-test-1926-missed-frame-pop-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1927-exception-event/Android.bp b/test/1927-exception-event/Android.bp
index 378779f..39b2693 100644
--- a/test/1927-exception-event/Android.bp
+++ b/test/1927-exception-event/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1927-exception-event`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1927-exception-event",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1927-exception-event-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1927-exception-event-expected",
+    out: ["art-run-test-1927-exception-event-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1928-exception-event-exception/Android.bp b/test/1928-exception-event-exception/Android.bp
index d59b186..dc61ee1 100644
--- a/test/1928-exception-event-exception/Android.bp
+++ b/test/1928-exception-event-exception/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1928-exception-event-exception`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1928-exception-event-exception",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1928-exception-event-exception-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1928-exception-event-exception-expected",
+    out: ["art-run-test-1928-exception-event-exception-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1930-monitor-info/Android.bp b/test/1930-monitor-info/Android.bp
index f33f595..f6c61be 100644
--- a/test/1930-monitor-info/Android.bp
+++ b/test/1930-monitor-info/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1930-monitor-info`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1930-monitor-info",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1930-monitor-info-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1930-monitor-info-expected",
+    out: ["art-run-test-1930-monitor-info-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1931-monitor-events/Android.bp b/test/1931-monitor-events/Android.bp
index 01fc773..f9abf58 100644
--- a/test/1931-monitor-events/Android.bp
+++ b/test/1931-monitor-events/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1931-monitor-events`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1931-monitor-events",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1931-monitor-events-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1931-monitor-events-expected",
+    out: ["art-run-test-1931-monitor-events-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1932-monitor-events-misc/Android.bp b/test/1932-monitor-events-misc/Android.bp
index d83c80d..64b2240 100644
--- a/test/1932-monitor-events-misc/Android.bp
+++ b/test/1932-monitor-events-misc/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1932-monitor-events-misc`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1932-monitor-events-misc",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1932-monitor-events-misc-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1932-monitor-events-misc-expected",
+    out: ["art-run-test-1932-monitor-events-misc-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1933-monitor-current-contended/Android.bp b/test/1933-monitor-current-contended/Android.bp
index 5e978f4..546c5db 100644
--- a/test/1933-monitor-current-contended/Android.bp
+++ b/test/1933-monitor-current-contended/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1933-monitor-current-contended`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1933-monitor-current-contended",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1933-monitor-current-contended-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1933-monitor-current-contended-expected",
+    out: ["art-run-test-1933-monitor-current-contended-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1934-jvmti-signal-thread/Android.bp b/test/1934-jvmti-signal-thread/Android.bp
index 7518361..aa7dcf1 100644
--- a/test/1934-jvmti-signal-thread/Android.bp
+++ b/test/1934-jvmti-signal-thread/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1934-jvmti-signal-thread`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1934-jvmti-signal-thread",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1934-jvmti-signal-thread-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1934-jvmti-signal-thread-expected",
+    out: ["art-run-test-1934-jvmti-signal-thread-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1935-get-set-current-frame-jit/Android.bp b/test/1935-get-set-current-frame-jit/Android.bp
index 3bdf84a..82b5abf 100644
--- a/test/1935-get-set-current-frame-jit/Android.bp
+++ b/test/1935-get-set-current-frame-jit/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1935-get-set-current-frame-jit`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1935-get-set-current-frame-jit",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1935-get-set-current-frame-jit-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1935-get-set-current-frame-jit-expected",
+    out: ["art-run-test-1935-get-set-current-frame-jit-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1936-thread-end-events/Android.bp b/test/1936-thread-end-events/Android.bp
index a55bf0e..1ed86d5 100644
--- a/test/1936-thread-end-events/Android.bp
+++ b/test/1936-thread-end-events/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1936-thread-end-events`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1936-thread-end-events",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1936-thread-end-events-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1936-thread-end-events-expected",
+    out: ["art-run-test-1936-thread-end-events-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1937-transform-soft-fail/Android.bp b/test/1937-transform-soft-fail/Android.bp
index e69c159..f9e2e71 100644
--- a/test/1937-transform-soft-fail/Android.bp
+++ b/test/1937-transform-soft-fail/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1937-transform-soft-fail`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1937-transform-soft-fail",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1937-transform-soft-fail-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1937-transform-soft-fail-expected",
+    out: ["art-run-test-1937-transform-soft-fail-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1938-transform-abstract-single-impl/Android.bp b/test/1938-transform-abstract-single-impl/Android.bp
index 425318c..ed1049a 100644
--- a/test/1938-transform-abstract-single-impl/Android.bp
+++ b/test/1938-transform-abstract-single-impl/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1938-transform-abstract-single-impl`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1938-transform-abstract-single-impl",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1938-transform-abstract-single-impl-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1938-transform-abstract-single-impl-expected",
+    out: ["art-run-test-1938-transform-abstract-single-impl-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1939-proxy-frames/Android.bp b/test/1939-proxy-frames/Android.bp
index 55b9e15..2c97f4e 100644
--- a/test/1939-proxy-frames/Android.bp
+++ b/test/1939-proxy-frames/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1939-proxy-frames`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1939-proxy-frames",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1939-proxy-frames-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1939-proxy-frames-expected",
+    out: ["art-run-test-1939-proxy-frames-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1941-dispose-stress/Android.bp b/test/1941-dispose-stress/Android.bp
index b4a5781..761c3c6 100644
--- a/test/1941-dispose-stress/Android.bp
+++ b/test/1941-dispose-stress/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1941-dispose-stress`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1941-dispose-stress",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1941-dispose-stress-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1941-dispose-stress-expected",
+    out: ["art-run-test-1941-dispose-stress-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1942-suspend-raw-monitor-exit/Android.bp b/test/1942-suspend-raw-monitor-exit/Android.bp
index b0a6f52..4adb990 100644
--- a/test/1942-suspend-raw-monitor-exit/Android.bp
+++ b/test/1942-suspend-raw-monitor-exit/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1942-suspend-raw-monitor-exit`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1942-suspend-raw-monitor-exit",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1942-suspend-raw-monitor-exit-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1942-suspend-raw-monitor-exit-expected",
+    out: ["art-run-test-1942-suspend-raw-monitor-exit-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1943-suspend-raw-monitor-wait/Android.bp b/test/1943-suspend-raw-monitor-wait/Android.bp
index d547743..afdd436 100644
--- a/test/1943-suspend-raw-monitor-wait/Android.bp
+++ b/test/1943-suspend-raw-monitor-wait/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1943-suspend-raw-monitor-wait`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1943-suspend-raw-monitor-wait",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1943-suspend-raw-monitor-wait-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1943-suspend-raw-monitor-wait-expected",
+    out: ["art-run-test-1943-suspend-raw-monitor-wait-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1945-proxy-method-arguments/Android.bp b/test/1945-proxy-method-arguments/Android.bp
index 41713f8..28d4a66 100644
--- a/test/1945-proxy-method-arguments/Android.bp
+++ b/test/1945-proxy-method-arguments/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1945-proxy-method-arguments`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1945-proxy-method-arguments",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1945-proxy-method-arguments-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1945-proxy-method-arguments-expected",
+    out: ["art-run-test-1945-proxy-method-arguments-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1947-breakpoint-redefine-deopt/Android.bp b/test/1947-breakpoint-redefine-deopt/Android.bp
index 76cc96e..6cade3f 100644
--- a/test/1947-breakpoint-redefine-deopt/Android.bp
+++ b/test/1947-breakpoint-redefine-deopt/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1947-breakpoint-redefine-deopt`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1947-breakpoint-redefine-deopt",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1947-breakpoint-redefine-deopt-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1947-breakpoint-redefine-deopt-expected",
+    out: ["art-run-test-1947-breakpoint-redefine-deopt-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1949-short-dex-file/Android.bp b/test/1949-short-dex-file/Android.bp
index f338a1e..587c1aa 100644
--- a/test/1949-short-dex-file/Android.bp
+++ b/test/1949-short-dex-file/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1949-short-dex-file`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1949-short-dex-file",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1949-short-dex-file-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1949-short-dex-file-expected",
+    out: ["art-run-test-1949-short-dex-file-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1951-monitor-enter-no-suspend/Android.bp b/test/1951-monitor-enter-no-suspend/Android.bp
index 6f8bcfd..89f49cd 100644
--- a/test/1951-monitor-enter-no-suspend/Android.bp
+++ b/test/1951-monitor-enter-no-suspend/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1951-monitor-enter-no-suspend`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1951-monitor-enter-no-suspend",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1951-monitor-enter-no-suspend-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1951-monitor-enter-no-suspend-expected",
+    out: ["art-run-test-1951-monitor-enter-no-suspend-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1953-pop-frame/Android.bp b/test/1953-pop-frame/Android.bp
index 8201c5b..97ac5a7 100644
--- a/test/1953-pop-frame/Android.bp
+++ b/test/1953-pop-frame/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1953-pop-frame`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1953-pop-frame",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1953-pop-frame-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1953-pop-frame-expected",
+    out: ["art-run-test-1953-pop-frame-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1954-pop-frame-jit/Android.bp b/test/1954-pop-frame-jit/Android.bp
index c1348b3..1fd8618 100644
--- a/test/1954-pop-frame-jit/Android.bp
+++ b/test/1954-pop-frame-jit/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1954-pop-frame-jit`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1954-pop-frame-jit",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1954-pop-frame-jit-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1954-pop-frame-jit-expected",
+    out: ["art-run-test-1954-pop-frame-jit-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1955-pop-frame-jit-called/Android.bp b/test/1955-pop-frame-jit-called/Android.bp
index 854c886..a6d4764 100644
--- a/test/1955-pop-frame-jit-called/Android.bp
+++ b/test/1955-pop-frame-jit-called/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1955-pop-frame-jit-called`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1955-pop-frame-jit-called",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1955-pop-frame-jit-called-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1955-pop-frame-jit-called-expected",
+    out: ["art-run-test-1955-pop-frame-jit-called-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1956-pop-frame-jit-calling/Android.bp b/test/1956-pop-frame-jit-calling/Android.bp
index 69d51e8..d6fcba1 100644
--- a/test/1956-pop-frame-jit-calling/Android.bp
+++ b/test/1956-pop-frame-jit-calling/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1956-pop-frame-jit-calling`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1956-pop-frame-jit-calling",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1956-pop-frame-jit-calling-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1956-pop-frame-jit-calling-expected",
+    out: ["art-run-test-1956-pop-frame-jit-calling-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1957-error-ext/Android.bp b/test/1957-error-ext/Android.bp
index b40d14c..4c50666 100644
--- a/test/1957-error-ext/Android.bp
+++ b/test/1957-error-ext/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1957-error-ext`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1957-error-ext",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1957-error-ext-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1957-error-ext-expected",
+    out: ["art-run-test-1957-error-ext-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1958-transform-try-jit/Android.bp b/test/1958-transform-try-jit/Android.bp
index aa4b381..8f66b5d 100644
--- a/test/1958-transform-try-jit/Android.bp
+++ b/test/1958-transform-try-jit/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1958-transform-try-jit`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1958-transform-try-jit",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1958-transform-try-jit-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1958-transform-try-jit-expected",
+    out: ["art-run-test-1958-transform-try-jit-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1959-redefine-object-instrument/Android.bp b/test/1959-redefine-object-instrument/Android.bp
index 9fcba0b..be6d6f5 100644
--- a/test/1959-redefine-object-instrument/Android.bp
+++ b/test/1959-redefine-object-instrument/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1959-redefine-object-instrument`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1959-redefine-object-instrument",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1959-redefine-object-instrument-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1959-redefine-object-instrument-expected",
+    out: ["art-run-test-1959-redefine-object-instrument-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1960-checker-bounds-codegen/Android.bp b/test/1960-checker-bounds-codegen/Android.bp
index 975b53d..15bfe1b 100644
--- a/test/1960-checker-bounds-codegen/Android.bp
+++ b/test/1960-checker-bounds-codegen/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1960-checker-bounds-codegen`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1960-checker-bounds-codegen",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1960-checker-bounds-codegen-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1960-checker-bounds-codegen-expected",
+    out: ["art-run-test-1960-checker-bounds-codegen-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1960-obsolete-jit-multithread-native/Android.bp b/test/1960-obsolete-jit-multithread-native/Android.bp
index 86b7760..1f01a2b 100644
--- a/test/1960-obsolete-jit-multithread-native/Android.bp
+++ b/test/1960-obsolete-jit-multithread-native/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1960-obsolete-jit-multithread-native`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1960-obsolete-jit-multithread-native",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1960-obsolete-jit-multithread-native-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1960-obsolete-jit-multithread-native-expected",
+    out: ["art-run-test-1960-obsolete-jit-multithread-native-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1961-checker-loop-vectorizer/Android.bp b/test/1961-checker-loop-vectorizer/Android.bp
index 2beca57..9402791 100644
--- a/test/1961-checker-loop-vectorizer/Android.bp
+++ b/test/1961-checker-loop-vectorizer/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1961-checker-loop-vectorizer`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1961-checker-loop-vectorizer",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1961-checker-loop-vectorizer-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1961-checker-loop-vectorizer-expected",
+    out: ["art-run-test-1961-checker-loop-vectorizer-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1961-obsolete-jit-multithread/Android.bp b/test/1961-obsolete-jit-multithread/Android.bp
index e70059f..e051f8c 100644
--- a/test/1961-obsolete-jit-multithread/Android.bp
+++ b/test/1961-obsolete-jit-multithread/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1961-obsolete-jit-multithread`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1961-obsolete-jit-multithread",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1961-obsolete-jit-multithread-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1961-obsolete-jit-multithread-expected",
+    out: ["art-run-test-1961-obsolete-jit-multithread-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1962-multi-thread-events/Android.bp b/test/1962-multi-thread-events/Android.bp
index 74e96d6..b87b966 100644
--- a/test/1962-multi-thread-events/Android.bp
+++ b/test/1962-multi-thread-events/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1962-multi-thread-events`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1962-multi-thread-events",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1962-multi-thread-events-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1962-multi-thread-events-expected",
+    out: ["art-run-test-1962-multi-thread-events-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1963-add-to-dex-classloader-in-memory/Android.bp b/test/1963-add-to-dex-classloader-in-memory/Android.bp
index 9f8cea0..535f057 100644
--- a/test/1963-add-to-dex-classloader-in-memory/Android.bp
+++ b/test/1963-add-to-dex-classloader-in-memory/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1963-add-to-dex-classloader-in-memory`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1963-add-to-dex-classloader-in-memory",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1963-add-to-dex-classloader-in-memory-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1963-add-to-dex-classloader-in-memory-expected",
+    out: ["art-run-test-1963-add-to-dex-classloader-in-memory-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1967-get-set-local-bad-slot/Android.bp b/test/1967-get-set-local-bad-slot/Android.bp
index 165674c..41dd458 100644
--- a/test/1967-get-set-local-bad-slot/Android.bp
+++ b/test/1967-get-set-local-bad-slot/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1967-get-set-local-bad-slot`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1967-get-set-local-bad-slot",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1967-get-set-local-bad-slot-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1967-get-set-local-bad-slot-expected",
+    out: ["art-run-test-1967-get-set-local-bad-slot-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1968-force-early-return/Android.bp b/test/1968-force-early-return/Android.bp
index ca317ab..6d28f4e 100644
--- a/test/1968-force-early-return/Android.bp
+++ b/test/1968-force-early-return/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1968-force-early-return`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1968-force-early-return",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1968-force-early-return-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1968-force-early-return-expected",
+    out: ["art-run-test-1968-force-early-return-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1969-force-early-return-void/Android.bp b/test/1969-force-early-return-void/Android.bp
index ef9e1d5..f5c1146 100644
--- a/test/1969-force-early-return-void/Android.bp
+++ b/test/1969-force-early-return-void/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1969-force-early-return-void`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1969-force-early-return-void",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1969-force-early-return-void-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1969-force-early-return-void-expected",
+    out: ["art-run-test-1969-force-early-return-void-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1970-force-early-return-long/Android.bp b/test/1970-force-early-return-long/Android.bp
index 2681944..83dcbe9 100644
--- a/test/1970-force-early-return-long/Android.bp
+++ b/test/1970-force-early-return-long/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1970-force-early-return-long`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1970-force-early-return-long",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1970-force-early-return-long-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1970-force-early-return-long-expected",
+    out: ["art-run-test-1970-force-early-return-long-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1971-multi-force-early-return/Android.bp b/test/1971-multi-force-early-return/Android.bp
index 19b3c9d..40631ea 100644
--- a/test/1971-multi-force-early-return/Android.bp
+++ b/test/1971-multi-force-early-return/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1971-multi-force-early-return`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1971-multi-force-early-return",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1971-multi-force-early-return-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1971-multi-force-early-return-expected",
+    out: ["art-run-test-1971-multi-force-early-return-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1972-jni-id-swap-indices/Android.bp b/test/1972-jni-id-swap-indices/Android.bp
index bbc86ec..b0d454c 100644
--- a/test/1972-jni-id-swap-indices/Android.bp
+++ b/test/1972-jni-id-swap-indices/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1972-jni-id-swap-indices`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1972-jni-id-swap-indices",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1972-jni-id-swap-indices-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1972-jni-id-swap-indices-expected",
+    out: ["art-run-test-1972-jni-id-swap-indices-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1973-jni-id-swap-pointer/Android.bp b/test/1973-jni-id-swap-pointer/Android.bp
index 977906d..66c6c57 100644
--- a/test/1973-jni-id-swap-pointer/Android.bp
+++ b/test/1973-jni-id-swap-pointer/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1973-jni-id-swap-pointer`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1973-jni-id-swap-pointer",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1973-jni-id-swap-pointer-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1973-jni-id-swap-pointer-expected",
+    out: ["art-run-test-1973-jni-id-swap-pointer-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1974-resize-array/Android.bp b/test/1974-resize-array/Android.bp
index ec223d3..4ffb178 100644
--- a/test/1974-resize-array/Android.bp
+++ b/test/1974-resize-array/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1974-resize-array`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1974-resize-array",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1974-resize-array-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1974-resize-array-expected",
+    out: ["art-run-test-1974-resize-array-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1975-hello-structural-transformation/Android.bp b/test/1975-hello-structural-transformation/Android.bp
index 68a46d6..872a906 100644
--- a/test/1975-hello-structural-transformation/Android.bp
+++ b/test/1975-hello-structural-transformation/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1975-hello-structural-transformation`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1975-hello-structural-transformation",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1975-hello-structural-transformation-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1975-hello-structural-transformation-expected",
+    out: ["art-run-test-1975-hello-structural-transformation-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1976-hello-structural-static-methods/Android.bp b/test/1976-hello-structural-static-methods/Android.bp
index ce1564b..dc27b02 100644
--- a/test/1976-hello-structural-static-methods/Android.bp
+++ b/test/1976-hello-structural-static-methods/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1976-hello-structural-static-methods`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1976-hello-structural-static-methods",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1976-hello-structural-static-methods-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1976-hello-structural-static-methods-expected",
+    out: ["art-run-test-1976-hello-structural-static-methods-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1977-hello-structural-obsolescence/Android.bp b/test/1977-hello-structural-obsolescence/Android.bp
index ce8d235..8c116bc 100644
--- a/test/1977-hello-structural-obsolescence/Android.bp
+++ b/test/1977-hello-structural-obsolescence/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1977-hello-structural-obsolescence`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1977-hello-structural-obsolescence",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1977-hello-structural-obsolescence-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1977-hello-structural-obsolescence-expected",
+    out: ["art-run-test-1977-hello-structural-obsolescence-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1978-regular-obsolete-then-structural-obsolescence/Android.bp b/test/1978-regular-obsolete-then-structural-obsolescence/Android.bp
index 5d33dd7..6dc0ae8 100644
--- a/test/1978-regular-obsolete-then-structural-obsolescence/Android.bp
+++ b/test/1978-regular-obsolete-then-structural-obsolescence/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1978-regular-obsolete-then-structural-obsolescence`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1978-regular-obsolete-then-structural-obsolescence",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1978-regular-obsolete-then-structural-obsolescence-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1978-regular-obsolete-then-structural-obsolescence-expected",
+    out: ["art-run-test-1978-regular-obsolete-then-structural-obsolescence-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1979-threaded-structural-transformation/Android.bp b/test/1979-threaded-structural-transformation/Android.bp
index b998967..9b7dbad 100644
--- a/test/1979-threaded-structural-transformation/Android.bp
+++ b/test/1979-threaded-structural-transformation/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1979-threaded-structural-transformation`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1979-threaded-structural-transformation",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1979-threaded-structural-transformation-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1979-threaded-structural-transformation-expected",
+    out: ["art-run-test-1979-threaded-structural-transformation-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1980-obsolete-object-cleared/Android.bp b/test/1980-obsolete-object-cleared/Android.bp
index eaafeb0..924a379 100644
--- a/test/1980-obsolete-object-cleared/Android.bp
+++ b/test/1980-obsolete-object-cleared/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1980-obsolete-object-cleared`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1980-obsolete-object-cleared",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1980-obsolete-object-cleared-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1980-obsolete-object-cleared-expected",
+    out: ["art-run-test-1980-obsolete-object-cleared-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1982-no-virtuals-structural-redefinition/Android.bp b/test/1982-no-virtuals-structural-redefinition/Android.bp
index abf71d3..364a979 100644
--- a/test/1982-no-virtuals-structural-redefinition/Android.bp
+++ b/test/1982-no-virtuals-structural-redefinition/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1982-no-virtuals-structural-redefinition`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1982-no-virtuals-structural-redefinition",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1982-no-virtuals-structural-redefinition-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1982-no-virtuals-structural-redefinition-expected",
+    out: ["art-run-test-1982-no-virtuals-structural-redefinition-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1984-structural-redefine-field-trace/Android.bp b/test/1984-structural-redefine-field-trace/Android.bp
index 9fb2e00..b64db10 100644
--- a/test/1984-structural-redefine-field-trace/Android.bp
+++ b/test/1984-structural-redefine-field-trace/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1984-structural-redefine-field-trace`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1984-structural-redefine-field-trace",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1984-structural-redefine-field-trace-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1984-structural-redefine-field-trace-expected",
+    out: ["art-run-test-1984-structural-redefine-field-trace-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1985-structural-redefine-stack-scope/Android.bp b/test/1985-structural-redefine-stack-scope/Android.bp
index 72907d5..496faad 100644
--- a/test/1985-structural-redefine-stack-scope/Android.bp
+++ b/test/1985-structural-redefine-stack-scope/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1985-structural-redefine-stack-scope`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1985-structural-redefine-stack-scope",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1985-structural-redefine-stack-scope-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1985-structural-redefine-stack-scope-expected",
+    out: ["art-run-test-1985-structural-redefine-stack-scope-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1986-structural-redefine-multi-thread-stack-scope/Android.bp b/test/1986-structural-redefine-multi-thread-stack-scope/Android.bp
index 5db3289..5748d24 100644
--- a/test/1986-structural-redefine-multi-thread-stack-scope/Android.bp
+++ b/test/1986-structural-redefine-multi-thread-stack-scope/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1986-structural-redefine-multi-thread-stack-scope`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1986-structural-redefine-multi-thread-stack-scope",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1986-structural-redefine-multi-thread-stack-scope-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1986-structural-redefine-multi-thread-stack-scope-expected",
+    out: ["art-run-test-1986-structural-redefine-multi-thread-stack-scope-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1987-structural-redefine-recursive-stack-scope/Android.bp b/test/1987-structural-redefine-recursive-stack-scope/Android.bp
index d181295..89a5e27 100644
--- a/test/1987-structural-redefine-recursive-stack-scope/Android.bp
+++ b/test/1987-structural-redefine-recursive-stack-scope/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1987-structural-redefine-recursive-stack-scope`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1987-structural-redefine-recursive-stack-scope",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1987-structural-redefine-recursive-stack-scope-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1987-structural-redefine-recursive-stack-scope-expected",
+    out: ["art-run-test-1987-structural-redefine-recursive-stack-scope-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1988-multi-structural-redefine/Android.bp b/test/1988-multi-structural-redefine/Android.bp
index e8b9f0b..204a536 100644
--- a/test/1988-multi-structural-redefine/Android.bp
+++ b/test/1988-multi-structural-redefine/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1988-multi-structural-redefine`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1988-multi-structural-redefine",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1988-multi-structural-redefine-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1988-multi-structural-redefine-expected",
+    out: ["art-run-test-1988-multi-structural-redefine-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1989-transform-bad-monitor/Android.bp b/test/1989-transform-bad-monitor/Android.bp
index ade2bda..e5c2049 100644
--- a/test/1989-transform-bad-monitor/Android.bp
+++ b/test/1989-transform-bad-monitor/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1989-transform-bad-monitor`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1989-transform-bad-monitor",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1989-transform-bad-monitor-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1989-transform-bad-monitor-expected",
+    out: ["art-run-test-1989-transform-bad-monitor-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1990-structural-bad-verify/Android.bp b/test/1990-structural-bad-verify/Android.bp
index 2e6fa18..2c4f7c5 100644
--- a/test/1990-structural-bad-verify/Android.bp
+++ b/test/1990-structural-bad-verify/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1990-structural-bad-verify`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1990-structural-bad-verify",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1990-structural-bad-verify-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1990-structural-bad-verify-expected",
+    out: ["art-run-test-1990-structural-bad-verify-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1991-hello-structural-retransform/Android.bp b/test/1991-hello-structural-retransform/Android.bp
index a216b9a..9fb8b89 100644
--- a/test/1991-hello-structural-retransform/Android.bp
+++ b/test/1991-hello-structural-retransform/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1991-hello-structural-retransform`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1991-hello-structural-retransform",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1991-hello-structural-retransform-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1991-hello-structural-retransform-expected",
+    out: ["art-run-test-1991-hello-structural-retransform-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1992-retransform-no-such-field/Android.bp b/test/1992-retransform-no-such-field/Android.bp
index 6ff548e..7bb0d2e 100644
--- a/test/1992-retransform-no-such-field/Android.bp
+++ b/test/1992-retransform-no-such-field/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1992-retransform-no-such-field`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1992-retransform-no-such-field",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1992-retransform-no-such-field-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1992-retransform-no-such-field-expected",
+    out: ["art-run-test-1992-retransform-no-such-field-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1993-fallback-non-structural/Android.bp b/test/1993-fallback-non-structural/Android.bp
index 4750e9d..1a1fcf3 100644
--- a/test/1993-fallback-non-structural/Android.bp
+++ b/test/1993-fallback-non-structural/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1993-fallback-non-structural`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1993-fallback-non-structural",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1993-fallback-non-structural-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1993-fallback-non-structural-expected",
+    out: ["art-run-test-1993-fallback-non-structural-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1994-final-virtual-structural/Android.bp b/test/1994-final-virtual-structural/Android.bp
index b73126a..772cdfe 100644
--- a/test/1994-final-virtual-structural/Android.bp
+++ b/test/1994-final-virtual-structural/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1994-final-virtual-structural`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1994-final-virtual-structural",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1994-final-virtual-structural-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1994-final-virtual-structural-expected",
+    out: ["art-run-test-1994-final-virtual-structural-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1995-final-virtual-structural-multithread/Android.bp b/test/1995-final-virtual-structural-multithread/Android.bp
index fe61627..735d24d 100644
--- a/test/1995-final-virtual-structural-multithread/Android.bp
+++ b/test/1995-final-virtual-structural-multithread/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1995-final-virtual-structural-multithread`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1995-final-virtual-structural-multithread",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1995-final-virtual-structural-multithread-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1995-final-virtual-structural-multithread-expected",
+    out: ["art-run-test-1995-final-virtual-structural-multithread-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1996-final-override-virtual-structural/Android.bp b/test/1996-final-override-virtual-structural/Android.bp
index 9763ab0..a35a423 100644
--- a/test/1996-final-override-virtual-structural/Android.bp
+++ b/test/1996-final-override-virtual-structural/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1996-final-override-virtual-structural`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1996-final-override-virtual-structural",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1996-final-override-virtual-structural-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1996-final-override-virtual-structural-expected",
+    out: ["art-run-test-1996-final-override-virtual-structural-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1997-structural-shadow-method/Android.bp b/test/1997-structural-shadow-method/Android.bp
index 4dbd350..c9392ec 100644
--- a/test/1997-structural-shadow-method/Android.bp
+++ b/test/1997-structural-shadow-method/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1997-structural-shadow-method`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1997-structural-shadow-method",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1997-structural-shadow-method-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1997-structural-shadow-method-expected",
+    out: ["art-run-test-1997-structural-shadow-method-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1998-structural-shadow-field/Android.bp b/test/1998-structural-shadow-field/Android.bp
index 2a109dc..d7bc840 100644
--- a/test/1998-structural-shadow-field/Android.bp
+++ b/test/1998-structural-shadow-field/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1998-structural-shadow-field`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1998-structural-shadow-field",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1998-structural-shadow-field-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1998-structural-shadow-field-expected",
+    out: ["art-run-test-1998-structural-shadow-field-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/1999-virtual-structural/Android.bp b/test/1999-virtual-structural/Android.bp
index 5193438..5aac38e 100644
--- a/test/1999-virtual-structural/Android.bp
+++ b/test/1999-virtual-structural/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `1999-virtual-structural`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-1999-virtual-structural",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-1999-virtual-structural-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-1999-virtual-structural-expected",
+    out: ["art-run-test-1999-virtual-structural-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2003-double-virtual-structural/Android.bp b/test/2003-double-virtual-structural/Android.bp
index 677a320..8272d1c 100644
--- a/test/2003-double-virtual-structural/Android.bp
+++ b/test/2003-double-virtual-structural/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `2003-double-virtual-structural`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-2003-double-virtual-structural",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-2003-double-virtual-structural-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-2003-double-virtual-structural-expected",
+    out: ["art-run-test-2003-double-virtual-structural-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2004-double-virtual-structural-abstract/Android.bp b/test/2004-double-virtual-structural-abstract/Android.bp
index 49fddd6..fa924e0 100644
--- a/test/2004-double-virtual-structural-abstract/Android.bp
+++ b/test/2004-double-virtual-structural-abstract/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `2004-double-virtual-structural-abstract`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-2004-double-virtual-structural-abstract",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-2004-double-virtual-structural-abstract-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-2004-double-virtual-structural-abstract-expected",
+    out: ["art-run-test-2004-double-virtual-structural-abstract-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2005-pause-all-redefine-multithreaded/Android.bp b/test/2005-pause-all-redefine-multithreaded/Android.bp
index 7624bf5..ac7ef4b 100644
--- a/test/2005-pause-all-redefine-multithreaded/Android.bp
+++ b/test/2005-pause-all-redefine-multithreaded/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `2005-pause-all-redefine-multithreaded`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-2005-pause-all-redefine-multithreaded",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-2005-pause-all-redefine-multithreaded-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-2005-pause-all-redefine-multithreaded-expected",
+    out: ["art-run-test-2005-pause-all-redefine-multithreaded-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2008-redefine-then-old-reflect-field/Android.bp b/test/2008-redefine-then-old-reflect-field/Android.bp
index c569a0a..c142f97 100644
--- a/test/2008-redefine-then-old-reflect-field/Android.bp
+++ b/test/2008-redefine-then-old-reflect-field/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `2008-redefine-then-old-reflect-field`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-2008-redefine-then-old-reflect-field",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-2008-redefine-then-old-reflect-field-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-2008-redefine-then-old-reflect-field-expected",
+    out: ["art-run-test-2008-redefine-then-old-reflect-field-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/201-built-in-except-detail-messages/Android.bp b/test/201-built-in-except-detail-messages/Android.bp
index eb58639..6356ffd 100644
--- a/test/201-built-in-except-detail-messages/Android.bp
+++ b/test/201-built-in-except-detail-messages/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `201-built-in-except-detail-messages`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-201-built-in-except-detail-messages",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-201-built-in-except-detail-messages-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-201-built-in-except-detail-messages-expected",
+    out: ["art-run-test-201-built-in-except-detail-messages-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2011-stack-walk-concurrent-instrument/Android.bp b/test/2011-stack-walk-concurrent-instrument/Android.bp
index 7142619..76ec5d1 100644
--- a/test/2011-stack-walk-concurrent-instrument/Android.bp
+++ b/test/2011-stack-walk-concurrent-instrument/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `2011-stack-walk-concurrent-instrument`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-2011-stack-walk-concurrent-instrument",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-2011-stack-walk-concurrent-instrument-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-2011-stack-walk-concurrent-instrument-expected",
+    out: ["art-run-test-2011-stack-walk-concurrent-instrument-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2019-constantcalculationsinking/Android.bp b/test/2019-constantcalculationsinking/Android.bp
index fb1816a..6a66ca4 100644
--- a/test/2019-constantcalculationsinking/Android.bp
+++ b/test/2019-constantcalculationsinking/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `2019-constantcalculationsinking`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-2019-constantcalculationsinking",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-2019-constantcalculationsinking-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-2019-constantcalculationsinking-expected",
+    out: ["art-run-test-2019-constantcalculationsinking-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/202-thread-oome/Android.bp b/test/202-thread-oome/Android.bp
index 07f9d5c..4a1daa4 100644
--- a/test/202-thread-oome/Android.bp
+++ b/test/202-thread-oome/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `202-thread-oome`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-202-thread-oome",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-202-thread-oome-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-202-thread-oome-expected",
+    out: ["art-run-test-202-thread-oome-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2020-InvokeVirtual-Inlining/Android.bp b/test/2020-InvokeVirtual-Inlining/Android.bp
index 33e70ec..a864652 100644
--- a/test/2020-InvokeVirtual-Inlining/Android.bp
+++ b/test/2020-InvokeVirtual-Inlining/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `2020-InvokeVirtual-Inlining`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-2020-InvokeVirtual-Inlining",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-2020-InvokeVirtual-Inlining-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-2020-InvokeVirtual-Inlining-expected",
+    out: ["art-run-test-2020-InvokeVirtual-Inlining-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2021-InvokeStatic-Inlining/Android.bp b/test/2021-InvokeStatic-Inlining/Android.bp
index 474f693..8ba4512 100644
--- a/test/2021-InvokeStatic-Inlining/Android.bp
+++ b/test/2021-InvokeStatic-Inlining/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `2021-InvokeStatic-Inlining`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-2021-InvokeStatic-Inlining",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-2021-InvokeStatic-Inlining-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-2021-InvokeStatic-Inlining-expected",
+    out: ["art-run-test-2021-InvokeStatic-Inlining-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2022-Invariantloops/Android.bp b/test/2022-Invariantloops/Android.bp
index 5087b02..337e006 100644
--- a/test/2022-Invariantloops/Android.bp
+++ b/test/2022-Invariantloops/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `2022-Invariantloops`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-2022-Invariantloops",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-2022-Invariantloops-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-2022-Invariantloops-expected",
+    out: ["art-run-test-2022-Invariantloops-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2023-InvariantLoops_typecast/Android.bp b/test/2023-InvariantLoops_typecast/Android.bp
index 9b7198a..c84f2c6 100644
--- a/test/2023-InvariantLoops_typecast/Android.bp
+++ b/test/2023-InvariantLoops_typecast/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `2023-InvariantLoops_typecast`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-2023-InvariantLoops_typecast",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-2023-InvariantLoops_typecast-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-2023-InvariantLoops_typecast-expected",
+    out: ["art-run-test-2023-InvariantLoops_typecast-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2024-InvariantNegativeLoop/Android.bp b/test/2024-InvariantNegativeLoop/Android.bp
index e7675a8..266c5fa 100644
--- a/test/2024-InvariantNegativeLoop/Android.bp
+++ b/test/2024-InvariantNegativeLoop/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `2024-InvariantNegativeLoop`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-2024-InvariantNegativeLoop",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-2024-InvariantNegativeLoop-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-2024-InvariantNegativeLoop-expected",
+    out: ["art-run-test-2024-InvariantNegativeLoop-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2025-ChangedArrayValue/Android.bp b/test/2025-ChangedArrayValue/Android.bp
index 3e37033..a1c8d39 100644
--- a/test/2025-ChangedArrayValue/Android.bp
+++ b/test/2025-ChangedArrayValue/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `2025-ChangedArrayValue`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-2025-ChangedArrayValue",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-2025-ChangedArrayValue-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-2025-ChangedArrayValue-expected",
+    out: ["art-run-test-2025-ChangedArrayValue-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2026-DifferentMemoryLSCouples/Android.bp b/test/2026-DifferentMemoryLSCouples/Android.bp
index af71494..642ccad 100644
--- a/test/2026-DifferentMemoryLSCouples/Android.bp
+++ b/test/2026-DifferentMemoryLSCouples/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `2026-DifferentMemoryLSCouples`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-2026-DifferentMemoryLSCouples",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-2026-DifferentMemoryLSCouples-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-2026-DifferentMemoryLSCouples-expected",
+    out: ["art-run-test-2026-DifferentMemoryLSCouples-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2027-TwiceTheSameMemoryCouple/Android.bp b/test/2027-TwiceTheSameMemoryCouple/Android.bp
index 6fb1ff5..1638094 100644
--- a/test/2027-TwiceTheSameMemoryCouple/Android.bp
+++ b/test/2027-TwiceTheSameMemoryCouple/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `2027-TwiceTheSameMemoryCouple`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-2027-TwiceTheSameMemoryCouple",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-2027-TwiceTheSameMemoryCouple-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-2027-TwiceTheSameMemoryCouple-expected",
+    out: ["art-run-test-2027-TwiceTheSameMemoryCouple-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2028-MultiBackward/Android.bp b/test/2028-MultiBackward/Android.bp
index 942ab07..2b298ca 100644
--- a/test/2028-MultiBackward/Android.bp
+++ b/test/2028-MultiBackward/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `2028-MultiBackward`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-2028-MultiBackward",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-2028-MultiBackward-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-2028-MultiBackward-expected",
+    out: ["art-run-test-2028-MultiBackward-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2029-contended-monitors/Android.bp b/test/2029-contended-monitors/Android.bp
index 838c628..fe4bed0 100644
--- a/test/2029-contended-monitors/Android.bp
+++ b/test/2029-contended-monitors/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `2029-contended-monitors`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-2029-contended-monitors",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-2029-contended-monitors-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-2029-contended-monitors-expected",
+    out: ["art-run-test-2029-contended-monitors-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/203-multi-checkpoint/Android.bp b/test/203-multi-checkpoint/Android.bp
index 51e0ec5..6c8ed70 100644
--- a/test/203-multi-checkpoint/Android.bp
+++ b/test/203-multi-checkpoint/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `203-multi-checkpoint`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-203-multi-checkpoint",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-203-multi-checkpoint-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-203-multi-checkpoint-expected",
+    out: ["art-run-test-203-multi-checkpoint-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2030-long-running-child/Android.bp b/test/2030-long-running-child/Android.bp
index 391fa78..786c8d9 100644
--- a/test/2030-long-running-child/Android.bp
+++ b/test/2030-long-running-child/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `2030-long-running-child`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-2030-long-running-child",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-2030-long-running-child-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-2030-long-running-child-expected",
+    out: ["art-run-test-2030-long-running-child-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2031-zygote-compiled-frame-deopt/Android.bp b/test/2031-zygote-compiled-frame-deopt/Android.bp
index 4f7a6b3..d111eb0 100644
--- a/test/2031-zygote-compiled-frame-deopt/Android.bp
+++ b/test/2031-zygote-compiled-frame-deopt/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `2031-zygote-compiled-frame-deopt`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-2031-zygote-compiled-frame-deopt",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-2031-zygote-compiled-frame-deopt-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-2031-zygote-compiled-frame-deopt-expected",
+    out: ["art-run-test-2031-zygote-compiled-frame-deopt-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2033-shutdown-mechanics/Android.bp b/test/2033-shutdown-mechanics/Android.bp
index c4bcc39..09a40c6 100644
--- a/test/2033-shutdown-mechanics/Android.bp
+++ b/test/2033-shutdown-mechanics/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `2033-shutdown-mechanics`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-2033-shutdown-mechanics",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-2033-shutdown-mechanics-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-2033-shutdown-mechanics-expected",
+    out: ["art-run-test-2033-shutdown-mechanics-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2036-jni-filechannel/Android.bp b/test/2036-jni-filechannel/Android.bp
index 35aa1d9..27d84dd 100644
--- a/test/2036-jni-filechannel/Android.bp
+++ b/test/2036-jni-filechannel/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `2036-jni-filechannel`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-2036-jni-filechannel",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-2036-jni-filechannel-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-2036-jni-filechannel-expected",
+    out: ["art-run-test-2036-jni-filechannel-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2231-checker-heap-poisoning/Android.bp b/test/2231-checker-heap-poisoning/Android.bp
index 4443745..6c338cb 100644
--- a/test/2231-checker-heap-poisoning/Android.bp
+++ b/test/2231-checker-heap-poisoning/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `2231-checker-heap-poisoning`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-2231-checker-heap-poisoning",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-2231-checker-heap-poisoning-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-2231-checker-heap-poisoning-expected",
+    out: ["art-run-test-2231-checker-heap-poisoning-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/300-package-override/Android.bp b/test/300-package-override/Android.bp
index fa8a21a..c429b09 100644
--- a/test/300-package-override/Android.bp
+++ b/test/300-package-override/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `300-package-override`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-300-package-override",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-300-package-override-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-300-package-override-expected",
+    out: ["art-run-test-300-package-override-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/301-abstract-protected/Android.bp b/test/301-abstract-protected/Android.bp
index 3490d1d..dced84d 100644
--- a/test/301-abstract-protected/Android.bp
+++ b/test/301-abstract-protected/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `301-abstract-protected`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-301-abstract-protected",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-301-abstract-protected-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-301-abstract-protected-expected",
+    out: ["art-run-test-301-abstract-protected-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/302-float-conversion/Android.bp b/test/302-float-conversion/Android.bp
index 00ba83a..3556130 100644
--- a/test/302-float-conversion/Android.bp
+++ b/test/302-float-conversion/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `302-float-conversion`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-302-float-conversion",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-302-float-conversion-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-302-float-conversion-expected",
+    out: ["art-run-test-302-float-conversion-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/304-method-tracing/Android.bp b/test/304-method-tracing/Android.bp
index c65b886..5087202 100644
--- a/test/304-method-tracing/Android.bp
+++ b/test/304-method-tracing/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `304-method-tracing`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-304-method-tracing",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-304-method-tracing-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-304-method-tracing-expected",
+    out: ["art-run-test-304-method-tracing-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/305-other-fault-handler/Android.bp b/test/305-other-fault-handler/Android.bp
index ec4b63e..493f777 100644
--- a/test/305-other-fault-handler/Android.bp
+++ b/test/305-other-fault-handler/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `305-other-fault-handler`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-305-other-fault-handler",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-305-other-fault-handler-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-305-other-fault-handler-expected",
+    out: ["art-run-test-305-other-fault-handler-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/401-optimizing-compiler/Android.bp b/test/401-optimizing-compiler/Android.bp
index 2e33ba6..5ba3345 100644
--- a/test/401-optimizing-compiler/Android.bp
+++ b/test/401-optimizing-compiler/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `401-optimizing-compiler`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-401-optimizing-compiler",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-401-optimizing-compiler-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-401-optimizing-compiler-expected",
+    out: ["art-run-test-401-optimizing-compiler-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/402-optimizing-control-flow/Android.bp b/test/402-optimizing-control-flow/Android.bp
index 40c92a2..bca5cc0 100644
--- a/test/402-optimizing-control-flow/Android.bp
+++ b/test/402-optimizing-control-flow/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `402-optimizing-control-flow`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-402-optimizing-control-flow",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-402-optimizing-control-flow-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-402-optimizing-control-flow-expected",
+    out: ["art-run-test-402-optimizing-control-flow-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/403-optimizing-long/Android.bp b/test/403-optimizing-long/Android.bp
index d0c2f64..aa67c5c 100644
--- a/test/403-optimizing-long/Android.bp
+++ b/test/403-optimizing-long/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `403-optimizing-long`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-403-optimizing-long",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-403-optimizing-long-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-403-optimizing-long-expected",
+    out: ["art-run-test-403-optimizing-long-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/404-optimizing-allocator/Android.bp b/test/404-optimizing-allocator/Android.bp
index 54d2014..a8b98be 100644
--- a/test/404-optimizing-allocator/Android.bp
+++ b/test/404-optimizing-allocator/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `404-optimizing-allocator`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-404-optimizing-allocator",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-404-optimizing-allocator-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-404-optimizing-allocator-expected",
+    out: ["art-run-test-404-optimizing-allocator-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/405-optimizing-long-allocator/Android.bp b/test/405-optimizing-long-allocator/Android.bp
index 7cd4575..da1846e 100644
--- a/test/405-optimizing-long-allocator/Android.bp
+++ b/test/405-optimizing-long-allocator/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `405-optimizing-long-allocator`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-405-optimizing-long-allocator",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-405-optimizing-long-allocator-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-405-optimizing-long-allocator-expected",
+    out: ["art-run-test-405-optimizing-long-allocator-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/406-fields/Android.bp b/test/406-fields/Android.bp
index 771b4eea..3f9d7de 100644
--- a/test/406-fields/Android.bp
+++ b/test/406-fields/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `406-fields`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-406-fields",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-406-fields-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-406-fields-expected",
+    out: ["art-run-test-406-fields-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/407-arrays/Android.bp b/test/407-arrays/Android.bp
index 2ce2ca6..cdcb760 100644
--- a/test/407-arrays/Android.bp
+++ b/test/407-arrays/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `407-arrays`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-407-arrays",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-407-arrays-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-407-arrays-expected",
+    out: ["art-run-test-407-arrays-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/408-move-bug/Android.bp b/test/408-move-bug/Android.bp
index 58f6187..fdd4321 100644
--- a/test/408-move-bug/Android.bp
+++ b/test/408-move-bug/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `408-move-bug`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-408-move-bug",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-408-move-bug-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-408-move-bug-expected",
+    out: ["art-run-test-408-move-bug-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/409-materialized-condition/Android.bp b/test/409-materialized-condition/Android.bp
index 568553d..272bef3 100644
--- a/test/409-materialized-condition/Android.bp
+++ b/test/409-materialized-condition/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `409-materialized-condition`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-409-materialized-condition",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-409-materialized-condition-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-409-materialized-condition-expected",
+    out: ["art-run-test-409-materialized-condition-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/410-floats/Android.bp b/test/410-floats/Android.bp
index 12739ab..d98746d 100644
--- a/test/410-floats/Android.bp
+++ b/test/410-floats/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `410-floats`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-410-floats",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-410-floats-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-410-floats-expected",
+    out: ["art-run-test-410-floats-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/411-checker-hdiv-hrem-const/Android.bp b/test/411-checker-hdiv-hrem-const/Android.bp
index be5b900..611c591 100644
--- a/test/411-checker-hdiv-hrem-const/Android.bp
+++ b/test/411-checker-hdiv-hrem-const/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `411-checker-hdiv-hrem-const`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-411-checker-hdiv-hrem-const",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-411-checker-hdiv-hrem-const-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-411-checker-hdiv-hrem-const-expected",
+    out: ["art-run-test-411-checker-hdiv-hrem-const-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/411-checker-hdiv-hrem-pow2/Android.bp b/test/411-checker-hdiv-hrem-pow2/Android.bp
index 168f74f..e41a03b 100644
--- a/test/411-checker-hdiv-hrem-pow2/Android.bp
+++ b/test/411-checker-hdiv-hrem-pow2/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `411-checker-hdiv-hrem-pow2`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-411-checker-hdiv-hrem-pow2",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-411-checker-hdiv-hrem-pow2-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-411-checker-hdiv-hrem-pow2-expected",
+    out: ["art-run-test-411-checker-hdiv-hrem-pow2-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/411-checker-instruct-simplifier-hrem/Android.bp b/test/411-checker-instruct-simplifier-hrem/Android.bp
index b6aedc3..cf309f9 100644
--- a/test/411-checker-instruct-simplifier-hrem/Android.bp
+++ b/test/411-checker-instruct-simplifier-hrem/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `411-checker-instruct-simplifier-hrem`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-411-checker-instruct-simplifier-hrem",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-411-checker-instruct-simplifier-hrem-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-411-checker-instruct-simplifier-hrem-expected",
+    out: ["art-run-test-411-checker-instruct-simplifier-hrem-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/411-optimizing-arith/Android.bp b/test/411-optimizing-arith/Android.bp
index a8cb92b..6c38776 100644
--- a/test/411-optimizing-arith/Android.bp
+++ b/test/411-optimizing-arith/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `411-optimizing-arith`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-411-optimizing-arith",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-411-optimizing-arith-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-411-optimizing-arith-expected",
+    out: ["art-run-test-411-optimizing-arith-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/413-regalloc-regression/Android.bp b/test/413-regalloc-regression/Android.bp
index f42dffe..1f520b7 100644
--- a/test/413-regalloc-regression/Android.bp
+++ b/test/413-regalloc-regression/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `413-regalloc-regression`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-413-regalloc-regression",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-413-regalloc-regression-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-413-regalloc-regression-expected",
+    out: ["art-run-test-413-regalloc-regression-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/414-static-fields/Android.bp b/test/414-static-fields/Android.bp
index b9c2c0a..f225dee 100644
--- a/test/414-static-fields/Android.bp
+++ b/test/414-static-fields/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `414-static-fields`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-414-static-fields",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-414-static-fields-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-414-static-fields-expected",
+    out: ["art-run-test-414-static-fields-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/418-const-string/Android.bp b/test/418-const-string/Android.bp
index 37fff07..274e798 100644
--- a/test/418-const-string/Android.bp
+++ b/test/418-const-string/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `418-const-string`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-418-const-string",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-418-const-string-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-418-const-string-expected",
+    out: ["art-run-test-418-const-string-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/419-long-parameter/Android.bp b/test/419-long-parameter/Android.bp
index d17b245..67360ce 100644
--- a/test/419-long-parameter/Android.bp
+++ b/test/419-long-parameter/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `419-long-parameter`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-419-long-parameter",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-419-long-parameter-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-419-long-parameter-expected",
+    out: ["art-run-test-419-long-parameter-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/420-const-class/Android.bp b/test/420-const-class/Android.bp
index 7115624..84446a0 100644
--- a/test/420-const-class/Android.bp
+++ b/test/420-const-class/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `420-const-class`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-420-const-class",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-420-const-class-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-420-const-class-expected",
+    out: ["art-run-test-420-const-class-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/421-exceptions/Android.bp b/test/421-exceptions/Android.bp
index 986cffd..4ef5789 100644
--- a/test/421-exceptions/Android.bp
+++ b/test/421-exceptions/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `421-exceptions`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-421-exceptions",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-421-exceptions-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-421-exceptions-expected",
+    out: ["art-run-test-421-exceptions-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/421-large-frame/Android.bp b/test/421-large-frame/Android.bp
index 9ff4112..dd77a65 100644
--- a/test/421-large-frame/Android.bp
+++ b/test/421-large-frame/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `421-large-frame`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-421-large-frame",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-421-large-frame-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-421-large-frame-expected",
+    out: ["art-run-test-421-large-frame-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/422-instanceof/Android.bp b/test/422-instanceof/Android.bp
index 79ff6f9..f9fc56a 100644
--- a/test/422-instanceof/Android.bp
+++ b/test/422-instanceof/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `422-instanceof`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-422-instanceof",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-422-instanceof-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-422-instanceof-expected",
+    out: ["art-run-test-422-instanceof-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/422-type-conversion/Android.bp b/test/422-type-conversion/Android.bp
index fb3a460..774d7d9 100644
--- a/test/422-type-conversion/Android.bp
+++ b/test/422-type-conversion/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `422-type-conversion`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-422-type-conversion",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-422-type-conversion-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-422-type-conversion-expected",
+    out: ["art-run-test-422-type-conversion-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/423-invoke-interface/Android.bp b/test/423-invoke-interface/Android.bp
index 1198e8b..c8e248e 100644
--- a/test/423-invoke-interface/Android.bp
+++ b/test/423-invoke-interface/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `423-invoke-interface`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-423-invoke-interface",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-423-invoke-interface-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-423-invoke-interface-expected",
+    out: ["art-run-test-423-invoke-interface-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/424-checkcast/Android.bp b/test/424-checkcast/Android.bp
index 564eff6..a5bf397 100644
--- a/test/424-checkcast/Android.bp
+++ b/test/424-checkcast/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `424-checkcast`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-424-checkcast",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-424-checkcast-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-424-checkcast-expected",
+    out: ["art-run-test-424-checkcast-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/426-monitor/Android.bp b/test/426-monitor/Android.bp
index f68a1e8..8aa2390 100644
--- a/test/426-monitor/Android.bp
+++ b/test/426-monitor/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `426-monitor`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-426-monitor",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-426-monitor-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-426-monitor-expected",
+    out: ["art-run-test-426-monitor-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/427-bitwise/Android.bp b/test/427-bitwise/Android.bp
index 07ff593..d868b31 100644
--- a/test/427-bitwise/Android.bp
+++ b/test/427-bitwise/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `427-bitwise`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-427-bitwise",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-427-bitwise-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-427-bitwise-expected",
+    out: ["art-run-test-427-bitwise-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/427-bounds/Android.bp b/test/427-bounds/Android.bp
index 6204dc4..99ce6e4 100644
--- a/test/427-bounds/Android.bp
+++ b/test/427-bounds/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `427-bounds`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-427-bounds",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-427-bounds-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-427-bounds-expected",
+    out: ["art-run-test-427-bounds-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/429-ssa-builder/Android.bp b/test/429-ssa-builder/Android.bp
index 812afe4..ae07ca4 100644
--- a/test/429-ssa-builder/Android.bp
+++ b/test/429-ssa-builder/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `429-ssa-builder`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-429-ssa-builder",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-429-ssa-builder-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-429-ssa-builder-expected",
+    out: ["art-run-test-429-ssa-builder-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/430-live-register-slow-path/Android.bp b/test/430-live-register-slow-path/Android.bp
index 57cfcb6..49e504a 100644
--- a/test/430-live-register-slow-path/Android.bp
+++ b/test/430-live-register-slow-path/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `430-live-register-slow-path`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-430-live-register-slow-path",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-430-live-register-slow-path-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-430-live-register-slow-path-expected",
+    out: ["art-run-test-430-live-register-slow-path-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/433-gvn/Android.bp b/test/433-gvn/Android.bp
index 6b48dd7..dc6e321 100644
--- a/test/433-gvn/Android.bp
+++ b/test/433-gvn/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `433-gvn`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-433-gvn",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-433-gvn-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-433-gvn-expected",
+    out: ["art-run-test-433-gvn-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/434-shifter-operand/Android.bp b/test/434-shifter-operand/Android.bp
index aabc3a0..0c8ead3 100644
--- a/test/434-shifter-operand/Android.bp
+++ b/test/434-shifter-operand/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `434-shifter-operand`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-434-shifter-operand",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-434-shifter-operand-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-434-shifter-operand-expected",
+    out: ["art-run-test-434-shifter-operand-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/435-try-finally-without-catch/Android.bp b/test/435-try-finally-without-catch/Android.bp
index 8c001d1..d6ef617 100644
--- a/test/435-try-finally-without-catch/Android.bp
+++ b/test/435-try-finally-without-catch/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `435-try-finally-without-catch`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-435-try-finally-without-catch",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-435-try-finally-without-catch-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-435-try-finally-without-catch-expected",
+    out: ["art-run-test-435-try-finally-without-catch-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/436-rem-float/Android.bp b/test/436-rem-float/Android.bp
index 7b982e5..3a8c8c4 100644
--- a/test/436-rem-float/Android.bp
+++ b/test/436-rem-float/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `436-rem-float`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-436-rem-float",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-436-rem-float-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-436-rem-float-expected",
+    out: ["art-run-test-436-rem-float-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/436-shift-constant/Android.bp b/test/436-shift-constant/Android.bp
index 5902ae8..6d2c328 100644
--- a/test/436-shift-constant/Android.bp
+++ b/test/436-shift-constant/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `436-shift-constant`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-436-shift-constant",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-436-shift-constant-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-436-shift-constant-expected",
+    out: ["art-run-test-436-shift-constant-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/437-inline/Android.bp b/test/437-inline/Android.bp
index e5bf5c5..bfc7288 100644
--- a/test/437-inline/Android.bp
+++ b/test/437-inline/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `437-inline`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-437-inline",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-437-inline-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-437-inline-expected",
+    out: ["art-run-test-437-inline-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/438-volatile/Android.bp b/test/438-volatile/Android.bp
index 020d717..f8cc4a0 100644
--- a/test/438-volatile/Android.bp
+++ b/test/438-volatile/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `438-volatile`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-438-volatile",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-438-volatile-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-438-volatile-expected",
+    out: ["art-run-test-438-volatile-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/439-npe/Android.bp b/test/439-npe/Android.bp
index 9e47a2f..9bc9227 100644
--- a/test/439-npe/Android.bp
+++ b/test/439-npe/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `439-npe`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-439-npe",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-439-npe-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-439-npe-expected",
+    out: ["art-run-test-439-npe-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/439-swap-double/Android.bp b/test/439-swap-double/Android.bp
index 5a09358..712b690 100644
--- a/test/439-swap-double/Android.bp
+++ b/test/439-swap-double/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `439-swap-double`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-439-swap-double",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-439-swap-double-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-439-swap-double-expected",
+    out: ["art-run-test-439-swap-double-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/440-stmp/Android.bp b/test/440-stmp/Android.bp
index 5962eca..b396b56 100644
--- a/test/440-stmp/Android.bp
+++ b/test/440-stmp/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `440-stmp`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-440-stmp",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-440-stmp-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-440-stmp-expected",
+    out: ["art-run-test-440-stmp-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/441-checker-inliner/Android.bp b/test/441-checker-inliner/Android.bp
index dbd41aa..f38153c 100644
--- a/test/441-checker-inliner/Android.bp
+++ b/test/441-checker-inliner/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `441-checker-inliner`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-441-checker-inliner",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-441-checker-inliner-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-441-checker-inliner-expected",
+    out: ["art-run-test-441-checker-inliner-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/443-not-bool-inline/Android.bp b/test/443-not-bool-inline/Android.bp
index d177914..8480485 100644
--- a/test/443-not-bool-inline/Android.bp
+++ b/test/443-not-bool-inline/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `443-not-bool-inline`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-443-not-bool-inline",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-443-not-bool-inline-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-443-not-bool-inline-expected",
+    out: ["art-run-test-443-not-bool-inline-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/444-checker-nce/Android.bp b/test/444-checker-nce/Android.bp
index ecc23dd..00ad03e 100644
--- a/test/444-checker-nce/Android.bp
+++ b/test/444-checker-nce/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `444-checker-nce`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-444-checker-nce",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-444-checker-nce-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-444-checker-nce-expected",
+    out: ["art-run-test-444-checker-nce-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/445-checker-licm/Android.bp b/test/445-checker-licm/Android.bp
index feb1c17..42b6566 100644
--- a/test/445-checker-licm/Android.bp
+++ b/test/445-checker-licm/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `445-checker-licm`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-445-checker-licm",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-445-checker-licm-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-445-checker-licm-expected",
+    out: ["art-run-test-445-checker-licm-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/446-checker-inliner2/Android.bp b/test/446-checker-inliner2/Android.bp
index edc7a63..1d9a828 100644
--- a/test/446-checker-inliner2/Android.bp
+++ b/test/446-checker-inliner2/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `446-checker-inliner2`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-446-checker-inliner2",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-446-checker-inliner2-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-446-checker-inliner2-expected",
+    out: ["art-run-test-446-checker-inliner2-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/447-checker-inliner3/Android.bp b/test/447-checker-inliner3/Android.bp
index 3c7a30a..1bbb528 100644
--- a/test/447-checker-inliner3/Android.bp
+++ b/test/447-checker-inliner3/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `447-checker-inliner3`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-447-checker-inliner3",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-447-checker-inliner3-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-447-checker-inliner3-expected",
+    out: ["art-run-test-447-checker-inliner3-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/449-checker-bce-rem/Android.bp b/test/449-checker-bce-rem/Android.bp
index e56cbbb..7090855 100644
--- a/test/449-checker-bce-rem/Android.bp
+++ b/test/449-checker-bce-rem/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `449-checker-bce-rem`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-449-checker-bce-rem",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-449-checker-bce-rem-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-449-checker-bce-rem-expected",
+    out: ["art-run-test-449-checker-bce-rem-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/449-checker-bce/Android.bp b/test/449-checker-bce/Android.bp
index a5034a1..c23d956 100644
--- a/test/449-checker-bce/Android.bp
+++ b/test/449-checker-bce/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `449-checker-bce`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-449-checker-bce",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-449-checker-bce-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-449-checker-bce-expected",
+    out: ["art-run-test-449-checker-bce-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/450-checker-types/Android.bp b/test/450-checker-types/Android.bp
index 8f8a881..75e6393 100644
--- a/test/450-checker-types/Android.bp
+++ b/test/450-checker-types/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `450-checker-types`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-450-checker-types",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-450-checker-types-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-450-checker-types-expected",
+    out: ["art-run-test-450-checker-types-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/451-regression-add-float/Android.bp b/test/451-regression-add-float/Android.bp
index d9f9baa..a473db7 100644
--- a/test/451-regression-add-float/Android.bp
+++ b/test/451-regression-add-float/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `451-regression-add-float`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-451-regression-add-float",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-451-regression-add-float-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-451-regression-add-float-expected",
+    out: ["art-run-test-451-regression-add-float-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/451-spill-splot/Android.bp b/test/451-spill-splot/Android.bp
index 705d618..fde3892 100644
--- a/test/451-spill-splot/Android.bp
+++ b/test/451-spill-splot/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `451-spill-splot`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-451-spill-splot",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-451-spill-splot-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-451-spill-splot-expected",
+    out: ["art-run-test-451-spill-splot-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/454-get-vreg/Android.bp b/test/454-get-vreg/Android.bp
index cc3c993..857f9a2 100644
--- a/test/454-get-vreg/Android.bp
+++ b/test/454-get-vreg/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `454-get-vreg`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-454-get-vreg",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-454-get-vreg-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-454-get-vreg-expected",
+    out: ["art-run-test-454-get-vreg-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/455-checker-gvn/Android.bp b/test/455-checker-gvn/Android.bp
index 261a4ff..adf6ba2 100644
--- a/test/455-checker-gvn/Android.bp
+++ b/test/455-checker-gvn/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `455-checker-gvn`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-455-checker-gvn",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-455-checker-gvn-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-455-checker-gvn-expected",
+    out: ["art-run-test-455-checker-gvn-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/456-baseline-array-set/Android.bp b/test/456-baseline-array-set/Android.bp
index 58c0e1a..22beae4 100644
--- a/test/456-baseline-array-set/Android.bp
+++ b/test/456-baseline-array-set/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `456-baseline-array-set`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-456-baseline-array-set",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-456-baseline-array-set-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-456-baseline-array-set-expected",
+    out: ["art-run-test-456-baseline-array-set-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/458-long-to-fpu/Android.bp b/test/458-long-to-fpu/Android.bp
index 9796543..a5b01c1 100644
--- a/test/458-long-to-fpu/Android.bp
+++ b/test/458-long-to-fpu/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `458-long-to-fpu`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-458-long-to-fpu",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-458-long-to-fpu-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-458-long-to-fpu-expected",
+    out: ["art-run-test-458-long-to-fpu-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/461-get-reference-vreg/Android.bp b/test/461-get-reference-vreg/Android.bp
index 289cf13..99d4a06 100644
--- a/test/461-get-reference-vreg/Android.bp
+++ b/test/461-get-reference-vreg/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `461-get-reference-vreg`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-461-get-reference-vreg",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-461-get-reference-vreg-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-461-get-reference-vreg-expected",
+    out: ["art-run-test-461-get-reference-vreg-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/464-checker-inline-sharpen-calls/Android.bp b/test/464-checker-inline-sharpen-calls/Android.bp
index bd0554e..fed3900 100644
--- a/test/464-checker-inline-sharpen-calls/Android.bp
+++ b/test/464-checker-inline-sharpen-calls/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `464-checker-inline-sharpen-calls`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-464-checker-inline-sharpen-calls",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-464-checker-inline-sharpen-calls-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-464-checker-inline-sharpen-calls-expected",
+    out: ["art-run-test-464-checker-inline-sharpen-calls-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/465-checker-clinit-gvn/Android.bp b/test/465-checker-clinit-gvn/Android.bp
index 5c33c0b..d02b38f 100644
--- a/test/465-checker-clinit-gvn/Android.bp
+++ b/test/465-checker-clinit-gvn/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `465-checker-clinit-gvn`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-465-checker-clinit-gvn",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-465-checker-clinit-gvn-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-465-checker-clinit-gvn-expected",
+    out: ["art-run-test-465-checker-clinit-gvn-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/466-get-live-vreg/Android.bp b/test/466-get-live-vreg/Android.bp
index 2665b26..3dc9604 100644
--- a/test/466-get-live-vreg/Android.bp
+++ b/test/466-get-live-vreg/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `466-get-live-vreg`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-466-get-live-vreg",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-466-get-live-vreg-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-466-get-live-vreg-expected",
+    out: ["art-run-test-466-get-live-vreg-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/469-condition-materialization/Android.bp b/test/469-condition-materialization/Android.bp
index a18a40b..1fac4dd 100644
--- a/test/469-condition-materialization/Android.bp
+++ b/test/469-condition-materialization/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `469-condition-materialization`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-469-condition-materialization",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-469-condition-materialization-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-469-condition-materialization-expected",
+    out: ["art-run-test-469-condition-materialization-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/470-huge-method/Android.bp b/test/470-huge-method/Android.bp
index e065218..b44467a 100644
--- a/test/470-huge-method/Android.bp
+++ b/test/470-huge-method/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `470-huge-method`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-470-huge-method",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-470-huge-method-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-470-huge-method-expected",
+    out: ["art-run-test-470-huge-method-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/471-deopt-environment/Android.bp b/test/471-deopt-environment/Android.bp
index b368089..198eb2b 100644
--- a/test/471-deopt-environment/Android.bp
+++ b/test/471-deopt-environment/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `471-deopt-environment`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-471-deopt-environment",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-471-deopt-environment-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-471-deopt-environment-expected",
+    out: ["art-run-test-471-deopt-environment-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/472-type-propagation/Android.bp b/test/472-type-propagation/Android.bp
index c7f7cc9..150447d 100644
--- a/test/472-type-propagation/Android.bp
+++ b/test/472-type-propagation/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `472-type-propagation`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-472-type-propagation",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-472-type-propagation-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-472-type-propagation-expected",
+    out: ["art-run-test-472-type-propagation-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/473-checker-inliner-constants/Android.bp b/test/473-checker-inliner-constants/Android.bp
index 8ace442..b4e3f58 100644
--- a/test/473-checker-inliner-constants/Android.bp
+++ b/test/473-checker-inliner-constants/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `473-checker-inliner-constants`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-473-checker-inliner-constants",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-473-checker-inliner-constants-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-473-checker-inliner-constants-expected",
+    out: ["art-run-test-473-checker-inliner-constants-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/473-remove-dead-block/Android.bp b/test/473-remove-dead-block/Android.bp
index 31de61d..1d9bb58 100644
--- a/test/473-remove-dead-block/Android.bp
+++ b/test/473-remove-dead-block/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `473-remove-dead-block`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-473-remove-dead-block",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-473-remove-dead-block-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-473-remove-dead-block-expected",
+    out: ["art-run-test-473-remove-dead-block-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/474-checker-boolean-input/Android.bp b/test/474-checker-boolean-input/Android.bp
index 245eab3..a69d744 100644
--- a/test/474-checker-boolean-input/Android.bp
+++ b/test/474-checker-boolean-input/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `474-checker-boolean-input`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-474-checker-boolean-input",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-474-checker-boolean-input-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-474-checker-boolean-input-expected",
+    out: ["art-run-test-474-checker-boolean-input-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/474-fp-sub-neg/Android.bp b/test/474-fp-sub-neg/Android.bp
index 75b838a..c0799fa 100644
--- a/test/474-fp-sub-neg/Android.bp
+++ b/test/474-fp-sub-neg/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `474-fp-sub-neg`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-474-fp-sub-neg",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-474-fp-sub-neg-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-474-fp-sub-neg-expected",
+    out: ["art-run-test-474-fp-sub-neg-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/475-simplify-mul-zero/Android.bp b/test/475-simplify-mul-zero/Android.bp
index 475a841..306edec 100644
--- a/test/475-simplify-mul-zero/Android.bp
+++ b/test/475-simplify-mul-zero/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `475-simplify-mul-zero`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-475-simplify-mul-zero",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-475-simplify-mul-zero-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-475-simplify-mul-zero-expected",
+    out: ["art-run-test-475-simplify-mul-zero-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/476-checker-ctor-fence-redun-elim/Android.bp b/test/476-checker-ctor-fence-redun-elim/Android.bp
index 2a605a5..b423860 100644
--- a/test/476-checker-ctor-fence-redun-elim/Android.bp
+++ b/test/476-checker-ctor-fence-redun-elim/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `476-checker-ctor-fence-redun-elim`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-476-checker-ctor-fence-redun-elim",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-476-checker-ctor-fence-redun-elim-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-476-checker-ctor-fence-redun-elim-expected",
+    out: ["art-run-test-476-checker-ctor-fence-redun-elim-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/476-checker-ctor-memory-barrier/Android.bp b/test/476-checker-ctor-memory-barrier/Android.bp
index 806002f..a7ea958 100644
--- a/test/476-checker-ctor-memory-barrier/Android.bp
+++ b/test/476-checker-ctor-memory-barrier/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `476-checker-ctor-memory-barrier`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-476-checker-ctor-memory-barrier",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-476-checker-ctor-memory-barrier-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-476-checker-ctor-memory-barrier-expected",
+    out: ["art-run-test-476-checker-ctor-memory-barrier-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/476-clinit-inline-static-invoke/Android.bp b/test/476-clinit-inline-static-invoke/Android.bp
index 83ab7bf..036c126 100644
--- a/test/476-clinit-inline-static-invoke/Android.bp
+++ b/test/476-clinit-inline-static-invoke/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `476-clinit-inline-static-invoke`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-476-clinit-inline-static-invoke",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-476-clinit-inline-static-invoke-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-476-clinit-inline-static-invoke-expected",
+    out: ["art-run-test-476-clinit-inline-static-invoke-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/477-checker-bound-type/Android.bp b/test/477-checker-bound-type/Android.bp
index 78e03cd..ad7f3c8 100644
--- a/test/477-checker-bound-type/Android.bp
+++ b/test/477-checker-bound-type/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `477-checker-bound-type`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-477-checker-bound-type",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-477-checker-bound-type-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-477-checker-bound-type-expected",
+    out: ["art-run-test-477-checker-bound-type-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/477-long-2-float-convers-precision/Android.bp b/test/477-long-2-float-convers-precision/Android.bp
index 44dbbec..00e2c3f 100644
--- a/test/477-long-2-float-convers-precision/Android.bp
+++ b/test/477-long-2-float-convers-precision/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `477-long-2-float-convers-precision`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-477-long-2-float-convers-precision",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-477-long-2-float-convers-precision-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-477-long-2-float-convers-precision-expected",
+    out: ["art-run-test-477-long-2-float-convers-precision-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/478-checker-clinit-check-pruning/Android.bp b/test/478-checker-clinit-check-pruning/Android.bp
index 9da7a5f..bcbd697 100644
--- a/test/478-checker-clinit-check-pruning/Android.bp
+++ b/test/478-checker-clinit-check-pruning/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `478-checker-clinit-check-pruning`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-478-checker-clinit-check-pruning",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-478-checker-clinit-check-pruning-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-478-checker-clinit-check-pruning-expected",
+    out: ["art-run-test-478-checker-clinit-check-pruning-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/478-checker-inline-noreturn/Android.bp b/test/478-checker-inline-noreturn/Android.bp
index 01e623e..3b03957 100644
--- a/test/478-checker-inline-noreturn/Android.bp
+++ b/test/478-checker-inline-noreturn/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `478-checker-inline-noreturn`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-478-checker-inline-noreturn",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-478-checker-inline-noreturn-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-478-checker-inline-noreturn-expected",
+    out: ["art-run-test-478-checker-inline-noreturn-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/478-checker-inliner-nested-loop/Android.bp b/test/478-checker-inliner-nested-loop/Android.bp
index 2e86e79..2bd2078 100644
--- a/test/478-checker-inliner-nested-loop/Android.bp
+++ b/test/478-checker-inliner-nested-loop/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `478-checker-inliner-nested-loop`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-478-checker-inliner-nested-loop",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-478-checker-inliner-nested-loop-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-478-checker-inliner-nested-loop-expected",
+    out: ["art-run-test-478-checker-inliner-nested-loop-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/479-regression-implicit-null-check/Android.bp b/test/479-regression-implicit-null-check/Android.bp
index ae00c2f..3dc346b 100644
--- a/test/479-regression-implicit-null-check/Android.bp
+++ b/test/479-regression-implicit-null-check/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `479-regression-implicit-null-check`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-479-regression-implicit-null-check",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-479-regression-implicit-null-check-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-479-regression-implicit-null-check-expected",
+    out: ["art-run-test-479-regression-implicit-null-check-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/480-checker-dead-blocks/Android.bp b/test/480-checker-dead-blocks/Android.bp
index 0ba355b..146ad4d 100644
--- a/test/480-checker-dead-blocks/Android.bp
+++ b/test/480-checker-dead-blocks/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `480-checker-dead-blocks`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-480-checker-dead-blocks",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-480-checker-dead-blocks-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-480-checker-dead-blocks-expected",
+    out: ["art-run-test-480-checker-dead-blocks-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/481-regression-phi-cond/Android.bp b/test/481-regression-phi-cond/Android.bp
index d93d1f8..63d711c 100644
--- a/test/481-regression-phi-cond/Android.bp
+++ b/test/481-regression-phi-cond/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `481-regression-phi-cond`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-481-regression-phi-cond",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-481-regression-phi-cond-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-481-regression-phi-cond-expected",
+    out: ["art-run-test-481-regression-phi-cond-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/482-checker-loop-back-edge-use/Android.bp b/test/482-checker-loop-back-edge-use/Android.bp
index 7f177bb..208086a 100644
--- a/test/482-checker-loop-back-edge-use/Android.bp
+++ b/test/482-checker-loop-back-edge-use/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `482-checker-loop-back-edge-use`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-482-checker-loop-back-edge-use",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-482-checker-loop-back-edge-use-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-482-checker-loop-back-edge-use-expected",
+    out: ["art-run-test-482-checker-loop-back-edge-use-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/483-dce-block/Android.bp b/test/483-dce-block/Android.bp
index 57e2e75..df12838 100644
--- a/test/483-dce-block/Android.bp
+++ b/test/483-dce-block/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `483-dce-block`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-483-dce-block",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-483-dce-block-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-483-dce-block-expected",
+    out: ["art-run-test-483-dce-block-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/485-checker-dce-switch/Android.bp b/test/485-checker-dce-switch/Android.bp
index dc1b931..b9df8ba 100644
--- a/test/485-checker-dce-switch/Android.bp
+++ b/test/485-checker-dce-switch/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `485-checker-dce-switch`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-485-checker-dce-switch",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-485-checker-dce-switch-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-485-checker-dce-switch-expected",
+    out: ["art-run-test-485-checker-dce-switch-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/486-checker-must-do-null-check/Android.bp b/test/486-checker-must-do-null-check/Android.bp
index 11108ba..b1b29fb 100644
--- a/test/486-checker-must-do-null-check/Android.bp
+++ b/test/486-checker-must-do-null-check/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `486-checker-must-do-null-check`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-486-checker-must-do-null-check",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-486-checker-must-do-null-check-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-486-checker-must-do-null-check-expected",
+    out: ["art-run-test-486-checker-must-do-null-check-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/487-checker-inline-calls/Android.bp b/test/487-checker-inline-calls/Android.bp
index 75df591..ba3c049 100644
--- a/test/487-checker-inline-calls/Android.bp
+++ b/test/487-checker-inline-calls/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `487-checker-inline-calls`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-487-checker-inline-calls",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-487-checker-inline-calls-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-487-checker-inline-calls-expected",
+    out: ["art-run-test-487-checker-inline-calls-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/488-checker-inline-recursive-calls/Android.bp b/test/488-checker-inline-recursive-calls/Android.bp
index fc2e37e..a7c082c 100644
--- a/test/488-checker-inline-recursive-calls/Android.bp
+++ b/test/488-checker-inline-recursive-calls/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `488-checker-inline-recursive-calls`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-488-checker-inline-recursive-calls",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-488-checker-inline-recursive-calls-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-488-checker-inline-recursive-calls-expected",
+    out: ["art-run-test-488-checker-inline-recursive-calls-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/489-current-method-regression/Android.bp b/test/489-current-method-regression/Android.bp
index 29ef387..9aed8c9 100644
--- a/test/489-current-method-regression/Android.bp
+++ b/test/489-current-method-regression/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `489-current-method-regression`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-489-current-method-regression",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-489-current-method-regression-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-489-current-method-regression-expected",
+    out: ["art-run-test-489-current-method-regression-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/490-checker-inline/Android.bp b/test/490-checker-inline/Android.bp
index 5ce82ff..5058bf1 100644
--- a/test/490-checker-inline/Android.bp
+++ b/test/490-checker-inline/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `490-checker-inline`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-490-checker-inline",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-490-checker-inline-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-490-checker-inline-expected",
+    out: ["art-run-test-490-checker-inline-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/491-current-method/Android.bp b/test/491-current-method/Android.bp
index 52b238a..af5410e 100644
--- a/test/491-current-method/Android.bp
+++ b/test/491-current-method/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `491-current-method`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-491-current-method",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-491-current-method-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-491-current-method-expected",
+    out: ["art-run-test-491-current-method-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/492-checker-inline-invoke-interface/Android.bp b/test/492-checker-inline-invoke-interface/Android.bp
index 8e63f17..7e73608 100644
--- a/test/492-checker-inline-invoke-interface/Android.bp
+++ b/test/492-checker-inline-invoke-interface/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `492-checker-inline-invoke-interface`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-492-checker-inline-invoke-interface",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-492-checker-inline-invoke-interface-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-492-checker-inline-invoke-interface-expected",
+    out: ["art-run-test-492-checker-inline-invoke-interface-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/493-checker-inline-invoke-interface/Android.bp b/test/493-checker-inline-invoke-interface/Android.bp
index 936526a..18e75b1 100644
--- a/test/493-checker-inline-invoke-interface/Android.bp
+++ b/test/493-checker-inline-invoke-interface/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `493-checker-inline-invoke-interface`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-493-checker-inline-invoke-interface",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-493-checker-inline-invoke-interface-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-493-checker-inline-invoke-interface-expected",
+    out: ["art-run-test-493-checker-inline-invoke-interface-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/494-checker-instanceof-tests/Android.bp b/test/494-checker-instanceof-tests/Android.bp
index 4488500..b7ab6af 100644
--- a/test/494-checker-instanceof-tests/Android.bp
+++ b/test/494-checker-instanceof-tests/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `494-checker-instanceof-tests`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-494-checker-instanceof-tests",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-494-checker-instanceof-tests-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-494-checker-instanceof-tests-expected",
+    out: ["art-run-test-494-checker-instanceof-tests-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/495-checker-checkcast-tests/Android.bp b/test/495-checker-checkcast-tests/Android.bp
index 1e9e9d3..b111451 100644
--- a/test/495-checker-checkcast-tests/Android.bp
+++ b/test/495-checker-checkcast-tests/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `495-checker-checkcast-tests`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-495-checker-checkcast-tests",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-495-checker-checkcast-tests-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-495-checker-checkcast-tests-expected",
+    out: ["art-run-test-495-checker-checkcast-tests-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/496-checker-inlining-class-loader/Android.bp b/test/496-checker-inlining-class-loader/Android.bp
index 0bd2998..39ba836 100644
--- a/test/496-checker-inlining-class-loader/Android.bp
+++ b/test/496-checker-inlining-class-loader/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `496-checker-inlining-class-loader`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-496-checker-inlining-class-loader",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-496-checker-inlining-class-loader-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-496-checker-inlining-class-loader-expected",
+    out: ["art-run-test-496-checker-inlining-class-loader-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/497-inlining-and-class-loader/Android.bp b/test/497-inlining-and-class-loader/Android.bp
index f947a10..57266d0 100644
--- a/test/497-inlining-and-class-loader/Android.bp
+++ b/test/497-inlining-and-class-loader/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `497-inlining-and-class-loader`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-497-inlining-and-class-loader",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-497-inlining-and-class-loader-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-497-inlining-and-class-loader-expected",
+    out: ["art-run-test-497-inlining-and-class-loader-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/499-bce-phi-array-length/Android.bp b/test/499-bce-phi-array-length/Android.bp
index 78f5539..fbf2ad8 100644
--- a/test/499-bce-phi-array-length/Android.bp
+++ b/test/499-bce-phi-array-length/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `499-bce-phi-array-length`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-499-bce-phi-array-length",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-499-bce-phi-array-length-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-499-bce-phi-array-length-expected",
+    out: ["art-run-test-499-bce-phi-array-length-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/500-instanceof/Android.bp b/test/500-instanceof/Android.bp
index 816d999..e0a7518 100644
--- a/test/500-instanceof/Android.bp
+++ b/test/500-instanceof/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `500-instanceof`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-500-instanceof",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-500-instanceof-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-500-instanceof-expected",
+    out: ["art-run-test-500-instanceof-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/505-simplifier-type-propagation/Android.bp b/test/505-simplifier-type-propagation/Android.bp
index 7b2f2ae..62d42db 100644
--- a/test/505-simplifier-type-propagation/Android.bp
+++ b/test/505-simplifier-type-propagation/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `505-simplifier-type-propagation`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-505-simplifier-type-propagation",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-505-simplifier-type-propagation-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-505-simplifier-type-propagation-expected",
+    out: ["art-run-test-505-simplifier-type-propagation-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/507-boolean-test/Android.bp b/test/507-boolean-test/Android.bp
index b5a7686..3d085b0 100644
--- a/test/507-boolean-test/Android.bp
+++ b/test/507-boolean-test/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `507-boolean-test`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-507-boolean-test",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-507-boolean-test-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-507-boolean-test-expected",
+    out: ["art-run-test-507-boolean-test-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/507-referrer/Android.bp b/test/507-referrer/Android.bp
index cae8a4e..42b6d85 100644
--- a/test/507-referrer/Android.bp
+++ b/test/507-referrer/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `507-referrer`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-507-referrer",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-507-referrer-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-507-referrer-expected",
+    out: ["art-run-test-507-referrer-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/508-checker-disassembly/Android.bp b/test/508-checker-disassembly/Android.bp
index a0c7edf..befbb6f 100644
--- a/test/508-checker-disassembly/Android.bp
+++ b/test/508-checker-disassembly/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `508-checker-disassembly`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-508-checker-disassembly",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-508-checker-disassembly-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-508-checker-disassembly-expected",
+    out: ["art-run-test-508-checker-disassembly-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/508-referrer-method/Android.bp b/test/508-referrer-method/Android.bp
index e20fd3c..b148313 100644
--- a/test/508-referrer-method/Android.bp
+++ b/test/508-referrer-method/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `508-referrer-method`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-508-referrer-method",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-508-referrer-method-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-508-referrer-method-expected",
+    out: ["art-run-test-508-referrer-method-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/513-array-deopt/Android.bp b/test/513-array-deopt/Android.bp
index fdc6ebf..71c7ec0 100644
--- a/test/513-array-deopt/Android.bp
+++ b/test/513-array-deopt/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `513-array-deopt`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-513-array-deopt",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-513-array-deopt-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-513-array-deopt-expected",
+    out: ["art-run-test-513-array-deopt-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/514-shifts/Android.bp b/test/514-shifts/Android.bp
index 4796fb4..7c8aa3b 100644
--- a/test/514-shifts/Android.bp
+++ b/test/514-shifts/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `514-shifts`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-514-shifts",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-514-shifts-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-514-shifts-expected",
+    out: ["art-run-test-514-shifts-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/519-bound-load-class/Android.bp b/test/519-bound-load-class/Android.bp
index 3f9ccf3..5007694 100644
--- a/test/519-bound-load-class/Android.bp
+++ b/test/519-bound-load-class/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `519-bound-load-class`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-519-bound-load-class",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-519-bound-load-class-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-519-bound-load-class-expected",
+    out: ["art-run-test-519-bound-load-class-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/521-checker-array-set-null/Android.bp b/test/521-checker-array-set-null/Android.bp
index ff25306..9f663fc 100644
--- a/test/521-checker-array-set-null/Android.bp
+++ b/test/521-checker-array-set-null/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `521-checker-array-set-null`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-521-checker-array-set-null",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-521-checker-array-set-null-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-521-checker-array-set-null-expected",
+    out: ["art-run-test-521-checker-array-set-null-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/521-regression-integer-field-set/Android.bp b/test/521-regression-integer-field-set/Android.bp
index caf19d9..eaa7626 100644
--- a/test/521-regression-integer-field-set/Android.bp
+++ b/test/521-regression-integer-field-set/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `521-regression-integer-field-set`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-521-regression-integer-field-set",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-521-regression-integer-field-set-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-521-regression-integer-field-set-expected",
+    out: ["art-run-test-521-regression-integer-field-set-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/524-boolean-simplifier-regression/Android.bp b/test/524-boolean-simplifier-regression/Android.bp
index da90f92..f0d81ff 100644
--- a/test/524-boolean-simplifier-regression/Android.bp
+++ b/test/524-boolean-simplifier-regression/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `524-boolean-simplifier-regression`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-524-boolean-simplifier-regression",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-524-boolean-simplifier-regression-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-524-boolean-simplifier-regression-expected",
+    out: ["art-run-test-524-boolean-simplifier-regression-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/525-checker-arrays-fields1/Android.bp b/test/525-checker-arrays-fields1/Android.bp
index b2d086a..8ead082 100644
--- a/test/525-checker-arrays-fields1/Android.bp
+++ b/test/525-checker-arrays-fields1/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `525-checker-arrays-fields1`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-525-checker-arrays-fields1",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-525-checker-arrays-fields1-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-525-checker-arrays-fields1-expected",
+    out: ["art-run-test-525-checker-arrays-fields1-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/525-checker-arrays-fields2/Android.bp b/test/525-checker-arrays-fields2/Android.bp
index 5e9004a..19e045a 100644
--- a/test/525-checker-arrays-fields2/Android.bp
+++ b/test/525-checker-arrays-fields2/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `525-checker-arrays-fields2`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-525-checker-arrays-fields2",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-525-checker-arrays-fields2-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-525-checker-arrays-fields2-expected",
+    out: ["art-run-test-525-checker-arrays-fields2-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/526-checker-caller-callee-regs/Android.bp b/test/526-checker-caller-callee-regs/Android.bp
index 38670dc..3ff714d 100644
--- a/test/526-checker-caller-callee-regs/Android.bp
+++ b/test/526-checker-caller-callee-regs/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `526-checker-caller-callee-regs`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-526-checker-caller-callee-regs",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-526-checker-caller-callee-regs-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-526-checker-caller-callee-regs-expected",
+    out: ["art-run-test-526-checker-caller-callee-regs-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/526-long-regalloc/Android.bp b/test/526-long-regalloc/Android.bp
index e68b8b2..dcbe3df 100644
--- a/test/526-long-regalloc/Android.bp
+++ b/test/526-long-regalloc/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `526-long-regalloc`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-526-long-regalloc",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-526-long-regalloc-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-526-long-regalloc-expected",
+    out: ["art-run-test-526-long-regalloc-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/527-checker-array-access-simd/Android.bp b/test/527-checker-array-access-simd/Android.bp
index 8a46914..7e65eca 100644
--- a/test/527-checker-array-access-simd/Android.bp
+++ b/test/527-checker-array-access-simd/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `527-checker-array-access-simd`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-527-checker-array-access-simd",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-527-checker-array-access-simd-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-527-checker-array-access-simd-expected",
+    out: ["art-run-test-527-checker-array-access-simd-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/527-checker-array-access-split/Android.bp b/test/527-checker-array-access-split/Android.bp
index e3fc365..f83bc3c 100644
--- a/test/527-checker-array-access-split/Android.bp
+++ b/test/527-checker-array-access-split/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `527-checker-array-access-split`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-527-checker-array-access-split",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-527-checker-array-access-split-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-527-checker-array-access-split-expected",
+    out: ["art-run-test-527-checker-array-access-split-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/528-long-hint/Android.bp b/test/528-long-hint/Android.bp
index 0fd856c..6884f9f 100644
--- a/test/528-long-hint/Android.bp
+++ b/test/528-long-hint/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `528-long-hint`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-528-long-hint",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-528-long-hint-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-528-long-hint-expected",
+    out: ["art-run-test-528-long-hint-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/529-long-split/Android.bp b/test/529-long-split/Android.bp
index 8e11694..a88d1e5 100644
--- a/test/529-long-split/Android.bp
+++ b/test/529-long-split/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `529-long-split`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-529-long-split",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-529-long-split-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-529-long-split-expected",
+    out: ["art-run-test-529-long-split-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/530-checker-loops1/Android.bp b/test/530-checker-loops1/Android.bp
index 94a50fc..b9d10a4 100644
--- a/test/530-checker-loops1/Android.bp
+++ b/test/530-checker-loops1/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `530-checker-loops1`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-530-checker-loops1",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-530-checker-loops1-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-530-checker-loops1-expected",
+    out: ["art-run-test-530-checker-loops1-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/530-checker-loops2/Android.bp b/test/530-checker-loops2/Android.bp
index b74ed5c..a430f19 100644
--- a/test/530-checker-loops2/Android.bp
+++ b/test/530-checker-loops2/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `530-checker-loops2`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-530-checker-loops2",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-530-checker-loops2-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-530-checker-loops2-expected",
+    out: ["art-run-test-530-checker-loops2-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/530-checker-loops3/Android.bp b/test/530-checker-loops3/Android.bp
index 4ff835a..4374193 100644
--- a/test/530-checker-loops3/Android.bp
+++ b/test/530-checker-loops3/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `530-checker-loops3`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-530-checker-loops3",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-530-checker-loops3-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-530-checker-loops3-expected",
+    out: ["art-run-test-530-checker-loops3-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/530-checker-loops4/Android.bp b/test/530-checker-loops4/Android.bp
index cc0fb66..6e20819 100644
--- a/test/530-checker-loops4/Android.bp
+++ b/test/530-checker-loops4/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `530-checker-loops4`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-530-checker-loops4",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-530-checker-loops4-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-530-checker-loops4-expected",
+    out: ["art-run-test-530-checker-loops4-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/530-checker-loops5/Android.bp b/test/530-checker-loops5/Android.bp
index 0016b6a..e99ab52 100644
--- a/test/530-checker-loops5/Android.bp
+++ b/test/530-checker-loops5/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `530-checker-loops5`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-530-checker-loops5",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-530-checker-loops5-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-530-checker-loops5-expected",
+    out: ["art-run-test-530-checker-loops5-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/530-checker-lse-ctor-fences/Android.bp b/test/530-checker-lse-ctor-fences/Android.bp
index c128248..522fd35 100644
--- a/test/530-checker-lse-ctor-fences/Android.bp
+++ b/test/530-checker-lse-ctor-fences/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `530-checker-lse-ctor-fences`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-530-checker-lse-ctor-fences",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-530-checker-lse-ctor-fences-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-530-checker-lse-ctor-fences-expected",
+    out: ["art-run-test-530-checker-lse-ctor-fences-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/530-checker-lse-simd/Android.bp b/test/530-checker-lse-simd/Android.bp
index de46ec9..66cb220 100644
--- a/test/530-checker-lse-simd/Android.bp
+++ b/test/530-checker-lse-simd/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `530-checker-lse-simd`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-530-checker-lse-simd",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-530-checker-lse-simd-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-530-checker-lse-simd-expected",
+    out: ["art-run-test-530-checker-lse-simd-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/530-checker-lse/Android.bp b/test/530-checker-lse/Android.bp
index 5a8848b..9b7578c 100644
--- a/test/530-checker-lse/Android.bp
+++ b/test/530-checker-lse/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `530-checker-lse`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-530-checker-lse",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-530-checker-lse-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-530-checker-lse-expected",
+    out: ["art-run-test-530-checker-lse-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/530-checker-lse2/Android.bp b/test/530-checker-lse2/Android.bp
index cbe34c3..5c3a56e 100644
--- a/test/530-checker-lse2/Android.bp
+++ b/test/530-checker-lse2/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `530-checker-lse2`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-530-checker-lse2",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-530-checker-lse2-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-530-checker-lse2-expected",
+    out: ["art-run-test-530-checker-lse2-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/530-instanceof-checkcast/Android.bp b/test/530-instanceof-checkcast/Android.bp
index bd7f837..041eb24 100644
--- a/test/530-instanceof-checkcast/Android.bp
+++ b/test/530-instanceof-checkcast/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `530-instanceof-checkcast`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-530-instanceof-checkcast",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-530-instanceof-checkcast-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-530-instanceof-checkcast-expected",
+    out: ["art-run-test-530-instanceof-checkcast-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/530-regression-lse/Android.bp b/test/530-regression-lse/Android.bp
index 5c9d6bf..c230b01 100644
--- a/test/530-regression-lse/Android.bp
+++ b/test/530-regression-lse/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `530-regression-lse`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-530-regression-lse",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-530-regression-lse-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-530-regression-lse-expected",
+    out: ["art-run-test-530-regression-lse-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/532-checker-nonnull-arrayset/Android.bp b/test/532-checker-nonnull-arrayset/Android.bp
index 4def5b9..284003f 100644
--- a/test/532-checker-nonnull-arrayset/Android.bp
+++ b/test/532-checker-nonnull-arrayset/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `532-checker-nonnull-arrayset`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-532-checker-nonnull-arrayset",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-532-checker-nonnull-arrayset-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-532-checker-nonnull-arrayset-expected",
+    out: ["art-run-test-532-checker-nonnull-arrayset-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/534-checker-bce-deoptimization/Android.bp b/test/534-checker-bce-deoptimization/Android.bp
index 60e373e..2b2f5e5 100644
--- a/test/534-checker-bce-deoptimization/Android.bp
+++ b/test/534-checker-bce-deoptimization/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `534-checker-bce-deoptimization`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-534-checker-bce-deoptimization",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-534-checker-bce-deoptimization-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-534-checker-bce-deoptimization-expected",
+    out: ["art-run-test-534-checker-bce-deoptimization-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/535-deopt-and-inlining/Android.bp b/test/535-deopt-and-inlining/Android.bp
index 97fae60..1495cb3 100644
--- a/test/535-deopt-and-inlining/Android.bp
+++ b/test/535-deopt-and-inlining/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `535-deopt-and-inlining`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-535-deopt-and-inlining",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-535-deopt-and-inlining-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-535-deopt-and-inlining-expected",
+    out: ["art-run-test-535-deopt-and-inlining-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/536-checker-intrinsic-optimization/Android.bp b/test/536-checker-intrinsic-optimization/Android.bp
index 3e3db15..5b18ce8 100644
--- a/test/536-checker-intrinsic-optimization/Android.bp
+++ b/test/536-checker-intrinsic-optimization/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `536-checker-intrinsic-optimization`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-536-checker-intrinsic-optimization",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-536-checker-intrinsic-optimization-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-536-checker-intrinsic-optimization-expected",
+    out: ["art-run-test-536-checker-intrinsic-optimization-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/537-checker-arraycopy/Android.bp b/test/537-checker-arraycopy/Android.bp
index d65b6ac..67fb5ef 100644
--- a/test/537-checker-arraycopy/Android.bp
+++ b/test/537-checker-arraycopy/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `537-checker-arraycopy`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-537-checker-arraycopy",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-537-checker-arraycopy-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-537-checker-arraycopy-expected",
+    out: ["art-run-test-537-checker-arraycopy-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/537-checker-jump-over-jump/Android.bp b/test/537-checker-jump-over-jump/Android.bp
index f8f22a7..32ffd1c 100644
--- a/test/537-checker-jump-over-jump/Android.bp
+++ b/test/537-checker-jump-over-jump/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `537-checker-jump-over-jump`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-537-checker-jump-over-jump",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-537-checker-jump-over-jump-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-537-checker-jump-over-jump-expected",
+    out: ["art-run-test-537-checker-jump-over-jump-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/538-checker-embed-constants/Android.bp b/test/538-checker-embed-constants/Android.bp
index 21eccea..738fa9d 100644
--- a/test/538-checker-embed-constants/Android.bp
+++ b/test/538-checker-embed-constants/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `538-checker-embed-constants`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-538-checker-embed-constants",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-538-checker-embed-constants-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-538-checker-embed-constants-expected",
+    out: ["art-run-test-538-checker-embed-constants-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/540-checker-rtp-bug/Android.bp b/test/540-checker-rtp-bug/Android.bp
index 8269287..a068841 100644
--- a/test/540-checker-rtp-bug/Android.bp
+++ b/test/540-checker-rtp-bug/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `540-checker-rtp-bug`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-540-checker-rtp-bug",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-540-checker-rtp-bug-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-540-checker-rtp-bug-expected",
+    out: ["art-run-test-540-checker-rtp-bug-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/542-bitfield-rotates/Android.bp b/test/542-bitfield-rotates/Android.bp
index 214bdaf..ca0dec1 100644
--- a/test/542-bitfield-rotates/Android.bp
+++ b/test/542-bitfield-rotates/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `542-bitfield-rotates`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-542-bitfield-rotates",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-542-bitfield-rotates-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-542-bitfield-rotates-expected",
+    out: ["art-run-test-542-bitfield-rotates-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/542-inline-trycatch/Android.bp b/test/542-inline-trycatch/Android.bp
index 7c89c23..127f65e 100644
--- a/test/542-inline-trycatch/Android.bp
+++ b/test/542-inline-trycatch/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `542-inline-trycatch`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-542-inline-trycatch",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-542-inline-trycatch-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-542-inline-trycatch-expected",
+    out: ["art-run-test-542-inline-trycatch-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/542-unresolved-access-check/Android.bp b/test/542-unresolved-access-check/Android.bp
index 29b96e7..4d5efc3 100644
--- a/test/542-unresolved-access-check/Android.bp
+++ b/test/542-unresolved-access-check/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `542-unresolved-access-check`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-542-unresolved-access-check",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-542-unresolved-access-check-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-542-unresolved-access-check-expected",
+    out: ["art-run-test-542-unresolved-access-check-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/545-tracing-and-jit/Android.bp b/test/545-tracing-and-jit/Android.bp
index 854b67a..b8a016c 100644
--- a/test/545-tracing-and-jit/Android.bp
+++ b/test/545-tracing-and-jit/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `545-tracing-and-jit`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-545-tracing-and-jit",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-545-tracing-and-jit-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-545-tracing-and-jit-expected",
+    out: ["art-run-test-545-tracing-and-jit-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/548-checker-inlining-and-dce/Android.bp b/test/548-checker-inlining-and-dce/Android.bp
index 5ed51ed..83f4a79 100644
--- a/test/548-checker-inlining-and-dce/Android.bp
+++ b/test/548-checker-inlining-and-dce/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `548-checker-inlining-and-dce`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-548-checker-inlining-and-dce",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-548-checker-inlining-and-dce-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-548-checker-inlining-and-dce-expected",
+    out: ["art-run-test-548-checker-inlining-and-dce-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/549-checker-types-merge/Android.bp b/test/549-checker-types-merge/Android.bp
index de0b782..b35d0fb 100644
--- a/test/549-checker-types-merge/Android.bp
+++ b/test/549-checker-types-merge/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `549-checker-types-merge`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-549-checker-types-merge",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-549-checker-types-merge-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-549-checker-types-merge-expected",
+    out: ["art-run-test-549-checker-types-merge-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/550-checker-multiply-accumulate/Android.bp b/test/550-checker-multiply-accumulate/Android.bp
index 8a441cd..794b506 100644
--- a/test/550-checker-multiply-accumulate/Android.bp
+++ b/test/550-checker-multiply-accumulate/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `550-checker-multiply-accumulate`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-550-checker-multiply-accumulate",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-550-checker-multiply-accumulate-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-550-checker-multiply-accumulate-expected",
+    out: ["art-run-test-550-checker-multiply-accumulate-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/550-new-instance-clinit/Android.bp b/test/550-new-instance-clinit/Android.bp
index ca89065..89eb2ef 100644
--- a/test/550-new-instance-clinit/Android.bp
+++ b/test/550-new-instance-clinit/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `550-new-instance-clinit`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-550-new-instance-clinit",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-550-new-instance-clinit-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-550-new-instance-clinit-expected",
+    out: ["art-run-test-550-new-instance-clinit-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/551-checker-clinit/Android.bp b/test/551-checker-clinit/Android.bp
index 8c916f5..097a384 100644
--- a/test/551-checker-clinit/Android.bp
+++ b/test/551-checker-clinit/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `551-checker-clinit`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-551-checker-clinit",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-551-checker-clinit-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-551-checker-clinit-expected",
+    out: ["art-run-test-551-checker-clinit-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/551-checker-shifter-operand/Android.bp b/test/551-checker-shifter-operand/Android.bp
index 3c81de8..feddad1 100644
--- a/test/551-checker-shifter-operand/Android.bp
+++ b/test/551-checker-shifter-operand/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `551-checker-shifter-operand`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-551-checker-shifter-operand",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-551-checker-shifter-operand-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-551-checker-shifter-operand-expected",
+    out: ["art-run-test-551-checker-shifter-operand-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/551-implicit-null-checks/Android.bp b/test/551-implicit-null-checks/Android.bp
index f9d631d..a995002 100644
--- a/test/551-implicit-null-checks/Android.bp
+++ b/test/551-implicit-null-checks/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `551-implicit-null-checks`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-551-implicit-null-checks",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-551-implicit-null-checks-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-551-implicit-null-checks-expected",
+    out: ["art-run-test-551-implicit-null-checks-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/552-checker-sharpening/Android.bp b/test/552-checker-sharpening/Android.bp
index 2c9c3fe..11ee830 100644
--- a/test/552-checker-sharpening/Android.bp
+++ b/test/552-checker-sharpening/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `552-checker-sharpening`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-552-checker-sharpening",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-552-checker-sharpening-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-552-checker-sharpening-expected",
+    out: ["art-run-test-552-checker-sharpening-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/552-checker-x86-avx2-bit-manipulation/Android.bp b/test/552-checker-x86-avx2-bit-manipulation/Android.bp
index 3bca3f8..bfa6c06 100644
--- a/test/552-checker-x86-avx2-bit-manipulation/Android.bp
+++ b/test/552-checker-x86-avx2-bit-manipulation/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `552-checker-x86-avx2-bit-manipulation`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-552-checker-x86-avx2-bit-manipulation",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-552-checker-x86-avx2-bit-manipulation-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-552-checker-x86-avx2-bit-manipulation-expected",
+    out: ["art-run-test-552-checker-x86-avx2-bit-manipulation-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/554-checker-rtp-checkcast/Android.bp b/test/554-checker-rtp-checkcast/Android.bp
index 29c9190..37f6737 100644
--- a/test/554-checker-rtp-checkcast/Android.bp
+++ b/test/554-checker-rtp-checkcast/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `554-checker-rtp-checkcast`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-554-checker-rtp-checkcast",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-554-checker-rtp-checkcast-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-554-checker-rtp-checkcast-expected",
+    out: ["art-run-test-554-checker-rtp-checkcast-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/555-UnsafeGetLong-regression/Android.bp b/test/555-UnsafeGetLong-regression/Android.bp
index 78956d2..807cb4b 100644
--- a/test/555-UnsafeGetLong-regression/Android.bp
+++ b/test/555-UnsafeGetLong-regression/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `555-UnsafeGetLong-regression`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-555-UnsafeGetLong-regression",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-555-UnsafeGetLong-regression-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-555-UnsafeGetLong-regression-expected",
+    out: ["art-run-test-555-UnsafeGetLong-regression-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/557-checker-instruct-simplifier-ror/Android.bp b/test/557-checker-instruct-simplifier-ror/Android.bp
index f9fe1c3..77cd62f 100644
--- a/test/557-checker-instruct-simplifier-ror/Android.bp
+++ b/test/557-checker-instruct-simplifier-ror/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `557-checker-instruct-simplifier-ror`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-557-checker-instruct-simplifier-ror",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-557-checker-instruct-simplifier-ror-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-557-checker-instruct-simplifier-ror-expected",
+    out: ["art-run-test-557-checker-instruct-simplifier-ror-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/558-switch/Android.bp b/test/558-switch/Android.bp
index bbbbeab..29d3204 100644
--- a/test/558-switch/Android.bp
+++ b/test/558-switch/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `558-switch`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-558-switch",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-558-switch-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-558-switch-expected",
+    out: ["art-run-test-558-switch-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/559-bce-ssa/Android.bp b/test/559-bce-ssa/Android.bp
index c5f53da..cad8b22 100644
--- a/test/559-bce-ssa/Android.bp
+++ b/test/559-bce-ssa/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `559-bce-ssa`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-559-bce-ssa",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-559-bce-ssa-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-559-bce-ssa-expected",
+    out: ["art-run-test-559-bce-ssa-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/559-checker-rtp-ifnotnull/Android.bp b/test/559-checker-rtp-ifnotnull/Android.bp
index 8e3ca04..51feff1 100644
--- a/test/559-checker-rtp-ifnotnull/Android.bp
+++ b/test/559-checker-rtp-ifnotnull/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `559-checker-rtp-ifnotnull`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-559-checker-rtp-ifnotnull",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-559-checker-rtp-ifnotnull-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-559-checker-rtp-ifnotnull-expected",
+    out: ["art-run-test-559-checker-rtp-ifnotnull-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/560-packed-switch/Android.bp b/test/560-packed-switch/Android.bp
index c0ac740..ae938a4 100644
--- a/test/560-packed-switch/Android.bp
+++ b/test/560-packed-switch/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `560-packed-switch`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-560-packed-switch",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-560-packed-switch-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-560-packed-switch-expected",
+    out: ["art-run-test-560-packed-switch-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/561-divrem/Android.bp b/test/561-divrem/Android.bp
index 6ee96c3..c65d940 100644
--- a/test/561-divrem/Android.bp
+++ b/test/561-divrem/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `561-divrem`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-561-divrem",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-561-divrem-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-561-divrem-expected",
+    out: ["art-run-test-561-divrem-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/561-shared-slowpaths/Android.bp b/test/561-shared-slowpaths/Android.bp
index 103d077..cb89d8a 100644
--- a/test/561-shared-slowpaths/Android.bp
+++ b/test/561-shared-slowpaths/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `561-shared-slowpaths`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-561-shared-slowpaths",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-561-shared-slowpaths-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-561-shared-slowpaths-expected",
+    out: ["art-run-test-561-shared-slowpaths-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/562-bce-preheader/Android.bp b/test/562-bce-preheader/Android.bp
index 8e5e5d9..b0d1710 100644
--- a/test/562-bce-preheader/Android.bp
+++ b/test/562-bce-preheader/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `562-bce-preheader`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-562-bce-preheader",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-562-bce-preheader-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-562-bce-preheader-expected",
+    out: ["art-run-test-562-bce-preheader-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/562-checker-no-intermediate/Android.bp b/test/562-checker-no-intermediate/Android.bp
index 08d9633..b3255b3 100644
--- a/test/562-checker-no-intermediate/Android.bp
+++ b/test/562-checker-no-intermediate/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `562-checker-no-intermediate`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-562-checker-no-intermediate",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-562-checker-no-intermediate-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-562-checker-no-intermediate-expected",
+    out: ["art-run-test-562-checker-no-intermediate-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/563-checker-invoke-super/Android.bp b/test/563-checker-invoke-super/Android.bp
index 686c08c..3017fe6 100644
--- a/test/563-checker-invoke-super/Android.bp
+++ b/test/563-checker-invoke-super/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `563-checker-invoke-super`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-563-checker-invoke-super",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-563-checker-invoke-super-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-563-checker-invoke-super-expected",
+    out: ["art-run-test-563-checker-invoke-super-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/564-checker-bitcount/Android.bp b/test/564-checker-bitcount/Android.bp
index db383fb..d1ff292 100644
--- a/test/564-checker-bitcount/Android.bp
+++ b/test/564-checker-bitcount/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `564-checker-bitcount`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-564-checker-bitcount",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-564-checker-bitcount-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-564-checker-bitcount-expected",
+    out: ["art-run-test-564-checker-bitcount-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/564-checker-inline-loop/Android.bp b/test/564-checker-inline-loop/Android.bp
index 9d384c1..5b4cfcf 100644
--- a/test/564-checker-inline-loop/Android.bp
+++ b/test/564-checker-inline-loop/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `564-checker-inline-loop`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-564-checker-inline-loop",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-564-checker-inline-loop-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-564-checker-inline-loop-expected",
+    out: ["art-run-test-564-checker-inline-loop-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/564-checker-negbitwise/Android.bp b/test/564-checker-negbitwise/Android.bp
index 391ad89..9efff1a 100644
--- a/test/564-checker-negbitwise/Android.bp
+++ b/test/564-checker-negbitwise/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `564-checker-negbitwise`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-564-checker-negbitwise",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-564-checker-negbitwise-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-564-checker-negbitwise-expected",
+    out: ["art-run-test-564-checker-negbitwise-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/565-checker-condition-liveness/Android.bp b/test/565-checker-condition-liveness/Android.bp
index 68c1a77..b9abba4 100644
--- a/test/565-checker-condition-liveness/Android.bp
+++ b/test/565-checker-condition-liveness/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `565-checker-condition-liveness`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-565-checker-condition-liveness",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-565-checker-condition-liveness-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-565-checker-condition-liveness-expected",
+    out: ["art-run-test-565-checker-condition-liveness-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/566-checker-codegen-select/Android.bp b/test/566-checker-codegen-select/Android.bp
index 606438c..6d9bdb5 100644
--- a/test/566-checker-codegen-select/Android.bp
+++ b/test/566-checker-codegen-select/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `566-checker-codegen-select`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-566-checker-codegen-select",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-566-checker-codegen-select-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-566-checker-codegen-select-expected",
+    out: ["art-run-test-566-checker-codegen-select-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/566-polymorphic-inlining/Android.bp b/test/566-polymorphic-inlining/Android.bp
index c46694e..ce26ce4 100644
--- a/test/566-polymorphic-inlining/Android.bp
+++ b/test/566-polymorphic-inlining/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `566-polymorphic-inlining`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-566-polymorphic-inlining",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-566-polymorphic-inlining-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-566-polymorphic-inlining-expected",
+    out: ["art-run-test-566-polymorphic-inlining-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/567-checker-builder-intrinsics/Android.bp b/test/567-checker-builder-intrinsics/Android.bp
index 8aaea67..f207599 100644
--- a/test/567-checker-builder-intrinsics/Android.bp
+++ b/test/567-checker-builder-intrinsics/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `567-checker-builder-intrinsics`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-567-checker-builder-intrinsics",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-567-checker-builder-intrinsics-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-567-checker-builder-intrinsics-expected",
+    out: ["art-run-test-567-checker-builder-intrinsics-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/568-checker-onebit/Android.bp b/test/568-checker-onebit/Android.bp
index 420ea42..6a63163 100644
--- a/test/568-checker-onebit/Android.bp
+++ b/test/568-checker-onebit/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `568-checker-onebit`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-568-checker-onebit",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-568-checker-onebit-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-568-checker-onebit-expected",
+    out: ["art-run-test-568-checker-onebit-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/570-checker-select/Android.bp b/test/570-checker-select/Android.bp
index ad5303d..611e1ee 100644
--- a/test/570-checker-select/Android.bp
+++ b/test/570-checker-select/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `570-checker-select`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-570-checker-select",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-570-checker-select-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-570-checker-select-expected",
+    out: ["art-run-test-570-checker-select-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/572-checker-array-get-regression/Android.bp b/test/572-checker-array-get-regression/Android.bp
index 697a7a9..592d365 100644
--- a/test/572-checker-array-get-regression/Android.bp
+++ b/test/572-checker-array-get-regression/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `572-checker-array-get-regression`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-572-checker-array-get-regression",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-572-checker-array-get-regression-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-572-checker-array-get-regression-expected",
+    out: ["art-run-test-572-checker-array-get-regression-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/573-checker-checkcast-regression/Android.bp b/test/573-checker-checkcast-regression/Android.bp
index 898a957..6a019dd 100644
--- a/test/573-checker-checkcast-regression/Android.bp
+++ b/test/573-checker-checkcast-regression/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `573-checker-checkcast-regression`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-573-checker-checkcast-regression",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-573-checker-checkcast-regression-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-573-checker-checkcast-regression-expected",
+    out: ["art-run-test-573-checker-checkcast-regression-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/576-polymorphic-inlining/Android.bp b/test/576-polymorphic-inlining/Android.bp
index 852ed8b..fb51f7f 100644
--- a/test/576-polymorphic-inlining/Android.bp
+++ b/test/576-polymorphic-inlining/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `576-polymorphic-inlining`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-576-polymorphic-inlining",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-576-polymorphic-inlining-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-576-polymorphic-inlining-expected",
+    out: ["art-run-test-576-polymorphic-inlining-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/577-checker-fp2int/Android.bp b/test/577-checker-fp2int/Android.bp
index 719efe8..55241df 100644
--- a/test/577-checker-fp2int/Android.bp
+++ b/test/577-checker-fp2int/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `577-checker-fp2int`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-577-checker-fp2int",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-577-checker-fp2int-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-577-checker-fp2int-expected",
+    out: ["art-run-test-577-checker-fp2int-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/578-bce-visit/Android.bp b/test/578-bce-visit/Android.bp
index 5487679..89f29aa 100644
--- a/test/578-bce-visit/Android.bp
+++ b/test/578-bce-visit/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `578-bce-visit`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-578-bce-visit",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-578-bce-visit-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-578-bce-visit-expected",
+    out: ["art-run-test-578-bce-visit-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/578-polymorphic-inlining/Android.bp b/test/578-polymorphic-inlining/Android.bp
index aa4673d..699ad74 100644
--- a/test/578-polymorphic-inlining/Android.bp
+++ b/test/578-polymorphic-inlining/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `578-polymorphic-inlining`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-578-polymorphic-inlining",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-578-polymorphic-inlining-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-578-polymorphic-inlining-expected",
+    out: ["art-run-test-578-polymorphic-inlining-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/579-inline-infinite/Android.bp b/test/579-inline-infinite/Android.bp
index d50df89..b677814 100644
--- a/test/579-inline-infinite/Android.bp
+++ b/test/579-inline-infinite/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `579-inline-infinite`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-579-inline-infinite",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-579-inline-infinite-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-579-inline-infinite-expected",
+    out: ["art-run-test-579-inline-infinite-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/580-checker-round/Android.bp b/test/580-checker-round/Android.bp
index 1039c10..ee903e4 100644
--- a/test/580-checker-round/Android.bp
+++ b/test/580-checker-round/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `580-checker-round`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-580-checker-round",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-580-checker-round-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-580-checker-round-expected",
+    out: ["art-run-test-580-checker-round-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/580-crc32/Android.bp b/test/580-crc32/Android.bp
index bbd749b..01b25f90 100644
--- a/test/580-crc32/Android.bp
+++ b/test/580-crc32/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `580-crc32`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-580-crc32",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-580-crc32-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-580-crc32-expected",
+    out: ["art-run-test-580-crc32-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/581-rtp/Android.bp b/test/581-rtp/Android.bp
index cc1b3d5..fd9f58f 100644
--- a/test/581-rtp/Android.bp
+++ b/test/581-rtp/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `581-rtp`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-581-rtp",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-581-rtp-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-581-rtp-expected",
+    out: ["art-run-test-581-rtp-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/582-checker-bce-length/Android.bp b/test/582-checker-bce-length/Android.bp
index 27f9bcb..0fac6e0 100644
--- a/test/582-checker-bce-length/Android.bp
+++ b/test/582-checker-bce-length/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `582-checker-bce-length`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-582-checker-bce-length",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-582-checker-bce-length-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-582-checker-bce-length-expected",
+    out: ["art-run-test-582-checker-bce-length-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/583-checker-zero/Android.bp b/test/583-checker-zero/Android.bp
index 6dac34f..1da4a29 100644
--- a/test/583-checker-zero/Android.bp
+++ b/test/583-checker-zero/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `583-checker-zero`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-583-checker-zero",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-583-checker-zero-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-583-checker-zero-expected",
+    out: ["art-run-test-583-checker-zero-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/584-checker-div-bool/Android.bp b/test/584-checker-div-bool/Android.bp
index dad99fe..ce8d44a 100644
--- a/test/584-checker-div-bool/Android.bp
+++ b/test/584-checker-div-bool/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `584-checker-div-bool`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-584-checker-div-bool",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-584-checker-div-bool-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-584-checker-div-bool-expected",
+    out: ["art-run-test-584-checker-div-bool-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/589-super-imt/Android.bp b/test/589-super-imt/Android.bp
index a739210..485b236 100644
--- a/test/589-super-imt/Android.bp
+++ b/test/589-super-imt/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `589-super-imt`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-589-super-imt",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-589-super-imt-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-589-super-imt-expected",
+    out: ["art-run-test-589-super-imt-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/590-checker-arr-set-null-regression/Android.bp b/test/590-checker-arr-set-null-regression/Android.bp
index b7fd124..0b3e4c8 100644
--- a/test/590-checker-arr-set-null-regression/Android.bp
+++ b/test/590-checker-arr-set-null-regression/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `590-checker-arr-set-null-regression`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-590-checker-arr-set-null-regression",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-590-checker-arr-set-null-regression-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-590-checker-arr-set-null-regression-expected",
+    out: ["art-run-test-590-checker-arr-set-null-regression-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/591-checker-regression-dead-loop/Android.bp b/test/591-checker-regression-dead-loop/Android.bp
index 77a2638..c4defae 100644
--- a/test/591-checker-regression-dead-loop/Android.bp
+++ b/test/591-checker-regression-dead-loop/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `591-checker-regression-dead-loop`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-591-checker-regression-dead-loop",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-591-checker-regression-dead-loop-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-591-checker-regression-dead-loop-expected",
+    out: ["art-run-test-591-checker-regression-dead-loop-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/593-checker-long-2-float-regression/Android.bp b/test/593-checker-long-2-float-regression/Android.bp
index 0ef96a3..42673ba 100644
--- a/test/593-checker-long-2-float-regression/Android.bp
+++ b/test/593-checker-long-2-float-regression/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `593-checker-long-2-float-regression`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-593-checker-long-2-float-regression",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-593-checker-long-2-float-regression-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-593-checker-long-2-float-regression-expected",
+    out: ["art-run-test-593-checker-long-2-float-regression-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/594-checker-array-alias/Android.bp b/test/594-checker-array-alias/Android.bp
index ff5bbb1..433babe 100644
--- a/test/594-checker-array-alias/Android.bp
+++ b/test/594-checker-array-alias/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `594-checker-array-alias`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-594-checker-array-alias",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-594-checker-array-alias-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-594-checker-array-alias-expected",
+    out: ["art-run-test-594-checker-array-alias-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/594-load-string-regression/Android.bp b/test/594-load-string-regression/Android.bp
index eb81d9d..6c0378f 100644
--- a/test/594-load-string-regression/Android.bp
+++ b/test/594-load-string-regression/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `594-load-string-regression`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-594-load-string-regression",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-594-load-string-regression-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-594-load-string-regression-expected",
+    out: ["art-run-test-594-load-string-regression-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/595-profile-saving/Android.bp b/test/595-profile-saving/Android.bp
index 9ad1cf3..7794473 100644
--- a/test/595-profile-saving/Android.bp
+++ b/test/595-profile-saving/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `595-profile-saving`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-595-profile-saving",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-595-profile-saving-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-595-profile-saving-expected",
+    out: ["art-run-test-595-profile-saving-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/597-deopt-busy-loop/Android.bp b/test/597-deopt-busy-loop/Android.bp
index 5fbc9da..0f8cb97 100644
--- a/test/597-deopt-busy-loop/Android.bp
+++ b/test/597-deopt-busy-loop/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `597-deopt-busy-loop`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-597-deopt-busy-loop",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-597-deopt-busy-loop-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-597-deopt-busy-loop-expected",
+    out: ["art-run-test-597-deopt-busy-loop-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/597-deopt-invoke-stub/Android.bp b/test/597-deopt-invoke-stub/Android.bp
index 2f2eb53..9629ae7 100644
--- a/test/597-deopt-invoke-stub/Android.bp
+++ b/test/597-deopt-invoke-stub/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `597-deopt-invoke-stub`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-597-deopt-invoke-stub",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-597-deopt-invoke-stub-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-597-deopt-invoke-stub-expected",
+    out: ["art-run-test-597-deopt-invoke-stub-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/597-deopt-new-string/Android.bp b/test/597-deopt-new-string/Android.bp
index 0a57546..ad677fc 100644
--- a/test/597-deopt-new-string/Android.bp
+++ b/test/597-deopt-new-string/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `597-deopt-new-string`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-597-deopt-new-string",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-597-deopt-new-string-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-597-deopt-new-string-expected",
+    out: ["art-run-test-597-deopt-new-string-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/602-deoptimizeable/Android.bp b/test/602-deoptimizeable/Android.bp
index cf6caee..d8b15d1 100644
--- a/test/602-deoptimizeable/Android.bp
+++ b/test/602-deoptimizeable/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `602-deoptimizeable`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-602-deoptimizeable",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-602-deoptimizeable-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-602-deoptimizeable-expected",
+    out: ["art-run-test-602-deoptimizeable-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/603-checker-instanceof/Android.bp b/test/603-checker-instanceof/Android.bp
index 91945cd..892dd07 100644
--- a/test/603-checker-instanceof/Android.bp
+++ b/test/603-checker-instanceof/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `603-checker-instanceof`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-603-checker-instanceof",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-603-checker-instanceof-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-603-checker-instanceof-expected",
+    out: ["art-run-test-603-checker-instanceof-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/604-hot-static-interface/Android.bp b/test/604-hot-static-interface/Android.bp
index 62ee73a..d638884 100644
--- a/test/604-hot-static-interface/Android.bp
+++ b/test/604-hot-static-interface/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `604-hot-static-interface`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-604-hot-static-interface",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-604-hot-static-interface-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-604-hot-static-interface-expected",
+    out: ["art-run-test-604-hot-static-interface-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/605-new-string-from-bytes/Android.bp b/test/605-new-string-from-bytes/Android.bp
index e7b1f87..9bef370 100644
--- a/test/605-new-string-from-bytes/Android.bp
+++ b/test/605-new-string-from-bytes/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `605-new-string-from-bytes`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-605-new-string-from-bytes",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-605-new-string-from-bytes-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-605-new-string-from-bytes-expected",
+    out: ["art-run-test-605-new-string-from-bytes-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/607-daemon-stress/Android.bp b/test/607-daemon-stress/Android.bp
index 58201f9..8b27c50 100644
--- a/test/607-daemon-stress/Android.bp
+++ b/test/607-daemon-stress/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `607-daemon-stress`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-607-daemon-stress",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-607-daemon-stress-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-607-daemon-stress-expected",
+    out: ["art-run-test-607-daemon-stress-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/609-checker-inline-interface/Android.bp b/test/609-checker-inline-interface/Android.bp
index 538095e..b208683 100644
--- a/test/609-checker-inline-interface/Android.bp
+++ b/test/609-checker-inline-interface/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `609-checker-inline-interface`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-609-checker-inline-interface",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-609-checker-inline-interface-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-609-checker-inline-interface-expected",
+    out: ["art-run-test-609-checker-inline-interface-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/609-checker-x86-bounds-check/Android.bp b/test/609-checker-x86-bounds-check/Android.bp
index eb20f0b..1ff03ae 100644
--- a/test/609-checker-x86-bounds-check/Android.bp
+++ b/test/609-checker-x86-bounds-check/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `609-checker-x86-bounds-check`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-609-checker-x86-bounds-check",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-609-checker-x86-bounds-check-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-609-checker-x86-bounds-check-expected",
+    out: ["art-run-test-609-checker-x86-bounds-check-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/610-arraycopy/Android.bp b/test/610-arraycopy/Android.bp
index 2f273b6..06336ce 100644
--- a/test/610-arraycopy/Android.bp
+++ b/test/610-arraycopy/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `610-arraycopy`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-610-arraycopy",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-610-arraycopy-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-610-arraycopy-expected",
+    out: ["art-run-test-610-arraycopy-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/611-checker-simplify-if/Android.bp b/test/611-checker-simplify-if/Android.bp
index 8655732..ca4cfc9 100644
--- a/test/611-checker-simplify-if/Android.bp
+++ b/test/611-checker-simplify-if/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `611-checker-simplify-if`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-611-checker-simplify-if",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-611-checker-simplify-if-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-611-checker-simplify-if-expected",
+    out: ["art-run-test-611-checker-simplify-if-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/614-checker-dump-constant-location/Android.bp b/test/614-checker-dump-constant-location/Android.bp
index 405f781..204f8cc 100644
--- a/test/614-checker-dump-constant-location/Android.bp
+++ b/test/614-checker-dump-constant-location/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `614-checker-dump-constant-location`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-614-checker-dump-constant-location",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-614-checker-dump-constant-location-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-614-checker-dump-constant-location-expected",
+    out: ["art-run-test-614-checker-dump-constant-location-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/615-checker-arm64-store-zero/Android.bp b/test/615-checker-arm64-store-zero/Android.bp
index 2a6709b..b218c03 100644
--- a/test/615-checker-arm64-store-zero/Android.bp
+++ b/test/615-checker-arm64-store-zero/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `615-checker-arm64-store-zero`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-615-checker-arm64-store-zero",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-615-checker-arm64-store-zero-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-615-checker-arm64-store-zero-expected",
+    out: ["art-run-test-615-checker-arm64-store-zero-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/616-cha-abstract/Android.bp b/test/616-cha-abstract/Android.bp
index c03a4fb..1ea0ee7 100644
--- a/test/616-cha-abstract/Android.bp
+++ b/test/616-cha-abstract/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `616-cha-abstract`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-616-cha-abstract",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-616-cha-abstract-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-616-cha-abstract-expected",
+    out: ["art-run-test-616-cha-abstract-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/616-cha-interface/Android.bp b/test/616-cha-interface/Android.bp
index 7e1a164..32a5733 100644
--- a/test/616-cha-interface/Android.bp
+++ b/test/616-cha-interface/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `616-cha-interface`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-616-cha-interface",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-616-cha-interface-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-616-cha-interface-expected",
+    out: ["art-run-test-616-cha-interface-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/616-cha-miranda/Android.bp b/test/616-cha-miranda/Android.bp
index d04b396..a16c313 100644
--- a/test/616-cha-miranda/Android.bp
+++ b/test/616-cha-miranda/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `616-cha-miranda`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-616-cha-miranda",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-616-cha-miranda-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-616-cha-miranda-expected",
+    out: ["art-run-test-616-cha-miranda-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/616-cha-native/Android.bp b/test/616-cha-native/Android.bp
index 91bba17..b299c67 100644
--- a/test/616-cha-native/Android.bp
+++ b/test/616-cha-native/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `616-cha-native`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-616-cha-native",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-616-cha-native-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-616-cha-native-expected",
+    out: ["art-run-test-616-cha-native-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/616-cha-regression-proxy-method/Android.bp b/test/616-cha-regression-proxy-method/Android.bp
index 3abd5c6..480b0c2 100644
--- a/test/616-cha-regression-proxy-method/Android.bp
+++ b/test/616-cha-regression-proxy-method/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `616-cha-regression-proxy-method`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-616-cha-regression-proxy-method",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-616-cha-regression-proxy-method-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-616-cha-regression-proxy-method-expected",
+    out: ["art-run-test-616-cha-regression-proxy-method-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/616-cha/Android.bp b/test/616-cha/Android.bp
index da7c762..871cc97 100644
--- a/test/616-cha/Android.bp
+++ b/test/616-cha/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `616-cha`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-616-cha",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-616-cha-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-616-cha-expected",
+    out: ["art-run-test-616-cha-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/617-clinit-oome/Android.bp b/test/617-clinit-oome/Android.bp
index 3ecdec6..300ed5d 100644
--- a/test/617-clinit-oome/Android.bp
+++ b/test/617-clinit-oome/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `617-clinit-oome`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-617-clinit-oome",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-617-clinit-oome-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-617-clinit-oome-expected",
+    out: ["art-run-test-617-clinit-oome-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/618-checker-induction/Android.bp b/test/618-checker-induction/Android.bp
index d4e4973..ce4dd5f 100644
--- a/test/618-checker-induction/Android.bp
+++ b/test/618-checker-induction/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `618-checker-induction`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-618-checker-induction",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-618-checker-induction-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-618-checker-induction-expected",
+    out: ["art-run-test-618-checker-induction-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/619-checker-current-method/Android.bp b/test/619-checker-current-method/Android.bp
index c099e01..4124382 100644
--- a/test/619-checker-current-method/Android.bp
+++ b/test/619-checker-current-method/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `619-checker-current-method`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-619-checker-current-method",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-619-checker-current-method-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-619-checker-current-method-expected",
+    out: ["art-run-test-619-checker-current-method-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/620-checker-bce-intrinsics/Android.bp b/test/620-checker-bce-intrinsics/Android.bp
index 7fee0da..95eb335 100644
--- a/test/620-checker-bce-intrinsics/Android.bp
+++ b/test/620-checker-bce-intrinsics/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `620-checker-bce-intrinsics`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-620-checker-bce-intrinsics",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-620-checker-bce-intrinsics-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-620-checker-bce-intrinsics-expected",
+    out: ["art-run-test-620-checker-bce-intrinsics-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/622-checker-bce-regressions/Android.bp b/test/622-checker-bce-regressions/Android.bp
index 9c3a592..3e81da8 100644
--- a/test/622-checker-bce-regressions/Android.bp
+++ b/test/622-checker-bce-regressions/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `622-checker-bce-regressions`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-622-checker-bce-regressions",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-622-checker-bce-regressions-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-622-checker-bce-regressions-expected",
+    out: ["art-run-test-622-checker-bce-regressions-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/623-checker-loop-regressions/Android.bp b/test/623-checker-loop-regressions/Android.bp
index ea10f5a..6e71052 100644
--- a/test/623-checker-loop-regressions/Android.bp
+++ b/test/623-checker-loop-regressions/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `623-checker-loop-regressions`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-623-checker-loop-regressions",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-623-checker-loop-regressions-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-623-checker-loop-regressions-expected",
+    out: ["art-run-test-623-checker-loop-regressions-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/625-checker-licm-regressions/Android.bp b/test/625-checker-licm-regressions/Android.bp
index 9c23fc9..8fcc465 100644
--- a/test/625-checker-licm-regressions/Android.bp
+++ b/test/625-checker-licm-regressions/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `625-checker-licm-regressions`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-625-checker-licm-regressions",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-625-checker-licm-regressions-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-625-checker-licm-regressions-expected",
+    out: ["art-run-test-625-checker-licm-regressions-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/626-set-resolved-string/Android.bp b/test/626-set-resolved-string/Android.bp
index 4820860..d455eb1 100644
--- a/test/626-set-resolved-string/Android.bp
+++ b/test/626-set-resolved-string/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `626-set-resolved-string`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-626-set-resolved-string",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-626-set-resolved-string-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-626-set-resolved-string-expected",
+    out: ["art-run-test-626-set-resolved-string-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/627-checker-unroll/Android.bp b/test/627-checker-unroll/Android.bp
index dab7a1a..84e3941 100644
--- a/test/627-checker-unroll/Android.bp
+++ b/test/627-checker-unroll/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `627-checker-unroll`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-627-checker-unroll",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-627-checker-unroll-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-627-checker-unroll-expected",
+    out: ["art-run-test-627-checker-unroll-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/628-vdex/Android.bp b/test/628-vdex/Android.bp
index 6875f00..3c80558 100644
--- a/test/628-vdex/Android.bp
+++ b/test/628-vdex/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `628-vdex`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-628-vdex",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-628-vdex-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-628-vdex-expected",
+    out: ["art-run-test-628-vdex-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/629-vdex-speed/Android.bp b/test/629-vdex-speed/Android.bp
index eba1c9a..93256ce 100644
--- a/test/629-vdex-speed/Android.bp
+++ b/test/629-vdex-speed/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `629-vdex-speed`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-629-vdex-speed",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-629-vdex-speed-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-629-vdex-speed-expected",
+    out: ["art-run-test-629-vdex-speed-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/631-checker-get-class/Android.bp b/test/631-checker-get-class/Android.bp
index 098ac93..d77ef26 100644
--- a/test/631-checker-get-class/Android.bp
+++ b/test/631-checker-get-class/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `631-checker-get-class`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-631-checker-get-class",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-631-checker-get-class-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-631-checker-get-class-expected",
+    out: ["art-run-test-631-checker-get-class-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/632-checker-char-at-bounds/Android.bp b/test/632-checker-char-at-bounds/Android.bp
index 2e5dfe7..aadc031 100644
--- a/test/632-checker-char-at-bounds/Android.bp
+++ b/test/632-checker-char-at-bounds/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `632-checker-char-at-bounds`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-632-checker-char-at-bounds",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-632-checker-char-at-bounds-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-632-checker-char-at-bounds-expected",
+    out: ["art-run-test-632-checker-char-at-bounds-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/635-checker-arm64-volatile-load-cc/Android.bp b/test/635-checker-arm64-volatile-load-cc/Android.bp
index 04ab841..cfb9e9d 100644
--- a/test/635-checker-arm64-volatile-load-cc/Android.bp
+++ b/test/635-checker-arm64-volatile-load-cc/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `635-checker-arm64-volatile-load-cc`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-635-checker-arm64-volatile-load-cc",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-635-checker-arm64-volatile-load-cc-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-635-checker-arm64-volatile-load-cc-expected",
+    out: ["art-run-test-635-checker-arm64-volatile-load-cc-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/636-arm64-veneer-pool/Android.bp b/test/636-arm64-veneer-pool/Android.bp
index 39cf9d5..2bd90f4 100644
--- a/test/636-arm64-veneer-pool/Android.bp
+++ b/test/636-arm64-veneer-pool/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `636-arm64-veneer-pool`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-636-arm64-veneer-pool",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-636-arm64-veneer-pool-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-636-arm64-veneer-pool-expected",
+    out: ["art-run-test-636-arm64-veneer-pool-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/637-checker-throw-inline/Android.bp b/test/637-checker-throw-inline/Android.bp
index 3724175..5ce4c97 100644
--- a/test/637-checker-throw-inline/Android.bp
+++ b/test/637-checker-throw-inline/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `637-checker-throw-inline`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-637-checker-throw-inline",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-637-checker-throw-inline-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-637-checker-throw-inline-expected",
+    out: ["art-run-test-637-checker-throw-inline-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/638-checker-inline-cache-intrinsic/Android.bp b/test/638-checker-inline-cache-intrinsic/Android.bp
index 29bf69f..b71b75a 100644
--- a/test/638-checker-inline-cache-intrinsic/Android.bp
+++ b/test/638-checker-inline-cache-intrinsic/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `638-checker-inline-cache-intrinsic`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-638-checker-inline-cache-intrinsic",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-638-checker-inline-cache-intrinsic-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-638-checker-inline-cache-intrinsic-expected",
+    out: ["art-run-test-638-checker-inline-cache-intrinsic-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/639-checker-code-sinking/Android.bp b/test/639-checker-code-sinking/Android.bp
index 22bd36a..6ffbc90 100644
--- a/test/639-checker-code-sinking/Android.bp
+++ b/test/639-checker-code-sinking/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `639-checker-code-sinking`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-639-checker-code-sinking",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-639-checker-code-sinking-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-639-checker-code-sinking-expected",
+    out: ["art-run-test-639-checker-code-sinking-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/640-checker-boolean-simd/Android.bp b/test/640-checker-boolean-simd/Android.bp
index 2307c58..f1bd433 100644
--- a/test/640-checker-boolean-simd/Android.bp
+++ b/test/640-checker-boolean-simd/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `640-checker-boolean-simd`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-640-checker-boolean-simd",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-640-checker-boolean-simd-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-640-checker-boolean-simd-expected",
+    out: ["art-run-test-640-checker-boolean-simd-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/640-checker-integer-valueof/Android.bp b/test/640-checker-integer-valueof/Android.bp
index 96ead1c..512cf03 100644
--- a/test/640-checker-integer-valueof/Android.bp
+++ b/test/640-checker-integer-valueof/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `640-checker-integer-valueof`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-640-checker-integer-valueof",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-640-checker-integer-valueof-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-640-checker-integer-valueof-expected",
+    out: ["art-run-test-640-checker-integer-valueof-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/640-checker-simd/Android.bp b/test/640-checker-simd/Android.bp
index e6385f6..2b3ba69 100644
--- a/test/640-checker-simd/Android.bp
+++ b/test/640-checker-simd/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `640-checker-simd`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-640-checker-simd",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-640-checker-simd-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-640-checker-simd-expected",
+    out: ["art-run-test-640-checker-simd-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/641-checker-arraycopy/Android.bp b/test/641-checker-arraycopy/Android.bp
index 326715a..3988505 100644
--- a/test/641-checker-arraycopy/Android.bp
+++ b/test/641-checker-arraycopy/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `641-checker-arraycopy`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-641-checker-arraycopy",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-641-checker-arraycopy-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-641-checker-arraycopy-expected",
+    out: ["art-run-test-641-checker-arraycopy-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/641-iterations/Android.bp b/test/641-iterations/Android.bp
index 60220f7..b955230 100644
--- a/test/641-iterations/Android.bp
+++ b/test/641-iterations/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `641-iterations`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-641-iterations",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-641-iterations-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-641-iterations-expected",
+    out: ["art-run-test-641-iterations-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/642-fp-callees/Android.bp b/test/642-fp-callees/Android.bp
index 2539992..3d952fb 100644
--- a/test/642-fp-callees/Android.bp
+++ b/test/642-fp-callees/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `642-fp-callees`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-642-fp-callees",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-642-fp-callees-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-642-fp-callees-expected",
+    out: ["art-run-test-642-fp-callees-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/643-checker-bogus-ic/Android.bp b/test/643-checker-bogus-ic/Android.bp
index 2295a79..8a7d76b 100644
--- a/test/643-checker-bogus-ic/Android.bp
+++ b/test/643-checker-bogus-ic/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `643-checker-bogus-ic`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-643-checker-bogus-ic",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-643-checker-bogus-ic-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-643-checker-bogus-ic-expected",
+    out: ["art-run-test-643-checker-bogus-ic-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/645-checker-abs-simd/Android.bp b/test/645-checker-abs-simd/Android.bp
index dd9eb98..cb7e735 100644
--- a/test/645-checker-abs-simd/Android.bp
+++ b/test/645-checker-abs-simd/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `645-checker-abs-simd`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-645-checker-abs-simd",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-645-checker-abs-simd-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-645-checker-abs-simd-expected",
+    out: ["art-run-test-645-checker-abs-simd-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/646-checker-arraycopy-large-cst-pos/Android.bp b/test/646-checker-arraycopy-large-cst-pos/Android.bp
index f8dadc7..e9b1ca6 100644
--- a/test/646-checker-arraycopy-large-cst-pos/Android.bp
+++ b/test/646-checker-arraycopy-large-cst-pos/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `646-checker-arraycopy-large-cst-pos`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-646-checker-arraycopy-large-cst-pos",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-646-checker-arraycopy-large-cst-pos-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-646-checker-arraycopy-large-cst-pos-expected",
+    out: ["art-run-test-646-checker-arraycopy-large-cst-pos-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/646-checker-long-const-to-int/Android.bp b/test/646-checker-long-const-to-int/Android.bp
index 23b8149..58fd4d0 100644
--- a/test/646-checker-long-const-to-int/Android.bp
+++ b/test/646-checker-long-const-to-int/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `646-checker-long-const-to-int`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-646-checker-long-const-to-int",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-646-checker-long-const-to-int-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-646-checker-long-const-to-int-expected",
+    out: ["art-run-test-646-checker-long-const-to-int-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/646-checker-simd-hadd/Android.bp b/test/646-checker-simd-hadd/Android.bp
index 07679b7..8e2d366 100644
--- a/test/646-checker-simd-hadd/Android.bp
+++ b/test/646-checker-simd-hadd/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `646-checker-simd-hadd`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-646-checker-simd-hadd",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-646-checker-simd-hadd-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-646-checker-simd-hadd-expected",
+    out: ["art-run-test-646-checker-simd-hadd-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/647-jni-get-field-id/Android.bp b/test/647-jni-get-field-id/Android.bp
index b5b7d05..7efa004 100644
--- a/test/647-jni-get-field-id/Android.bp
+++ b/test/647-jni-get-field-id/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `647-jni-get-field-id`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-647-jni-get-field-id",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-647-jni-get-field-id-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-647-jni-get-field-id-expected",
+    out: ["art-run-test-647-jni-get-field-id-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/650-checker-inline-access-thunks/Android.bp b/test/650-checker-inline-access-thunks/Android.bp
index 8a1e14c..c40bcd9 100644
--- a/test/650-checker-inline-access-thunks/Android.bp
+++ b/test/650-checker-inline-access-thunks/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `650-checker-inline-access-thunks`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-650-checker-inline-access-thunks",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-650-checker-inline-access-thunks-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-650-checker-inline-access-thunks-expected",
+    out: ["art-run-test-650-checker-inline-access-thunks-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/652-deopt-intrinsic/Android.bp b/test/652-deopt-intrinsic/Android.bp
index 33ed7ae..bc1e79a 100644
--- a/test/652-deopt-intrinsic/Android.bp
+++ b/test/652-deopt-intrinsic/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `652-deopt-intrinsic`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-652-deopt-intrinsic",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-652-deopt-intrinsic-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-652-deopt-intrinsic-expected",
+    out: ["art-run-test-652-deopt-intrinsic-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/654-checker-periodic/Android.bp b/test/654-checker-periodic/Android.bp
index b3f9d1f..87fb458 100644
--- a/test/654-checker-periodic/Android.bp
+++ b/test/654-checker-periodic/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `654-checker-periodic`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-654-checker-periodic",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-654-checker-periodic-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-654-checker-periodic-expected",
+    out: ["art-run-test-654-checker-periodic-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/655-checker-simd-arm-opt/Android.bp b/test/655-checker-simd-arm-opt/Android.bp
index e966ed2..b195fed 100644
--- a/test/655-checker-simd-arm-opt/Android.bp
+++ b/test/655-checker-simd-arm-opt/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `655-checker-simd-arm-opt`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-655-checker-simd-arm-opt",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-655-checker-simd-arm-opt-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-655-checker-simd-arm-opt-expected",
+    out: ["art-run-test-655-checker-simd-arm-opt-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/655-jit-clinit/Android.bp b/test/655-jit-clinit/Android.bp
index b30c241..a9a5354 100644
--- a/test/655-jit-clinit/Android.bp
+++ b/test/655-jit-clinit/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `655-jit-clinit`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-655-jit-clinit",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-655-jit-clinit-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-655-jit-clinit-expected",
+    out: ["art-run-test-655-jit-clinit-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/656-checker-simd-opt/Android.bp b/test/656-checker-simd-opt/Android.bp
index bb75507..d22116a 100644
--- a/test/656-checker-simd-opt/Android.bp
+++ b/test/656-checker-simd-opt/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `656-checker-simd-opt`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-656-checker-simd-opt",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-656-checker-simd-opt-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-656-checker-simd-opt-expected",
+    out: ["art-run-test-656-checker-simd-opt-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/656-loop-deopt/Android.bp b/test/656-loop-deopt/Android.bp
index eb08728..032855a 100644
--- a/test/656-loop-deopt/Android.bp
+++ b/test/656-loop-deopt/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `656-loop-deopt`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-656-loop-deopt",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-656-loop-deopt-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-656-loop-deopt-expected",
+    out: ["art-run-test-656-loop-deopt-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/657-branches/Android.bp b/test/657-branches/Android.bp
index 42d7977..55190f9 100644
--- a/test/657-branches/Android.bp
+++ b/test/657-branches/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `657-branches`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-657-branches",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-657-branches-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-657-branches-expected",
+    out: ["art-run-test-657-branches-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/658-fp-read-barrier/Android.bp b/test/658-fp-read-barrier/Android.bp
index 1341764..1bf9a0e 100644
--- a/test/658-fp-read-barrier/Android.bp
+++ b/test/658-fp-read-barrier/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `658-fp-read-barrier`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-658-fp-read-barrier",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-658-fp-read-barrier-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-658-fp-read-barrier-expected",
+    out: ["art-run-test-658-fp-read-barrier-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/660-checker-sad/Android.bp b/test/660-checker-sad/Android.bp
index 202e15c..b73e6ae 100644
--- a/test/660-checker-sad/Android.bp
+++ b/test/660-checker-sad/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `660-checker-sad`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-660-checker-sad",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-660-checker-sad-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-660-checker-sad-expected",
+    out: ["art-run-test-660-checker-sad-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/660-checker-simd-sad/Android.bp b/test/660-checker-simd-sad/Android.bp
index 1f25f99..49a5d82 100644
--- a/test/660-checker-simd-sad/Android.bp
+++ b/test/660-checker-simd-sad/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `660-checker-simd-sad`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-660-checker-simd-sad",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-660-checker-simd-sad-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-660-checker-simd-sad-expected",
+    out: ["art-run-test-660-checker-simd-sad-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/660-clinit/Android.bp b/test/660-clinit/Android.bp
index 36cc15e..32cb7a5 100644
--- a/test/660-clinit/Android.bp
+++ b/test/660-clinit/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `660-clinit`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-660-clinit",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-660-clinit-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-660-clinit-expected",
+    out: ["art-run-test-660-clinit-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/661-checker-simd-reduc/Android.bp b/test/661-checker-simd-reduc/Android.bp
index a37708d..37588ff 100644
--- a/test/661-checker-simd-reduc/Android.bp
+++ b/test/661-checker-simd-reduc/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `661-checker-simd-reduc`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-661-checker-simd-reduc",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-661-checker-simd-reduc-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-661-checker-simd-reduc-expected",
+    out: ["art-run-test-661-checker-simd-reduc-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/661-oat-writer-layout/Android.bp b/test/661-oat-writer-layout/Android.bp
index 4f45a96..b3003b7 100644
--- a/test/661-oat-writer-layout/Android.bp
+++ b/test/661-oat-writer-layout/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `661-oat-writer-layout`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-661-oat-writer-layout",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-661-oat-writer-layout-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-661-oat-writer-layout-expected",
+    out: ["art-run-test-661-oat-writer-layout-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/662-regression-alias/Android.bp b/test/662-regression-alias/Android.bp
index 1e5a5f2..d96f5ed 100644
--- a/test/662-regression-alias/Android.bp
+++ b/test/662-regression-alias/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `662-regression-alias`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-662-regression-alias",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-662-regression-alias-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-662-regression-alias-expected",
+    out: ["art-run-test-662-regression-alias-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/664-aget-verifier/Android.bp b/test/664-aget-verifier/Android.bp
index 92f1e93..c8b577d 100644
--- a/test/664-aget-verifier/Android.bp
+++ b/test/664-aget-verifier/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `664-aget-verifier`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-664-aget-verifier",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-664-aget-verifier-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-664-aget-verifier-expected",
+    out: ["art-run-test-664-aget-verifier-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/665-checker-simd-zero/Android.bp b/test/665-checker-simd-zero/Android.bp
index f5c9115..657db3b 100644
--- a/test/665-checker-simd-zero/Android.bp
+++ b/test/665-checker-simd-zero/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `665-checker-simd-zero`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-665-checker-simd-zero",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-665-checker-simd-zero-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-665-checker-simd-zero-expected",
+    out: ["art-run-test-665-checker-simd-zero-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/666-dex-cache-itf/Android.bp b/test/666-dex-cache-itf/Android.bp
index f18f43c..4445f33 100644
--- a/test/666-dex-cache-itf/Android.bp
+++ b/test/666-dex-cache-itf/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `666-dex-cache-itf`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-666-dex-cache-itf",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-666-dex-cache-itf-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-666-dex-cache-itf-expected",
+    out: ["art-run-test-666-dex-cache-itf-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/667-checker-simd-alignment/Android.bp b/test/667-checker-simd-alignment/Android.bp
index b732324..dc9547f 100644
--- a/test/667-checker-simd-alignment/Android.bp
+++ b/test/667-checker-simd-alignment/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `667-checker-simd-alignment`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-667-checker-simd-alignment",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-667-checker-simd-alignment-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-667-checker-simd-alignment-expected",
+    out: ["art-run-test-667-checker-simd-alignment-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/667-jit-jni-stub/Android.bp b/test/667-jit-jni-stub/Android.bp
index d4911f4..b67d696 100644
--- a/test/667-jit-jni-stub/Android.bp
+++ b/test/667-jit-jni-stub/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `667-jit-jni-stub`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-667-jit-jni-stub",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-667-jit-jni-stub-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-667-jit-jni-stub-expected",
+    out: ["art-run-test-667-jit-jni-stub-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/667-out-of-bounds/Android.bp b/test/667-out-of-bounds/Android.bp
index c68a48b..be1b944 100644
--- a/test/667-out-of-bounds/Android.bp
+++ b/test/667-out-of-bounds/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `667-out-of-bounds`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-667-out-of-bounds",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-667-out-of-bounds-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-667-out-of-bounds-expected",
+    out: ["art-run-test-667-out-of-bounds-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/669-checker-break/Android.bp b/test/669-checker-break/Android.bp
index 1fa02d3..48ab323 100644
--- a/test/669-checker-break/Android.bp
+++ b/test/669-checker-break/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `669-checker-break`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-669-checker-break",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-669-checker-break-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-669-checker-break-expected",
+    out: ["art-run-test-669-checker-break-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/671-npe-field-opts/Android.bp b/test/671-npe-field-opts/Android.bp
index 4f795c3..964e496 100644
--- a/test/671-npe-field-opts/Android.bp
+++ b/test/671-npe-field-opts/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `671-npe-field-opts`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-671-npe-field-opts",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-671-npe-field-opts-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-671-npe-field-opts-expected",
+    out: ["art-run-test-671-npe-field-opts-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/672-checker-throw-method/Android.bp b/test/672-checker-throw-method/Android.bp
index 03b8dfc..e21f27a 100644
--- a/test/672-checker-throw-method/Android.bp
+++ b/test/672-checker-throw-method/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `672-checker-throw-method`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-672-checker-throw-method",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-672-checker-throw-method-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-672-checker-throw-method-expected",
+    out: ["art-run-test-672-checker-throw-method-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/673-checker-throw-vmethod/Android.bp b/test/673-checker-throw-vmethod/Android.bp
index 941c585..0fd67e1 100644
--- a/test/673-checker-throw-vmethod/Android.bp
+++ b/test/673-checker-throw-vmethod/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `673-checker-throw-vmethod`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-673-checker-throw-vmethod",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-673-checker-throw-vmethod-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-673-checker-throw-vmethod-expected",
+    out: ["art-run-test-673-checker-throw-vmethod-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/674-HelloWorld-Dm/Android.bp b/test/674-HelloWorld-Dm/Android.bp
index a21dd19..bc75399 100644
--- a/test/674-HelloWorld-Dm/Android.bp
+++ b/test/674-HelloWorld-Dm/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `674-HelloWorld-Dm`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-674-HelloWorld-Dm",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-674-HelloWorld-Dm-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-674-HelloWorld-Dm-expected",
+    out: ["art-run-test-674-HelloWorld-Dm-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/674-hotness-compiled/Android.bp b/test/674-hotness-compiled/Android.bp
index b7f64d1..08776e5 100644
--- a/test/674-hotness-compiled/Android.bp
+++ b/test/674-hotness-compiled/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `674-hotness-compiled`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-674-hotness-compiled",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-674-hotness-compiled-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-674-hotness-compiled-expected",
+    out: ["art-run-test-674-hotness-compiled-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/676-proxy-jit-at-first-use/Android.bp b/test/676-proxy-jit-at-first-use/Android.bp
index d9fd7f7..e29f56b 100644
--- a/test/676-proxy-jit-at-first-use/Android.bp
+++ b/test/676-proxy-jit-at-first-use/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `676-proxy-jit-at-first-use`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-676-proxy-jit-at-first-use",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-676-proxy-jit-at-first-use-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-676-proxy-jit-at-first-use-expected",
+    out: ["art-run-test-676-proxy-jit-at-first-use-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/677-fsi2/Android.bp b/test/677-fsi2/Android.bp
index d5d88f5..1bf2ea6 100644
--- a/test/677-fsi2/Android.bp
+++ b/test/677-fsi2/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `677-fsi2`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-677-fsi2",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-677-fsi2-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-677-fsi2-expected",
+    out: ["art-run-test-677-fsi2-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/679-locks/Android.bp b/test/679-locks/Android.bp
index 71cdd29..3cbcd60 100644
--- a/test/679-locks/Android.bp
+++ b/test/679-locks/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `679-locks`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-679-locks",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-679-locks-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-679-locks-expected",
+    out: ["art-run-test-679-locks-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/680-checker-deopt-dex-pc-0/Android.bp b/test/680-checker-deopt-dex-pc-0/Android.bp
index 23f8221..3d6562e 100644
--- a/test/680-checker-deopt-dex-pc-0/Android.bp
+++ b/test/680-checker-deopt-dex-pc-0/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `680-checker-deopt-dex-pc-0`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-680-checker-deopt-dex-pc-0",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-680-checker-deopt-dex-pc-0-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-680-checker-deopt-dex-pc-0-expected",
+    out: ["art-run-test-680-checker-deopt-dex-pc-0-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/680-sink-regression/Android.bp b/test/680-sink-regression/Android.bp
index be13647..af68e7c 100644
--- a/test/680-sink-regression/Android.bp
+++ b/test/680-sink-regression/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `680-sink-regression`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-680-sink-regression",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-680-sink-regression-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-680-sink-regression-expected",
+    out: ["art-run-test-680-sink-regression-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/684-checker-simd-dotprod/Android.bp b/test/684-checker-simd-dotprod/Android.bp
index 6d91aae..bea8fb7 100644
--- a/test/684-checker-simd-dotprod/Android.bp
+++ b/test/684-checker-simd-dotprod/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `684-checker-simd-dotprod`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-684-checker-simd-dotprod",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-684-checker-simd-dotprod-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-684-checker-simd-dotprod-expected",
+    out: ["art-run-test-684-checker-simd-dotprod-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/684-select-condition/Android.bp b/test/684-select-condition/Android.bp
index bc1fe5f..eaa3e3f 100644
--- a/test/684-select-condition/Android.bp
+++ b/test/684-select-condition/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `684-select-condition`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-684-select-condition",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-684-select-condition-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-684-select-condition-expected",
+    out: ["art-run-test-684-select-condition-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/685-deoptimizeable/Android.bp b/test/685-deoptimizeable/Android.bp
index 0a21949..6926261 100644
--- a/test/685-deoptimizeable/Android.bp
+++ b/test/685-deoptimizeable/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `685-deoptimizeable`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-685-deoptimizeable",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-685-deoptimizeable-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-685-deoptimizeable-expected",
+    out: ["art-run-test-685-deoptimizeable-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/687-deopt/Android.bp b/test/687-deopt/Android.bp
index 73d40ec..9545e65 100644
--- a/test/687-deopt/Android.bp
+++ b/test/687-deopt/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `687-deopt`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-687-deopt",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-687-deopt-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-687-deopt-expected",
+    out: ["art-run-test-687-deopt-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/689-multi-catch/Android.bp b/test/689-multi-catch/Android.bp
index 35c3fb3..58440b0 100644
--- a/test/689-multi-catch/Android.bp
+++ b/test/689-multi-catch/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `689-multi-catch`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-689-multi-catch",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-689-multi-catch-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-689-multi-catch-expected",
+    out: ["art-run-test-689-multi-catch-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/689-zygote-jit-deopt/Android.bp b/test/689-zygote-jit-deopt/Android.bp
index 73d1200..ec817c1 100644
--- a/test/689-zygote-jit-deopt/Android.bp
+++ b/test/689-zygote-jit-deopt/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `689-zygote-jit-deopt`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-689-zygote-jit-deopt",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-689-zygote-jit-deopt-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-689-zygote-jit-deopt-expected",
+    out: ["art-run-test-689-zygote-jit-deopt-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/693-vdex-inmem-loader-evict/Android.bp b/test/693-vdex-inmem-loader-evict/Android.bp
index 45fc663..ff3070c 100644
--- a/test/693-vdex-inmem-loader-evict/Android.bp
+++ b/test/693-vdex-inmem-loader-evict/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `693-vdex-inmem-loader-evict`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-693-vdex-inmem-loader-evict",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-693-vdex-inmem-loader-evict-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-693-vdex-inmem-loader-evict-expected",
+    out: ["art-run-test-693-vdex-inmem-loader-evict-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/694-clinit-jit/Android.bp b/test/694-clinit-jit/Android.bp
index fddd48e..e0172eb 100644
--- a/test/694-clinit-jit/Android.bp
+++ b/test/694-clinit-jit/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `694-clinit-jit`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-694-clinit-jit",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-694-clinit-jit-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-694-clinit-jit-expected",
+    out: ["art-run-test-694-clinit-jit-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/695-simplify-throws/Android.bp b/test/695-simplify-throws/Android.bp
index 4bacbd4..64431eb 100644
--- a/test/695-simplify-throws/Android.bp
+++ b/test/695-simplify-throws/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `695-simplify-throws`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-695-simplify-throws",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-695-simplify-throws-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-695-simplify-throws-expected",
+    out: ["art-run-test-695-simplify-throws-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/696-loop/Android.bp b/test/696-loop/Android.bp
index 63c560b..3b90426 100644
--- a/test/696-loop/Android.bp
+++ b/test/696-loop/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `696-loop`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-696-loop",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-696-loop-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-696-loop-expected",
+    out: ["art-run-test-696-loop-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/697-checker-string-append/Android.bp b/test/697-checker-string-append/Android.bp
index 35c775b..53a79e5 100644
--- a/test/697-checker-string-append/Android.bp
+++ b/test/697-checker-string-append/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `697-checker-string-append`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-697-checker-string-append",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-697-checker-string-append-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-697-checker-string-append-expected",
+    out: ["art-run-test-697-checker-string-append-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/698-selects/Android.bp b/test/698-selects/Android.bp
index 5a652fb..a42a66c 100644
--- a/test/698-selects/Android.bp
+++ b/test/698-selects/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `698-selects`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-698-selects",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-698-selects-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-698-selects-expected",
+    out: ["art-run-test-698-selects-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/700-LoadArgRegs/Android.bp b/test/700-LoadArgRegs/Android.bp
index b62a179..2037814 100644
--- a/test/700-LoadArgRegs/Android.bp
+++ b/test/700-LoadArgRegs/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `700-LoadArgRegs`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-700-LoadArgRegs",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-700-LoadArgRegs-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-700-LoadArgRegs-expected",
+    out: ["art-run-test-700-LoadArgRegs-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/703-floating-point-div/Android.bp b/test/703-floating-point-div/Android.bp
index 6e8a8c1..3ecaa16 100644
--- a/test/703-floating-point-div/Android.bp
+++ b/test/703-floating-point-div/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `703-floating-point-div`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-703-floating-point-div",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-703-floating-point-div-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-703-floating-point-div-expected",
+    out: ["art-run-test-703-floating-point-div-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/704-multiply-accumulate/Android.bp b/test/704-multiply-accumulate/Android.bp
index 5315585..e028a82 100644
--- a/test/704-multiply-accumulate/Android.bp
+++ b/test/704-multiply-accumulate/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `704-multiply-accumulate`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-704-multiply-accumulate",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-704-multiply-accumulate-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-704-multiply-accumulate-expected",
+    out: ["art-run-test-704-multiply-accumulate-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/705-register-conflict/Android.bp b/test/705-register-conflict/Android.bp
index 5d30e43..0ac442b 100644
--- a/test/705-register-conflict/Android.bp
+++ b/test/705-register-conflict/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `705-register-conflict`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-705-register-conflict",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-705-register-conflict-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-705-register-conflict-expected",
+    out: ["art-run-test-705-register-conflict-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/707-checker-invalid-profile/Android.bp b/test/707-checker-invalid-profile/Android.bp
index 21a6854..eddf04d 100644
--- a/test/707-checker-invalid-profile/Android.bp
+++ b/test/707-checker-invalid-profile/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `707-checker-invalid-profile`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-707-checker-invalid-profile",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-707-checker-invalid-profile-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-707-checker-invalid-profile-expected",
+    out: ["art-run-test-707-checker-invalid-profile-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/708-jit-cache-churn/Android.bp b/test/708-jit-cache-churn/Android.bp
index ed86e89..c77919e 100644
--- a/test/708-jit-cache-churn/Android.bp
+++ b/test/708-jit-cache-churn/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `708-jit-cache-churn`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-708-jit-cache-churn",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-708-jit-cache-churn-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-708-jit-cache-churn-expected",
+    out: ["art-run-test-708-jit-cache-churn-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/711-checker-type-conversion/Android.bp b/test/711-checker-type-conversion/Android.bp
index c23c15e..f617e97 100644
--- a/test/711-checker-type-conversion/Android.bp
+++ b/test/711-checker-type-conversion/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `711-checker-type-conversion`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-711-checker-type-conversion",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-711-checker-type-conversion-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-711-checker-type-conversion-expected",
+    out: ["art-run-test-711-checker-type-conversion-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/717-integer-value-of/Android.bp b/test/717-integer-value-of/Android.bp
index 2a367f5..af86d08 100644
--- a/test/717-integer-value-of/Android.bp
+++ b/test/717-integer-value-of/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `717-integer-value-of`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-717-integer-value-of",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-717-integer-value-of-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-717-integer-value-of-expected",
+    out: ["art-run-test-717-integer-value-of-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/718-zipfile-finalizer/Android.bp b/test/718-zipfile-finalizer/Android.bp
index f8bdcf8..2ffdcb7 100644
--- a/test/718-zipfile-finalizer/Android.bp
+++ b/test/718-zipfile-finalizer/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `718-zipfile-finalizer`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-718-zipfile-finalizer",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-718-zipfile-finalizer-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-718-zipfile-finalizer-expected",
+    out: ["art-run-test-718-zipfile-finalizer-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/720-thread-priority/Android.bp b/test/720-thread-priority/Android.bp
index a169683..ff2551e 100644
--- a/test/720-thread-priority/Android.bp
+++ b/test/720-thread-priority/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `720-thread-priority`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-720-thread-priority",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-720-thread-priority-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-720-thread-priority-expected",
+    out: ["art-run-test-720-thread-priority-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/721-osr/Android.bp b/test/721-osr/Android.bp
index 4babc44..3a3f862 100644
--- a/test/721-osr/Android.bp
+++ b/test/721-osr/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `721-osr`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-721-osr",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-721-osr-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-721-osr-expected",
+    out: ["art-run-test-721-osr-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/726-array-store/Android.bp b/test/726-array-store/Android.bp
index 3e0a6d4..135d289 100644
--- a/test/726-array-store/Android.bp
+++ b/test/726-array-store/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `726-array-store`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-726-array-store",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-726-array-store-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-726-array-store-expected",
+    out: ["art-run-test-726-array-store-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/805-TooDeepClassInstanceOf/Android.bp b/test/805-TooDeepClassInstanceOf/Android.bp
index e825f28..e33f775 100644
--- a/test/805-TooDeepClassInstanceOf/Android.bp
+++ b/test/805-TooDeepClassInstanceOf/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `805-TooDeepClassInstanceOf`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-805-TooDeepClassInstanceOf",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-805-TooDeepClassInstanceOf-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-805-TooDeepClassInstanceOf-expected",
+    out: ["art-run-test-805-TooDeepClassInstanceOf-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/806-TooWideClassInstanceOf/Android.bp b/test/806-TooWideClassInstanceOf/Android.bp
index 7264a45..a540a89 100644
--- a/test/806-TooWideClassInstanceOf/Android.bp
+++ b/test/806-TooWideClassInstanceOf/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `806-TooWideClassInstanceOf`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-806-TooWideClassInstanceOf",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-806-TooWideClassInstanceOf-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-806-TooWideClassInstanceOf-expected",
+    out: ["art-run-test-806-TooWideClassInstanceOf-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/900-hello-plugin/Android.bp b/test/900-hello-plugin/Android.bp
index 107119f..76c3f2c 100644
--- a/test/900-hello-plugin/Android.bp
+++ b/test/900-hello-plugin/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `900-hello-plugin`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-900-hello-plugin",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-900-hello-plugin-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-900-hello-plugin-expected",
+    out: ["art-run-test-900-hello-plugin-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/901-hello-ti-agent/Android.bp b/test/901-hello-ti-agent/Android.bp
index 57f78c0..d57b905 100644
--- a/test/901-hello-ti-agent/Android.bp
+++ b/test/901-hello-ti-agent/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `901-hello-ti-agent`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-901-hello-ti-agent",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-901-hello-ti-agent-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-901-hello-ti-agent-expected",
+    out: ["art-run-test-901-hello-ti-agent-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/902-hello-transformation/Android.bp b/test/902-hello-transformation/Android.bp
index e54afd0..11ec28e 100644
--- a/test/902-hello-transformation/Android.bp
+++ b/test/902-hello-transformation/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `902-hello-transformation`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-902-hello-transformation",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-902-hello-transformation-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-902-hello-transformation-expected",
+    out: ["art-run-test-902-hello-transformation-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/903-hello-tagging/Android.bp b/test/903-hello-tagging/Android.bp
index fc4eaa8..a57af07 100644
--- a/test/903-hello-tagging/Android.bp
+++ b/test/903-hello-tagging/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `903-hello-tagging`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-903-hello-tagging",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-903-hello-tagging-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-903-hello-tagging-expected",
+    out: ["art-run-test-903-hello-tagging-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/904-object-allocation/Android.bp b/test/904-object-allocation/Android.bp
index affaef3..82df2e6 100644
--- a/test/904-object-allocation/Android.bp
+++ b/test/904-object-allocation/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `904-object-allocation`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-904-object-allocation",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-904-object-allocation-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-904-object-allocation-expected",
+    out: ["art-run-test-904-object-allocation-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/905-object-free/Android.bp b/test/905-object-free/Android.bp
index 762d7ed..08a56a4 100644
--- a/test/905-object-free/Android.bp
+++ b/test/905-object-free/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `905-object-free`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-905-object-free",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-905-object-free-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-905-object-free-expected",
+    out: ["art-run-test-905-object-free-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/906-iterate-heap/Android.bp b/test/906-iterate-heap/Android.bp
index 9da88cc..fbb0344 100644
--- a/test/906-iterate-heap/Android.bp
+++ b/test/906-iterate-heap/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `906-iterate-heap`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-906-iterate-heap",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-906-iterate-heap-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-906-iterate-heap-expected",
+    out: ["art-run-test-906-iterate-heap-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/907-get-loaded-classes/Android.bp b/test/907-get-loaded-classes/Android.bp
index 36851af..24af679 100644
--- a/test/907-get-loaded-classes/Android.bp
+++ b/test/907-get-loaded-classes/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `907-get-loaded-classes`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-907-get-loaded-classes",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-907-get-loaded-classes-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-907-get-loaded-classes-expected",
+    out: ["art-run-test-907-get-loaded-classes-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/908-gc-start-finish/Android.bp b/test/908-gc-start-finish/Android.bp
index 77222b4..17833f8 100644
--- a/test/908-gc-start-finish/Android.bp
+++ b/test/908-gc-start-finish/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `908-gc-start-finish`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-908-gc-start-finish",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-908-gc-start-finish-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-908-gc-start-finish-expected",
+    out: ["art-run-test-908-gc-start-finish-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/910-methods/Android.bp b/test/910-methods/Android.bp
index e2b8303..f1782e1 100644
--- a/test/910-methods/Android.bp
+++ b/test/910-methods/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `910-methods`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-910-methods",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-910-methods-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-910-methods-expected",
+    out: ["art-run-test-910-methods-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/911-get-stack-trace/Android.bp b/test/911-get-stack-trace/Android.bp
index 1486a17..8343210 100644
--- a/test/911-get-stack-trace/Android.bp
+++ b/test/911-get-stack-trace/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `911-get-stack-trace`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-911-get-stack-trace",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-911-get-stack-trace-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-911-get-stack-trace-expected",
+    out: ["art-run-test-911-get-stack-trace-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/913-heaps/Android.bp b/test/913-heaps/Android.bp
index c5d0fde..c946ca8 100644
--- a/test/913-heaps/Android.bp
+++ b/test/913-heaps/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `913-heaps`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-913-heaps",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-913-heaps-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-913-heaps-expected",
+    out: ["art-run-test-913-heaps-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/914-hello-obsolescence/Android.bp b/test/914-hello-obsolescence/Android.bp
index f1e9920..8ff2dd8 100644
--- a/test/914-hello-obsolescence/Android.bp
+++ b/test/914-hello-obsolescence/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `914-hello-obsolescence`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-914-hello-obsolescence",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-914-hello-obsolescence-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-914-hello-obsolescence-expected",
+    out: ["art-run-test-914-hello-obsolescence-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/915-obsolete-2/Android.bp b/test/915-obsolete-2/Android.bp
index 8a87f07..278f39e 100644
--- a/test/915-obsolete-2/Android.bp
+++ b/test/915-obsolete-2/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `915-obsolete-2`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-915-obsolete-2",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-915-obsolete-2-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-915-obsolete-2-expected",
+    out: ["art-run-test-915-obsolete-2-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/916-obsolete-jit/Android.bp b/test/916-obsolete-jit/Android.bp
index a6efebf..a4e7e7c 100644
--- a/test/916-obsolete-jit/Android.bp
+++ b/test/916-obsolete-jit/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `916-obsolete-jit`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-916-obsolete-jit",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-916-obsolete-jit-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-916-obsolete-jit-expected",
+    out: ["art-run-test-916-obsolete-jit-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/917-fields-transformation/Android.bp b/test/917-fields-transformation/Android.bp
index 0d3a5e3..b3cb21b 100644
--- a/test/917-fields-transformation/Android.bp
+++ b/test/917-fields-transformation/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `917-fields-transformation`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-917-fields-transformation",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-917-fields-transformation-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-917-fields-transformation-expected",
+    out: ["art-run-test-917-fields-transformation-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/918-fields/Android.bp b/test/918-fields/Android.bp
index 7d11789..549ba1a 100644
--- a/test/918-fields/Android.bp
+++ b/test/918-fields/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `918-fields`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-918-fields",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-918-fields-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-918-fields-expected",
+    out: ["art-run-test-918-fields-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/919-obsolete-fields/Android.bp b/test/919-obsolete-fields/Android.bp
index 2687003..0b6b816 100644
--- a/test/919-obsolete-fields/Android.bp
+++ b/test/919-obsolete-fields/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `919-obsolete-fields`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-919-obsolete-fields",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-919-obsolete-fields-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-919-obsolete-fields-expected",
+    out: ["art-run-test-919-obsolete-fields-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/920-objects/Android.bp b/test/920-objects/Android.bp
index add42548..65ee022 100644
--- a/test/920-objects/Android.bp
+++ b/test/920-objects/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `920-objects`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-920-objects",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-920-objects-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-920-objects-expected",
+    out: ["art-run-test-920-objects-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/921-hello-failure/Android.bp b/test/921-hello-failure/Android.bp
index 15c2e12..609704b 100644
--- a/test/921-hello-failure/Android.bp
+++ b/test/921-hello-failure/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `921-hello-failure`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-921-hello-failure",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-921-hello-failure-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-921-hello-failure-expected",
+    out: ["art-run-test-921-hello-failure-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/922-properties/Android.bp b/test/922-properties/Android.bp
index df3733d..6eec884 100644
--- a/test/922-properties/Android.bp
+++ b/test/922-properties/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `922-properties`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-922-properties",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-922-properties-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-922-properties-expected",
+    out: ["art-run-test-922-properties-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/923-monitors/Android.bp b/test/923-monitors/Android.bp
index 1d14744..945f50e 100644
--- a/test/923-monitors/Android.bp
+++ b/test/923-monitors/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `923-monitors`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-923-monitors",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-923-monitors-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-923-monitors-expected",
+    out: ["art-run-test-923-monitors-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/924-threads/Android.bp b/test/924-threads/Android.bp
index e9af933..d66cdad 100644
--- a/test/924-threads/Android.bp
+++ b/test/924-threads/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `924-threads`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-924-threads",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-924-threads-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-924-threads-expected",
+    out: ["art-run-test-924-threads-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/925-threadgroups/Android.bp b/test/925-threadgroups/Android.bp
index 7ce9ee1..4aac0ab 100644
--- a/test/925-threadgroups/Android.bp
+++ b/test/925-threadgroups/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `925-threadgroups`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-925-threadgroups",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-925-threadgroups-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-925-threadgroups-expected",
+    out: ["art-run-test-925-threadgroups-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/926-multi-obsolescence/Android.bp b/test/926-multi-obsolescence/Android.bp
index e3af62a..0ede109 100644
--- a/test/926-multi-obsolescence/Android.bp
+++ b/test/926-multi-obsolescence/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `926-multi-obsolescence`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-926-multi-obsolescence",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-926-multi-obsolescence-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-926-multi-obsolescence-expected",
+    out: ["art-run-test-926-multi-obsolescence-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/927-timers/Android.bp b/test/927-timers/Android.bp
index 9ba62c4..084f62f 100644
--- a/test/927-timers/Android.bp
+++ b/test/927-timers/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `927-timers`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-927-timers",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-927-timers-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-927-timers-expected",
+    out: ["art-run-test-927-timers-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/928-jni-table/Android.bp b/test/928-jni-table/Android.bp
index 578d922..a234411 100644
--- a/test/928-jni-table/Android.bp
+++ b/test/928-jni-table/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `928-jni-table`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-928-jni-table",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-928-jni-table-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-928-jni-table-expected",
+    out: ["art-run-test-928-jni-table-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/930-hello-retransform/Android.bp b/test/930-hello-retransform/Android.bp
index 6b87808..8a31e47 100644
--- a/test/930-hello-retransform/Android.bp
+++ b/test/930-hello-retransform/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `930-hello-retransform`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-930-hello-retransform",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-930-hello-retransform-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-930-hello-retransform-expected",
+    out: ["art-run-test-930-hello-retransform-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/931-agent-thread/Android.bp b/test/931-agent-thread/Android.bp
index 7bf802e..c8a0dae 100644
--- a/test/931-agent-thread/Android.bp
+++ b/test/931-agent-thread/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `931-agent-thread`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-931-agent-thread",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-931-agent-thread-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-931-agent-thread-expected",
+    out: ["art-run-test-931-agent-thread-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/932-transform-saves/Android.bp b/test/932-transform-saves/Android.bp
index 9ecaf19..365d635 100644
--- a/test/932-transform-saves/Android.bp
+++ b/test/932-transform-saves/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `932-transform-saves`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-932-transform-saves",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-932-transform-saves-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-932-transform-saves-expected",
+    out: ["art-run-test-932-transform-saves-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/933-misc-events/Android.bp b/test/933-misc-events/Android.bp
index 5f27c09..902c7c7 100644
--- a/test/933-misc-events/Android.bp
+++ b/test/933-misc-events/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `933-misc-events`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-933-misc-events",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-933-misc-events-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-933-misc-events-expected",
+    out: ["art-run-test-933-misc-events-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/937-hello-retransform-package/Android.bp b/test/937-hello-retransform-package/Android.bp
index 7cfcd49..909675d 100644
--- a/test/937-hello-retransform-package/Android.bp
+++ b/test/937-hello-retransform-package/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `937-hello-retransform-package`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-937-hello-retransform-package",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-937-hello-retransform-package-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-937-hello-retransform-package-expected",
+    out: ["art-run-test-937-hello-retransform-package-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/939-hello-transformation-bcp/Android.bp b/test/939-hello-transformation-bcp/Android.bp
index 6d5d8cc..eb4f007 100644
--- a/test/939-hello-transformation-bcp/Android.bp
+++ b/test/939-hello-transformation-bcp/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `939-hello-transformation-bcp`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-939-hello-transformation-bcp",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-939-hello-transformation-bcp-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-939-hello-transformation-bcp-expected",
+    out: ["art-run-test-939-hello-transformation-bcp-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/940-recursive-obsolete/Android.bp b/test/940-recursive-obsolete/Android.bp
index 600a489..40bd26f 100644
--- a/test/940-recursive-obsolete/Android.bp
+++ b/test/940-recursive-obsolete/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `940-recursive-obsolete`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-940-recursive-obsolete",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-940-recursive-obsolete-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-940-recursive-obsolete-expected",
+    out: ["art-run-test-940-recursive-obsolete-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/941-recursive-obsolete-jit/Android.bp b/test/941-recursive-obsolete-jit/Android.bp
index 3881b3d..e02d430 100644
--- a/test/941-recursive-obsolete-jit/Android.bp
+++ b/test/941-recursive-obsolete-jit/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `941-recursive-obsolete-jit`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-941-recursive-obsolete-jit",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-941-recursive-obsolete-jit-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-941-recursive-obsolete-jit-expected",
+    out: ["art-run-test-941-recursive-obsolete-jit-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/942-private-recursive/Android.bp b/test/942-private-recursive/Android.bp
index ee0ab53..f2705ba 100644
--- a/test/942-private-recursive/Android.bp
+++ b/test/942-private-recursive/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `942-private-recursive`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-942-private-recursive",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-942-private-recursive-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-942-private-recursive-expected",
+    out: ["art-run-test-942-private-recursive-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/943-private-recursive-jit/Android.bp b/test/943-private-recursive-jit/Android.bp
index 3f0e452..38a78cf 100644
--- a/test/943-private-recursive-jit/Android.bp
+++ b/test/943-private-recursive-jit/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `943-private-recursive-jit`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-943-private-recursive-jit",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-943-private-recursive-jit-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-943-private-recursive-jit-expected",
+    out: ["art-run-test-943-private-recursive-jit-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/944-transform-classloaders/Android.bp b/test/944-transform-classloaders/Android.bp
index 9ce2604..24e184e 100644
--- a/test/944-transform-classloaders/Android.bp
+++ b/test/944-transform-classloaders/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `944-transform-classloaders`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-944-transform-classloaders",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-944-transform-classloaders-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-944-transform-classloaders-expected",
+    out: ["art-run-test-944-transform-classloaders-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/945-obsolete-native/Android.bp b/test/945-obsolete-native/Android.bp
index c180c08..b98fabb 100644
--- a/test/945-obsolete-native/Android.bp
+++ b/test/945-obsolete-native/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `945-obsolete-native`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-945-obsolete-native",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-945-obsolete-native-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-945-obsolete-native-expected",
+    out: ["art-run-test-945-obsolete-native-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/946-obsolete-throw/Android.bp b/test/946-obsolete-throw/Android.bp
index 93bca92..865d11c 100644
--- a/test/946-obsolete-throw/Android.bp
+++ b/test/946-obsolete-throw/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `946-obsolete-throw`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-946-obsolete-throw",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-946-obsolete-throw-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-946-obsolete-throw-expected",
+    out: ["art-run-test-946-obsolete-throw-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/947-reflect-method/Android.bp b/test/947-reflect-method/Android.bp
index 5670be8..44bf5ae 100644
--- a/test/947-reflect-method/Android.bp
+++ b/test/947-reflect-method/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `947-reflect-method`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-947-reflect-method",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-947-reflect-method-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-947-reflect-method-expected",
+    out: ["art-run-test-947-reflect-method-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/949-in-memory-transform/Android.bp b/test/949-in-memory-transform/Android.bp
index 3f6c176..0c702dc 100644
--- a/test/949-in-memory-transform/Android.bp
+++ b/test/949-in-memory-transform/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `949-in-memory-transform`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-949-in-memory-transform",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-949-in-memory-transform-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-949-in-memory-transform-expected",
+    out: ["art-run-test-949-in-memory-transform-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/950-redefine-intrinsic/Android.bp b/test/950-redefine-intrinsic/Android.bp
index a8b7466..4d4795d 100644
--- a/test/950-redefine-intrinsic/Android.bp
+++ b/test/950-redefine-intrinsic/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `950-redefine-intrinsic`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-950-redefine-intrinsic",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-950-redefine-intrinsic-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-950-redefine-intrinsic-expected",
+    out: ["art-run-test-950-redefine-intrinsic-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/951-threaded-obsolete/Android.bp b/test/951-threaded-obsolete/Android.bp
index 8bd965b..0e86560 100644
--- a/test/951-threaded-obsolete/Android.bp
+++ b/test/951-threaded-obsolete/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `951-threaded-obsolete`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-951-threaded-obsolete",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-951-threaded-obsolete-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-951-threaded-obsolete-expected",
+    out: ["art-run-test-951-threaded-obsolete-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/963-default-range-smali/Android.bp b/test/963-default-range-smali/Android.bp
index ed457aa..73eb0fd 100644
--- a/test/963-default-range-smali/Android.bp
+++ b/test/963-default-range-smali/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `963-default-range-smali`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-963-default-range-smali",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-963-default-range-smali-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-963-default-range-smali-expected",
+    out: ["art-run-test-963-default-range-smali-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/982-ok-no-retransform/Android.bp b/test/982-ok-no-retransform/Android.bp
index fa942a1..ac3dfa5 100644
--- a/test/982-ok-no-retransform/Android.bp
+++ b/test/982-ok-no-retransform/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `982-ok-no-retransform`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-982-ok-no-retransform",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-982-ok-no-retransform-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-982-ok-no-retransform-expected",
+    out: ["art-run-test-982-ok-no-retransform-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/983-source-transform-verify/Android.bp b/test/983-source-transform-verify/Android.bp
index c281697..22b7437 100644
--- a/test/983-source-transform-verify/Android.bp
+++ b/test/983-source-transform-verify/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `983-source-transform-verify`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-983-source-transform-verify",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-983-source-transform-verify-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-983-source-transform-verify-expected",
+    out: ["art-run-test-983-source-transform-verify-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/984-obsolete-invoke/Android.bp b/test/984-obsolete-invoke/Android.bp
index 85ef5da..2f9ef10 100644
--- a/test/984-obsolete-invoke/Android.bp
+++ b/test/984-obsolete-invoke/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `984-obsolete-invoke`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-984-obsolete-invoke",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-984-obsolete-invoke-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-984-obsolete-invoke-expected",
+    out: ["art-run-test-984-obsolete-invoke-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/985-re-obsolete/Android.bp b/test/985-re-obsolete/Android.bp
index a5fda12..9c5380c 100644
--- a/test/985-re-obsolete/Android.bp
+++ b/test/985-re-obsolete/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `985-re-obsolete`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-985-re-obsolete",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-985-re-obsolete-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-985-re-obsolete-expected",
+    out: ["art-run-test-985-re-obsolete-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/986-native-method-bind/Android.bp b/test/986-native-method-bind/Android.bp
index 2913df5..1779dd1 100644
--- a/test/986-native-method-bind/Android.bp
+++ b/test/986-native-method-bind/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `986-native-method-bind`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-986-native-method-bind",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-986-native-method-bind-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-986-native-method-bind-expected",
+    out: ["art-run-test-986-native-method-bind-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/987-agent-bind/Android.bp b/test/987-agent-bind/Android.bp
index 0dadd41..59ce39c 100644
--- a/test/987-agent-bind/Android.bp
+++ b/test/987-agent-bind/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `987-agent-bind`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-987-agent-bind",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-987-agent-bind-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-987-agent-bind-expected",
+    out: ["art-run-test-987-agent-bind-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/988-method-trace/Android.bp b/test/988-method-trace/Android.bp
index f5ba14d..e7368f9 100644
--- a/test/988-method-trace/Android.bp
+++ b/test/988-method-trace/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `988-method-trace`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-988-method-trace",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-988-method-trace-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-988-method-trace-expected",
+    out: ["art-run-test-988-method-trace-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/989-method-trace-throw/Android.bp b/test/989-method-trace-throw/Android.bp
index 6964ec6..78ee8d2 100644
--- a/test/989-method-trace-throw/Android.bp
+++ b/test/989-method-trace-throw/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `989-method-trace-throw`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-989-method-trace-throw",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-989-method-trace-throw-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-989-method-trace-throw-expected",
+    out: ["art-run-test-989-method-trace-throw-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/990-field-trace/Android.bp b/test/990-field-trace/Android.bp
index f92ab20..ac1d9a1 100644
--- a/test/990-field-trace/Android.bp
+++ b/test/990-field-trace/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `990-field-trace`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-990-field-trace",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-990-field-trace-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-990-field-trace-expected",
+    out: ["art-run-test-990-field-trace-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/991-field-trace-2/Android.bp b/test/991-field-trace-2/Android.bp
index 8532925..80c8440 100644
--- a/test/991-field-trace-2/Android.bp
+++ b/test/991-field-trace-2/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `991-field-trace-2`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-991-field-trace-2",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-991-field-trace-2-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-991-field-trace-2-expected",
+    out: ["art-run-test-991-field-trace-2-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/992-source-data/Android.bp b/test/992-source-data/Android.bp
index 509c037..2eca496 100644
--- a/test/992-source-data/Android.bp
+++ b/test/992-source-data/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `992-source-data`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-992-source-data",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-992-source-data-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-992-source-data-expected",
+    out: ["art-run-test-992-source-data-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/993-breakpoints/Android.bp b/test/993-breakpoints/Android.bp
index bf2ec45..067c39b 100644
--- a/test/993-breakpoints/Android.bp
+++ b/test/993-breakpoints/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `993-breakpoints`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-993-breakpoints",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-993-breakpoints-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-993-breakpoints-expected",
+    out: ["art-run-test-993-breakpoints-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/994-breakpoint-line/Android.bp b/test/994-breakpoint-line/Android.bp
index 9cd5018..2accb70 100644
--- a/test/994-breakpoint-line/Android.bp
+++ b/test/994-breakpoint-line/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `994-breakpoint-line`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-994-breakpoint-line",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-994-breakpoint-line-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-994-breakpoint-line-expected",
+    out: ["art-run-test-994-breakpoint-line-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/995-breakpoints-throw/Android.bp b/test/995-breakpoints-throw/Android.bp
index 1fa5b53..5c710c2 100644
--- a/test/995-breakpoints-throw/Android.bp
+++ b/test/995-breakpoints-throw/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `995-breakpoints-throw`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-995-breakpoints-throw",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-995-breakpoints-throw-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-995-breakpoints-throw-expected",
+    out: ["art-run-test-995-breakpoints-throw-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/996-breakpoint-obsolete/Android.bp b/test/996-breakpoint-obsolete/Android.bp
index d1e6305..cba293a 100644
--- a/test/996-breakpoint-obsolete/Android.bp
+++ b/test/996-breakpoint-obsolete/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `996-breakpoint-obsolete`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-996-breakpoint-obsolete",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-996-breakpoint-obsolete-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-996-breakpoint-obsolete-expected",
+    out: ["art-run-test-996-breakpoint-obsolete-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/997-single-step/Android.bp b/test/997-single-step/Android.bp
index 2268d70..c4e3a42 100644
--- a/test/997-single-step/Android.bp
+++ b/test/997-single-step/Android.bp
@@ -1,6 +1,19 @@
 // Generated by `regen-test-files`. Do not edit manually.
+
+// Build rules for ART run-test `997-single-step`.
+
+// Test's Dex code.
 java_test {
     name: "art-run-test-997-single-step",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":art-run-test-997-single-step-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "art-run-test-997-single-step-expected",
+    out: ["art-run-test-997-single-step-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/Android.bp b/test/Android.bp
index 79c3cb8..8b84884 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -212,7 +212,6 @@
         javacflags: ["-XepDisableAllChecks"],
     },
 
-    data: ["expected.txt"],
     test_config_template: ":art-run-test-template",
     test_suites: ["general-tests"],
 }
diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files
index aa5cbe9..de290b9 100755
--- a/test/utils/regen-test-files
+++ b/test/utils/regen-test-files
@@ -305,10 +305,23 @@
   run_test_name="art-run-test-$run_test"
   cat >"$bp_file" <<EOF
 // Generated by \`$me\`. Do not edit manually.
+
+// Build rules for ART run-test \`$run_test\`.
+
+// Test's Dex code.
 java_test {
     name: "$run_test_name",
     defaults: ["art-run-test-defaults"],
     srcs: ["src/**/*.java"],
+    data: [":$run_test_name-expected"],
+}
+
+// Test's expected output.
+genrule {
+    name: "$run_test_name-expected",
+    out: ["$run_test_name-expected.txt"],
+    srcs: ["expected.txt"],
+    cmd: "cp -f \$(in) \$(out)",
 }
 EOF
   # Record test name.