Skip to content

Commit b91d03c

Browse files
committed
Meta: Don't pass ^C through the serial console on CI
`-serial mon:stdio` passes through all kinds of key combinations, `-serial stdio` doesn't. This probably isn't something that we want while running tests or CI, so switch to the non-passing variant. aarch64 actually failed to run due to this, since it already had `-serial stdio` in its arguments, causing a conflict. This is why that entry is now gone entirely.
1 parent fff1645 commit b91d03c

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

Documentation/RunningTests.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ SystemModes=self-test
106106
```
107107

108108
`/dev/ttyS0` is used as stdio because that serial port is connected when qemu is run with `-display none` and
109-
`-serial mon:stdio`, and output to it will show up in the stdout of the qemu window. Separately, the CI run script redirects
109+
`-serial stdio`, and output to it will show up in the stdout of the qemu window. Separately, the CI run script redirects
110110
the serial debug output to `./debug.log` so that both stdout of the tests and the dbgln from the kernel/tests can be
111111
captured.
112112

Meta/run.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,6 @@ elif [ "$SERENITY_RUN" = "ci" ]; then
523523
-M raspi3b \
524524
-d guest_errors \
525525
-no-reboot \
526-
-serial mon:stdio \
527526
-monitor none \
528527
-display none \
529528
-serial file:debug.log \
@@ -541,7 +540,7 @@ elif [ "$SERENITY_RUN" = "ci" ]; then
541540
-no-reboot \
542541
-smp ${SERENITY_CPUS} \
543542
-device ich9-ahci \
544-
-serial mon:stdio \
543+
-serial stdio \
545544
-display none \
546545
-debugcon file:debug.log \
547546
$SERENITY_KERNEL_AND_INITRD \

0 commit comments

Comments
 (0)