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

Merge "Add retry loop for BootImageProfileTest"

Browse Source
This commit is contained in:
Mathieu Chartier
2019-11-11 23:17:48 +00:00
committed by Gerrit Code Review
parent 0c0591473b 3c7125c5b6
commit f9cb43d6eb
1 changed files with 50 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,51 +73,65 @@ public class BootImageProfileTest implements IDeviceTest {
res = mTestDevice.executeShellCommand("truncate -s 0 " + SYSTEM_SERVER_PROFILE).trim(); res = mTestDevice.executeShellCommand("truncate -s 0 " + SYSTEM_SERVER_PROFILE).trim();
assertTrue(res, res.length() == 0); assertTrue(res, res.length() == 0);
// 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) { final int numIterations = 20;
for (int i = 1; i <= numIterations; ++i) {
// Force save the profile since we truncated it. // Force save the profile since we truncated it.
if (forceSaveProfile("system_server")) { if (forceSaveProfile("system_server")) {
// Might fail if system server is not yet running. // Might fail if system server is not yet running.
String s = mTestDevice.executeShellCommand( String s = mTestDevice.executeShellCommand(
"wc -c <" + SYSTEM_SERVER_PROFILE).trim(); "wc -c <" + SYSTEM_SERVER_PROFILE).trim();
if (!"0".equals(s)) { if ("0".equals(s)) {
break; Thread.sleep(1000);
continue;
} }
} }
// In case the profile is partially saved, wait an extra second.
Thread.sleep(1000); Thread.sleep(1000);
}
// In case the profile is partially saved, wait an extra second. // Validate that the profile is non empty.
Thread.sleep(1000); res = mTestDevice.executeShellCommand("profman --dump-only --profile-file="
// Validate that the profile is non empty. + SYSTEM_SERVER_PROFILE);
res = mTestDevice.executeShellCommand("profman --dump-only --profile-file=" boolean sawFramework = false;
+ SYSTEM_SERVER_PROFILE); boolean sawServices = false;
boolean sawFramework = false; for (String line : res.split("\n")) {
boolean sawServices = false; if (line.contains("framework.jar")) {
for (String line : res.split("\n")) { sawFramework = true;
if (line.contains("framework.jar")) { } else if (line.contains("services.jar")) {
sawFramework = true; sawServices = true;
} else if (line.contains("services.jar")) { }
sawServices = true; }
if (i == numIterations) {
// Only assert for last iteration since there are race conditions where the package
// manager might not be started whewn the profile saves.
assertTrue("Did not see framework.jar in " + res, sawFramework);
assertTrue("Did not see services.jar in " + res, sawServices);
}
// Test the profile contents contain common methods for core-oj that would normally be
// AOT compiled. Also test that services.jar has PackageManagerService.<init> since the
// package manager service should always be created during boot.
res = mTestDevice.executeShellCommand(
"profman --dump-classes-and-methods --profile-file="
+ SYSTEM_SERVER_PROFILE + " --apk=/apex/com.android.art/javalib/core-oj.jar"
+ " --apk=/system/framework/services.jar");
boolean sawObjectInit = false;
boolean sawPmInit = false;
for (String line : res.split("\n")) {
if (line.contains("Ljava/lang/Object;-><init>()V")) {
sawObjectInit = true;
} else if (line.contains("Lcom/android/server/pm/PackageManagerService;-><init>")) {
sawPmInit = true;
}
}
if (i == numIterations) {
assertTrue("Did not see Object.<init> in " + res, sawObjectInit);
assertTrue("Did not see PackageManagerService.<init> in " + res, sawPmInit);
}
if (sawFramework && sawServices && sawObjectInit && sawPmInit) {
break; // Asserts passed, exit.
} }
} }
assertTrue("Did not see framework.jar in " + res, sawFramework);
assertTrue("Did not see services.jar in " + res, sawServices);
// Test the profile contents contain common methods for core-oj that would normally be AOT
// compiled.
res = mTestDevice.executeShellCommand("profman --dump-classes-and-methods --profile-file="
+ SYSTEM_SERVER_PROFILE + " --apk=/apex/com.android.art/javalib/core-oj.jar"
+ " --apk=/system/framework/services.jar");
boolean sawObjectInit = false;
boolean sawPmInit = false;
for (String line : res.split("\n")) {
if (line.contains("Ljava/lang/Object;-><init>()V")) {
sawObjectInit = true;
} else if (line.contains("Lcom/android/server/pm/PackageManagerService;-><init>")) {
sawPmInit = true;
}
}
assertTrue("Did not see Object.<init> in " + res, sawObjectInit);
assertTrue("Did not see PackageManagerService.<init> in " + res, sawPmInit);
} }
} }