MicrodroidHostTests: Enable earlycon if debuggable
Pass --enable-earlycon to 'vm run-app' when using "full" debug, which
should result in the early logs from Microdroid being logged to the UART
before the virtio-console is configured. This is useful when tests such
testMicrodroidBoots fail before the PCI/VirtIO buses have even been set
up by Linux.
Add the corresponding cmdline args to the golden DT, to ensure that
MicrodroidHostTests#microdroid*DeviceTreeCompat keep passing.
Test: m MicrodroidHostTestCases
Change-Id: I57a2718a855dcbc5e06afd64d4fded380ae6608f
diff --git a/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java b/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
index 1873c2c..e8673ce 100644
--- a/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
+++ b/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
@@ -101,7 +101,7 @@
private static final String INSTANCE_IMG = TEST_ROOT + "instance.img";
private static final String INSTANCE_ID_FILE = TEST_ROOT + "instance_id";
- private static final String DEBUG_LEVEL_FULL = "full";
+ private static final String DEBUG_LEVEL_FULL = "full --enable-earlycon";
private static final String DEBUG_LEVEL_NONE = "none";
private static final int MIN_MEM_ARM64 = 170;
diff --git a/tests/hostside/java/com/android/microdroid/test/goldens/dt_dump_golden.dts b/tests/hostside/java/com/android/microdroid/test/goldens/dt_dump_golden.dts
index 095eb54..de9f7c5 100644
--- a/tests/hostside/java/com/android/microdroid/test/goldens/dt_dump_golden.dts
+++ b/tests/hostside/java/com/android/microdroid/test/goldens/dt_dump_golden.dts
@@ -49,7 +49,7 @@
};
chosen {
- bootargs = "panic=-1 crashkernel=17M";
+ bootargs = "panic=-1 crashkernel=17M earlycon=uart8250,mmio,0x3f8 keep_bootcon";
kaslr-seed = <>;
linux,initrd-end = <0x81200360>;
linux,initrd-start = <0x81000000>;
diff --git a/tests/hostside/java/com/android/microdroid/test/goldens/dt_dump_protected_golden.dts b/tests/hostside/java/com/android/microdroid/test/goldens/dt_dump_protected_golden.dts
index f2ebdf9..f09e4ff 100644
--- a/tests/hostside/java/com/android/microdroid/test/goldens/dt_dump_protected_golden.dts
+++ b/tests/hostside/java/com/android/microdroid/test/goldens/dt_dump_protected_golden.dts
@@ -49,7 +49,7 @@
};
chosen {
- bootargs = "panic=-1 crashkernel=31M";
+ bootargs = "panic=-1 crashkernel=31M earlycon=uart8250,mmio,0x3f8 keep_bootcon";
kaslr-seed = <>;
linux,initrd-end = <0x81202104>;
linux,initrd-start = <0x81000000>;