summaryrefslogtreecommitdiffhomepage
path: root/src/tests
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2017-10-16 04:28:51 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2017-10-17 19:26:07 +0200
commit5d68dca1095c5ebad33e8dd3535768cf28889cae (patch)
treef1493f064f0e7775d45b82296685380603c2723b /src/tests
parent7ae27756c45413e4aaf3997e4acfb96adfb25358 (diff)
qemu: put hvc directive into configuration
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/qemu/Makefile3
-rw-r--r--src/tests/qemu/kernel.config2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/tests/qemu/Makefile b/src/tests/qemu/Makefile
index 59784ae..130ae6d 100644
--- a/src/tests/qemu/Makefile
+++ b/src/tests/qemu/Makefile
@@ -86,8 +86,7 @@ qemu: $(KERNEL_BZIMAGE)
-device virtserialport,chardev=status \
-no-reboot \
-monitor none \
- -kernel $< \
- -append "console=hvc0"
+ -kernel $<
grep -Fq success $(BUILD_PATH)/result
$(BUILD_PATH)/init-cpio-spec.txt:
diff --git a/src/tests/qemu/kernel.config b/src/tests/qemu/kernel.config
index 6de2fbe..7b0b1e3 100644
--- a/src/tests/qemu/kernel.config
+++ b/src/tests/qemu/kernel.config
@@ -83,5 +83,7 @@ CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
CONFIG_PANIC_TIMEOUT=-1
CONFIG_STACKTRACE=y
CONFIG_EARLY_PRINTK=y
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="console=hvc0"
CONFIG_WIREGUARD=y
CONFIG_WIREGUARD_DEBUG=y