run-test: Rename eng-prod archive file

Make the archive filename less verbose

Also follow eng-prod convention of including '#' in test name.

Test: locall run (with further local changes)
Change-Id: I815db825f59fa6418f1d4459ab14ee118977544c

3 files changed, 33 insertions, 28 deletions

diff --git a/test/Android.run-test.bp b/test/Android.run-test.bp
index f119ec75b4..24b8612c05 100644
--- a/test/Android.run-test.bp
+++ b/test/Android.run-test.bp
@@ -2675,8 +2675,8 @@ genrule_defaults {
 }
 
 java_genrule {
-    name: "art-run-test-host-data-merged-tmp",
-    out: ["art-run-test-host-data-merged.tgz"],
+    name: "art-test-host-tmp",
+    out: ["art-test-host.tgz"],
     srcs: [
         ":art-run-test-host-data-shard00-tmp",
         ":art-run-test-host-data-shard01-tmp",
@@ -2787,14 +2787,14 @@ java_genrule {
 // This filegroup is so that the host prebuilt etc can depend on a device genrule,
 // as prebuilt_etc doesn't have the equivalent of device_common_srcs.
 filegroup {
-    name: "art-run-test-host-data-merged-fg",
-    device_common_srcs: [":art-run-test-host-data-merged-tmp"],
+    name: "art-test-host-fg",
+    device_common_srcs: [":art-test-host-tmp"],
 }
 
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
-    name: "art-run-test-host-data-merged",
-    src: ":art-run-test-host-data-merged-fg",
+    name: "art-test-host",
+    src: ":art-test-host-fg",
     required: [
         "art-run-test-host-data-shard00",
         "art-run-test-host-data-shard01",
@@ -2899,7 +2899,7 @@ prebuilt_etc_host {
         "art-run-test-host-data-shardHiddenApi",
     ],
     sub_dir: "art",
-    filename: "art-run-test-host-data-merged.tgz",
+    filename: "art-test-host.tgz",
 }
 
 // Phony target used to build all shards
@@ -5795,8 +5795,8 @@ genrule_defaults {
 }
 
 java_genrule {
-    name: "art-run-test-target-data-merged-tmp",
-    out: ["art-run-test-target-data-merged.tgz"],
+    name: "art-test-target-tmp",
+    out: ["art-test-target.tgz"],
     srcs: [
         ":art-run-test-target-data-shard00-tmp",
         ":art-run-test-target-data-shard01-tmp",
@@ -5907,14 +5907,14 @@ java_genrule {
 // This filegroup is so that the host prebuilt etc can depend on a device genrule,
 // as prebuilt_etc doesn't have the equivalent of device_common_srcs.
 filegroup {
-    name: "art-run-test-target-data-merged-fg",
-    device_common_srcs: [":art-run-test-target-data-merged-tmp"],
+    name: "art-test-target-fg",
+    device_common_srcs: [":art-test-target-tmp"],
 }
 
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
-    name: "art-run-test-target-data-merged",
-    src: ":art-run-test-target-data-merged-fg",
+    name: "art-test-target",
+    src: ":art-test-target-fg",
     required: [
         "art-run-test-target-data-shard00",
         "art-run-test-target-data-shard01",
@@ -6019,7 +6019,7 @@ prebuilt_etc_host {
         "art-run-test-target-data-shardHiddenApi",
     ],
     sub_dir: "art",
-    filename: "art-run-test-target-data-merged.tgz",
+    filename: "art-test-target.tgz",
 }
 
 // Phony target used to build all shards
@@ -8915,8 +8915,8 @@ genrule_defaults {
 }
 
 java_genrule {
-    name: "art-run-test-jvm-data-merged-tmp",
-    out: ["art-run-test-jvm-data-merged.tgz"],
+    name: "art-test-jvm-tmp",
+    out: ["art-test-jvm.tgz"],
     srcs: [
         ":art-run-test-jvm-data-shard00-tmp",
         ":art-run-test-jvm-data-shard01-tmp",
@@ -9027,14 +9027,14 @@ java_genrule {
 // This filegroup is so that the host prebuilt etc can depend on a device genrule,
 // as prebuilt_etc doesn't have the equivalent of device_common_srcs.
 filegroup {
-    name: "art-run-test-jvm-data-merged-fg",
-    device_common_srcs: [":art-run-test-jvm-data-merged-tmp"],
+    name: "art-test-jvm-fg",
+    device_common_srcs: [":art-test-jvm-tmp"],
 }
 
 // Install in the output directory to make it accessible for tests.
 prebuilt_etc_host {
-    name: "art-run-test-jvm-data-merged",
-    src: ":art-run-test-jvm-data-merged-fg",
+    name: "art-test-jvm",
+    src: ":art-test-jvm-fg",
     required: [
         "art-run-test-jvm-data-shard00",
         "art-run-test-jvm-data-shard01",
@@ -9139,7 +9139,7 @@ prebuilt_etc_host {
         "art-run-test-jvm-data-shardHiddenApi",
     ],
     sub_dir: "art",
-    filename: "art-run-test-jvm-data-merged.tgz",
+    filename: "art-test-jvm.tgz",
 }
 
 // Phony target used to build all shards
diff --git a/test/Android.run-test.bp.py b/test/Android.run-test.bp.py
index e208672b11..aec0b8eb46 100755
--- a/test/Android.run-test.bp.py
+++ b/test/Android.run-test.bp.py
@@ -147,7 +147,7 @@ def main():
         }}
         """))
 
-      name = "art-run-test-{mode}-data-merged".format(mode=mode)
+      name = "art-test-{mode}".format(mode=mode)
       srcs = ("\n"+" "*16).join('":{}-tmp",'.format(n) for n in names)
       deps = ("\n"+" "*16).join('"{}",'.format(n) for n in names)
       f.write(textwrap.dedent(f"""
diff --git a/test/run_test_build.py b/test/run_test_build.py
index a93950f02f..5569ffbcae 100755
--- a/test/run_test_build.py
+++ b/test/run_test_build.py
@@ -571,19 +571,24 @@ def create_ci_runner_scripts(out, mode, test_names):
   ]
   run([python, script] + args + test_names, env=envs, check=True)
   tests = {
-    "setup": {
-      "adb push": [[str(setup.relative_to(out)), "/data/local/tmp/art/setup.sh"]],
-      "adb shell": [["sh", "/data/local/tmp/art/setup.sh"]],
+    "setup#compile-boot-image": {
+      "adb push": [
+        [str(setup.relative_to(out)), "/data/local/tmp/art/setup.sh"]
+      ],
+      "adb shell": [
+        ["rm", "-rf", "/data/local/tmp/art/test"],
+        ["sh", "/data/local/tmp/art/setup.sh"],
+      ],
     },
   }
   for runner in Path(out).glob("*/*.sh"):
     test_name = runner.parent.name
     test_hash = runner.stem
     target_dir = f"/data/local/tmp/art/test/{test_hash}"
-    tests[f"{test_name}-{test_hash}"] = {
-      "dependencies": ["setup"],
+    tests[f"{test_name}#{test_hash}"] = {
+      "dependencies": ["setup#compile-boot-image"],
       "adb push": [
-        [f"../{mode}/{test_name}/", f"{target_dir}/"],
+        [f"../{mode}/{test_name}", f"{target_dir}"],
         [str(runner.relative_to(out)), f"{target_dir}/run.sh"]
       ],
       "adb shell": [["sh", f"{target_dir}/run.sh"]],