commit 0d017ee9ad973983f54a8c927456d2bd85b00d57
author Duy Truong <duytruong@google.com> Mon Jan 09 19:06:26 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jan 09 19:06:26 2023 +0000
tree 924c117ff770a56d42801df559118ad79321f606
parent 153538caf4f29bdeb8877f7ded6a97aafe898e7e
parent 62108064b67d9bce31ee89d45d4c47669cc0eefc

[RESTRICT AUTOMERGE] Add "_sts" suffix to POC file names. am: 62108064b6

Original change: https://googleplex-android-review.googlesource.com/c/platform/platform_testing/+/20873921

Change-Id: I58f9c7195de0f76f4b20f365674c2bd34a9a5f7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libraries/sts-common-util/host-side/src/com/android/sts/common/NativePoc.java

diff --git a/libraries/sts-common-util/host-side/src/com/android/sts/common/NativePoc.java b/libraries/sts-common-util/host-side/src/com/android/sts/common/NativePoc.java
index fd8e8e0..221c1f7 100644
--- a/libraries/sts-common-util/host-side/src/com/android/sts/common/NativePoc.java
+++ b/libraries/sts-common-util/host-side/src/com/android/sts/common/NativePoc.java
@@ -422,7 +422,7 @@
             pocPusher.only64();
         }
         final String remoteFile = TMP_PATH + pocName();
-        pocPusher.pushFile(pocName(), remoteFile);
+        pocPusher.pushFile(pocName() + "_sts", remoteFile);
         device.executeShellV2Command(String.format("chmod 777 '%s'", remoteFile));
         CommandUtil.runAndCheck(device, String.format("test -r '%s'", remoteFile));
         CommandUtil.runAndCheck(device, String.format("test -w '%s'", remoteFile));

libraries/sts-common-util/host-side/tests/src/com/android/sts/common/NativePocTest.java

diff --git a/libraries/sts-common-util/host-side/tests/src/com/android/sts/common/NativePocTest.java b/libraries/sts-common-util/host-side/tests/src/com/android/sts/common/NativePocTest.java
index 21b8913..9763103 100644
--- a/libraries/sts-common-util/host-side/tests/src/com/android/sts/common/NativePocTest.java
+++ b/libraries/sts-common-util/host-side/tests/src/com/android/sts/common/NativePocTest.java
@@ -95,9 +95,9 @@
         tmpDir = Files.createTempDirectory("").toFile().getAbsolutePath();
         testCasesDir = Paths.get(tmpDir, "android-sts-host-util-test", "testcases");
         Files.createDirectories(testCasesDir);
-        localPocFile32 = new File(testCasesDir.toFile(), POC_NAME + "32");
+        localPocFile32 = new File(testCasesDir.toFile(), POC_NAME + "_sts32");
         localPocFile32.createNewFile();
-        localPocFile64 = new File(testCasesDir.toFile(), POC_NAME + "64");
+        localPocFile64 = new File(testCasesDir.toFile(), POC_NAME + "_sts64");
         localPocFile64.createNewFile();
 
         buildInfo = new BuildInfo("0", "");