Merge "Use phenotype properties for boot image profile test"

am: 90dfd6b009

Change-Id: I6044413eebc96a7bc7d10ba98a30c540011a036a
This commit is contained in:
Mathieu Chartier
2019-10-21 16:50:11 -07:00
committed by android-build-merger
2 changed files with 6 additions and 4 deletions

View File

@@ -22,8 +22,8 @@
<!-- we need this magic flag, otherwise it always reboots and breaks the selinux -->
<option name="force-skip-system-props" value="true" />
<option name="run-command" value="setprop dalvik.vm.profilesystemserver true" />
<option name="run-command" value="setprop dalvik.vm.profilebootclasspath true" />
<option name="run-command" value="device_config put runtime_native_boot profilesystemserver true" />
<option name="run-command" value="device_config put runtime_native_boot profilebootclasspath true" />
<!-- Profiling does not pick up the above changes we restart the shell -->
<option name="run-command" value="stop" />

View File

@@ -46,9 +46,11 @@ public class BootImageProfileTest implements IDeviceTest {
*/
@Test
public void testProperties() throws Exception {
String res = mTestDevice.getProperty("dalvik.vm.profilebootclasspath");
String res = mTestDevice.getProperty(
"persist.device_config.runtime_native_boot.profilebootclasspath");
assertTrue("profile boot class path not enabled", res != null && res.equals("true"));
res = mTestDevice.getProperty("dalvik.vm.profilesystemserver");
res = mTestDevice.getProperty(
"persist.device_config.runtime_native_boot.profilesystemserver");
assertTrue("profile system server not enabled", res != null && res.equals("true"));
}