diff options
| author | zhi <zhizhounq@google.com> | 2023-08-03 02:25:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-08-03 02:25:27 +0000 |
| commit | b797c8a33841bbf5f0588888900f32dc320e3c68 (patch) | |
| tree | 5683fd83665d9f974a7d237354ba826368f9af0d | |
| parent | f0a49a0de6ad0666087dac6d3bf582a4b87fdc43 (diff) | |
| parent | af3cbdc5744fdd0c1a663c7206eef4d6453cbfab (diff) | |
| download | suite_harness-b797c8a33841bbf5f0588888900f32dc320e3c68.tar.gz | |
Change the name of the deqp binary to `deqp-binary32` in IncrementalDeqpPreparer. am: af3cbdc574
Original change: https://android-review.googlesource.com/c/platform/test/suite_harness/+/2689266
Change-Id: I2840cf40064cce4800c03c5e2b99efe74deca751
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2 files changed, 2 insertions, 2 deletions
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/IncrementalDeqpPreparer.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/IncrementalDeqpPreparer.java index 04f33626..ccb33a77 100644 --- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/IncrementalDeqpPreparer.java +++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/IncrementalDeqpPreparer.java @@ -105,7 +105,7 @@ public class IncrementalDeqpPreparer extends BaseTargetPreparer { private static final String DEPENDENCY_BASE_BUILD_HASH_ATTRIBUTE = "base_build_hash"; private static final String DEPENDENCY_CURRENT_BUILD_HASH_ATTRIBUTE = "current_build_hash"; private static final String NULL_BUILD_HASH = "0"; - private static final String DEQP_BINARY_FILE_NAME_32 = "deqp-binary"; + private static final String DEQP_BINARY_FILE_NAME_32 = "deqp-binary32"; private static final String DEPENDENCY_DETAIL_MISSING_IN_CURRENT = "MISSING_IN_CURRENT_BUILD"; private static final String DEPENDENCY_DETAIL_MISSING_IN_BASE = "MISSING_IN_BASE_BUILD"; diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/targetprep/IncrementalDeqpPreparerTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/targetprep/IncrementalDeqpPreparerTest.java index 437ab20c..82abbaf6 100644 --- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/targetprep/IncrementalDeqpPreparerTest.java +++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/targetprep/IncrementalDeqpPreparerTest.java @@ -160,7 +160,7 @@ public class IncrementalDeqpPreparerTest { @Test public void testGetBinaryFileName() { - assertEquals(mPreparer.getBinaryFileName("vk-32"), "deqp-binary"); + assertEquals(mPreparer.getBinaryFileName("vk-32"), "deqp-binary32"); assertEquals(mPreparer.getBinaryFileName("vk-64"), "deqp-binary64"); } |