RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 08:24:58 +00:00
Code Issues Activity Actions

Meta: Don't pass ^C through the serial console on CI

Browse source 
`-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.
This commit is contained in:
Tim Schumacher 2023-10-24 13:11:04 +02:00
parent fff1645c6b
commit b91d03c2b8
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Documentation/RunningTests.md
View file

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

3
Meta/run.sh
View file

@ -523,7 +523,6 @@ elif [ "$SERENITY_RUN" = "ci" ]; then
-M raspi3b \ -M raspi3b \
-d guest_errors \ -d guest_errors \
-no-reboot \ -no-reboot \
-serial mon:stdio \
-monitor none \ -monitor none \
-display none \ -display none \
-serial file:debug.log \ -serial file:debug.log \
@ -541,7 +540,7 @@ elif [ "$SERENITY_RUN" = "ci" ]; then
-no-reboot \ -no-reboot \
-smp ${SERENITY_CPUS} \ -smp ${SERENITY_CPUS} \
-device ich9-ahci \ -device ich9-ahci \
-serial mon:stdio \ -serial stdio \
-display none \ -display none \
-debugcon file:debug.log \ -debugcon file:debug.log \
$SERENITY_KERNEL_AND_INITRD \ $SERENITY_KERNEL_AND_INITRD \