commit b109ef0400fb55d036b5e363f983fb923a70d351
author Alice Wang <aliceywang@google.com> Tue Oct 11 09:57:15 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 11 09:57:15 2022 +0000
tree 391cf05e14a091c7d7e8da808c3fdb78e87ca7b3
parent d5926d74557ac9bf2e302915d807b66b1cb6b418
parent 4d370e6b7cae70e2e49018de5d4e08a311cce8b1

Merge "[API] Use vm_payload API in microdroid benchmark tests"

tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java

diff --git a/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
index 2deeb70..c2fd295 100644
--- a/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
+++ b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
@@ -150,7 +150,7 @@
             if (!mVcpuStartedNanoTime.isPresent()) {
                 mVcpuStartedNanoTime = OptionalLong.of(System.nanoTime());
             }
-            if (log.contains("Starting kernel") && !mKernelStartedNanoTime.isPresent()) {
+            if (log.contains("Starting payload...") && !mKernelStartedNanoTime.isPresent()) {
                 mKernelStartedNanoTime = OptionalLong.of(System.nanoTime());
             }
             if (log.contains("Run /init as init process") && !mInitStartedNanoTime.isPresent()) {