Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96fb70cc authored by Mathieu Chartier's avatar Mathieu Chartier Committed by android-build-merger
Browse files

Merge "Use phenotype properties for boot image profile test" am: 90dfd6b0 

am: 06792d7c

Change-Id: Ic6cd5b600ff8b36a47489897e423b9a53ad8d611
parents e0b54ab3 06792d7c

tests/BootImageProfileTest/AndroidTest.xml

+2 −2
Original line number Diff line number Diff line
@@ -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" />

tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java

+4 −2
Original line number Diff line number Diff line
@@ -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"));

    }