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

Merge "Fix waiting for system server to be running for BootImageProfileTest"

Browse Source
This commit is contained in:
Mathieu Chartier
2019-10-24 14:41:54 +00:00
committed by Gerrit Code Review
parent 72d5460dda de49e23a3b
commit 761ce2abac
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java
View File

@@ -54,11 +54,15 @@ public class BootImageProfileTest implements IDeviceTest {
assertTrue("profile system server not enabled", res != null && res.equals("true")); assertTrue("profile system server not enabled", res != null && res.equals("true"));
} }
private void forceSaveProfile(String pkg) throws Exception { private boolean forceSaveProfile(String pkg) throws Exception {
String pid = mTestDevice.executeShellCommand("pidof " + pkg).trim(); String pid = mTestDevice.executeShellCommand("pidof " + pkg).trim();
assertTrue("Invalid pid " + pid, pid.length() > 0); if (pid.length() == 0) {
// Not yet running.
return false;
}
String res = mTestDevice.executeShellCommand("kill -s SIGUSR1 " + pid).trim(); String res = mTestDevice.executeShellCommand("kill -s SIGUSR1 " + pid).trim();
assertTrue("kill SIGUSR1: " + res, res.length() == 0); assertTrue("kill SIGUSR1: " + res, res.length() == 0);
return true;
} }
@Test @Test
@@ -71,10 +75,13 @@ public class BootImageProfileTest implements IDeviceTest {
// Wait up to 20 seconds for the profile to be saved. // Wait up to 20 seconds for the profile to be saved.
for (int i = 0; i < 20; ++i) { for (int i = 0; i < 20; ++i) {
// Force save the profile since we truncated it. // Force save the profile since we truncated it.
forceSaveProfile("system_server"); if (forceSaveProfile("system_server")) {
String s = mTestDevice.executeShellCommand("wc -c <" + SYSTEM_SERVER_PROFILE).trim(); // Might fail if system server is not yet running.
if (!"0".equals(s)) { String s = mTestDevice.executeShellCommand(
break; "wc -c <" + SYSTEM_SERVER_PROFILE).trim();
if (!"0".equals(s)) {
break;
}
} }
Thread.sleep(1000); Thread.sleep(1000);
} }