automation: restore CR filtering

After commit c36efb7fce ("automation: use expect to run QEMU") we lost
the \r filtering introduced by b576497e3b ("automation: remove CR
characters from serial output"). This patch reintroduced it.

Fixes: c36efb7fce ("automation: use expect to run QEMU")
Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com>
Reviewed-by: Michal Orzel <michal.orzel@amd.com>
This commit is contained in:
Stefano Stabellini committed 2024-08-22 13:07:39 -07:00
1 parent 394c9d8885
commit aa80a04df4
9 files changed
+9 -9

No files matched your search

+1 -1
View File
@@ -89,4 +89,4 @@ export QEMU_LOG="smoke.serial"
export LOG_MSG="Domain-0" export LOG_MSG="Domain-0"
export PASSED="BusyBox" export PASSED="BusyBox"
./automation/scripts/qemu-key.exp ./automation/scripts/qemu-key.exp | sed 's/\r\+$//'
+1 -1
View File
@@ -96,4 +96,4 @@ export QEMU_LOG="${serial_log}"
export LOG_MSG="Domain-0" export LOG_MSG="Domain-0"
export PASSED="/ #" export PASSED="/ #"
../automation/scripts/qemu-key.exp ../automation/scripts/qemu-key.exp | sed 's/\r\+$//'
+1 -1
View File
@@ -109,4 +109,4 @@ export QEMU_LOG="smoke.serial"
export LOG_MSG="Domain-0" export LOG_MSG="Domain-0"
export PASSED="BusyBox" export PASSED="BusyBox"
./automation/scripts/qemu-key.exp ./automation/scripts/qemu-key.exp | sed 's/\r\+$//'
@@ -149,4 +149,4 @@ export QEMU_LOG="${serial_log}"
export LOG_MSG="${dom0_prompt}" export LOG_MSG="${dom0_prompt}"
export PASSED="${passed}" export PASSED="${passed}"
../automation/scripts/qemu-key.exp ../automation/scripts/qemu-key.exp | sed 's/\r\+$//'
@@ -220,4 +220,4 @@ export QEMU_LOG="smoke.serial"
export LOG_MSG="Welcome to Alpine Linux" export LOG_MSG="Welcome to Alpine Linux"
export PASSED="${passed}" export PASSED="${passed}"
./automation/scripts/qemu-key.exp ./automation/scripts/qemu-key.exp | sed 's/\r\+$//'
+1 -1
View File
@@ -25,4 +25,4 @@ export QEMU_CMD="qemu-system-ppc64 \
export QEMU_LOG="${serial_log}" export QEMU_LOG="${serial_log}"
export PASSED="Hello, ppc64le!" export PASSED="Hello, ppc64le!"
./automation/scripts/qemu-key.exp ./automation/scripts/qemu-key.exp | sed 's/\r\+$//'
+1 -1
View File
@@ -16,4 +16,4 @@ export QEMU_CMD="qemu-system-riscv64 \
export QEMU_LOG="smoke.serial" export QEMU_LOG="smoke.serial"
export PASSED="All set up" export PASSED="All set up"
./automation/scripts/qemu-key.exp ./automation/scripts/qemu-key.exp | sed 's/\r\+$//'
+1 -1
View File
@@ -24,4 +24,4 @@ export QEMU_CMD="qemu-system-x86_64 -nographic -kernel binaries/xen \
export QEMU_LOG="smoke.serial" export QEMU_LOG="smoke.serial"
export PASSED="Test result: SUCCESS" export PASSED="Test result: SUCCESS"
./automation/scripts/qemu-key.exp ./automation/scripts/qemu-key.exp | sed 's/\r\+$//'
@@ -65,4 +65,4 @@ export UBOOT_CMD="virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x4000000
export QEMU_LOG="smoke.serial" export QEMU_LOG="smoke.serial"
export PASSED="${passed}" export PASSED="${passed}"
./automation/scripts/qemu-key.exp ./automation/scripts/qemu-key.exp | sed 's/\r\+$//'
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.