From d5926d74557ac9bf2e302915d807b66b1cb6b418 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Cl=C3=A9ment=20Tosi?= <ptosi@google.com>
Date: Tue, 11 Oct 2022 08:16:58 +0100
Subject: [PATCH] tests: Update string for measuring pvmfw boot time

Replace the U-Boot boot message by the one we have in Rust pvmfw, to
properly measure the time spent on pvmfw during boot.

Bug: 237371962
Test: atest ComposBenchmarkApp
Change-Id: I0fcea98c7828b6e4fe313af1f9a09c0b8e9703c7
---
 .../microdroid/test/device/MicrodroidDeviceTestBase.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 2deeb704..c2fd2958 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 @@ public abstract class MicrodroidDeviceTestBase {
             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()) {