commit 21474550bc37ccb8524dc49c702b1f735376f5eb
author Rhed Jao <rhedjao@google.com> Fri Jan 29 01:03:22 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 29 01:03:22 2021 +0000
tree d94b5498d5d93265df08d3879e8e974d07bc0eea
parent c282248fd7c6d1e8a4fa2f4a91e52186aee52082
parent 1742c1bb8abe1f8c5d1dcb4f8e0c53174e06ff46

Merge "Fixes presubmit test flaky in dumpstate"

cmds/dumpstate/tests/dumpstate_smoke_test.cpp

diff --git a/cmds/dumpstate/tests/dumpstate_smoke_test.cpp b/cmds/dumpstate/tests/dumpstate_smoke_test.cpp
index 0e366cb..c62d302 100644
--- a/cmds/dumpstate/tests/dumpstate_smoke_test.cpp
+++ b/cmds/dumpstate/tests/dumpstate_smoke_test.cpp
@@ -310,8 +310,12 @@
     // FS/proc/*/mountinfo size > 0
     FileExists("FS/proc/1/mountinfo", 0U, 100000U);
 
-    // FS/data/misc/profiles/cur/0/*/primary.prof size > 0
-    FileExists("FS/data/misc/profiles/cur/0/com.android.phone/primary.prof", 0U, 100000U);
+    // FS/data/misc/profiles/cur/0/*/primary.prof should exist. Also, since dumpstate only adds
+    // profiles to the zip in the non-user build, a build checking is necessary here.
+    if (!PropertiesHelper::IsUserBuild()) {
+        ZipEntry entry;
+        GetEntry(handle, "FS/data/misc/profiles/cur/0/com.android.phone/primary.prof", &entry);
+    }
 }
 
 /**