Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Deduplicate test expectation data in a different way" into udc-dev am: 15988e77e6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23824651

Change-Id: Ie7f930d649457ab8acdc38f95ff785c1a26a2814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-29 17:59:16 +00:00
committed by Automerger Merge Worker
parent 4a0622154e 15988e77e6
commit 97796ab990
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/BinaryTransparencyHostTest/src/android/transparency/test/BinaryTransparencyHostTest.java
View File

@@ -61,8 +61,11 @@ public final class BinaryTransparencyHostTest extends BaseHostJUnit4Test {
options.setTestMethodName("testCollectAllApexInfo"); options.setTestMethodName("testCollectAllApexInfo");
// Collect APEX package names from /apex, then pass them as expectation to be verified. // Collect APEX package names from /apex, then pass them as expectation to be verified.
// The package names are collected from the find name with deduplication (NB: we used to
// deduplicate by dropping directory names with '@', but there's a DCLA case where it only
// has one directory with '@'. So we have to keep it and deduplicate the current way).
CommandResult result = getDevice().executeShellV2Command( CommandResult result = getDevice().executeShellV2Command(
"ls -d /apex/*/ |grep -v @ |grep -v /apex/sharedlibs |cut -d/ -f3"); "ls -d /apex/*/ |grep -v /apex/sharedlibs |cut -d/ -f3 |cut -d@ -f1 |sort |uniq");
assertTrue(result.getStatus() == CommandStatus.SUCCESS); assertTrue(result.getStatus() == CommandStatus.SUCCESS);
String[] packageNames = result.getStdout().split("\n"); String[] packageNames = result.getStdout().split("\n");
for (var i = 0; i < packageNames.length; i++) { for (var i = 0; i < packageNames.length; i++) {