DebugPolicyHostTests: Capture console (UART) logs
pmvfw uses the UART so capture its logs as --log only captures the
virtio-console.
Test: atest com.android.pvmfw.test.DebugPolicyHostTests
Test: adb pull /data/local/tmp/virt/console.txt
Change-Id: I0bb6bfb569da11f67a69ad7c55c74977c17f4425
diff --git a/tests/pvmfw/java/com/android/pvmfw/test/CustomPvmfwHostTestCaseBase.java b/tests/pvmfw/java/com/android/pvmfw/test/CustomPvmfwHostTestCaseBase.java
index 3116cc5..296604b 100644
--- a/tests/pvmfw/java/com/android/pvmfw/test/CustomPvmfwHostTestCaseBase.java
+++ b/tests/pvmfw/java/com/android/pvmfw/test/CustomPvmfwHostTestCaseBase.java
@@ -52,6 +52,7 @@
public static final String VM_REFERENCE_DT_PATH = "/data/local/tmp/pvmfw/reference_dt.dtb";
@NonNull public static final String MICRODROID_LOG_PATH = TEST_ROOT + "log.txt";
+ @NonNull public static final String MICRODROID_CONSOLE_PATH = TEST_ROOT + "console.txt";
public static final int BOOT_COMPLETE_TIMEOUT_MS = 30000; // 30 seconds
public static final int BOOT_FAILURE_WAIT_TIME_MS = 10000; // 10 seconds
public static final int CONSOLE_OUTPUT_WAIT_MS = 5000; // 5 seconds
diff --git a/tests/pvmfw/java/com/android/pvmfw/test/DebugPolicyHostTests.java b/tests/pvmfw/java/com/android/pvmfw/test/DebugPolicyHostTests.java
index 7efbbc7..6a28d5e 100644
--- a/tests/pvmfw/java/com/android/pvmfw/test/DebugPolicyHostTests.java
+++ b/tests/pvmfw/java/com/android/pvmfw/test/DebugPolicyHostTests.java
@@ -248,6 +248,8 @@
"run-app",
"--log",
MICRODROID_LOG_PATH,
+ "--console",
+ MICRODROID_CONSOLE_PATH,
"--protected",
getPathForPackage(PACKAGE_NAME),
TEST_ROOT + "idsig",