[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [PATCH v2] automation: restore CR filtering
On Wed, 20 Aug 2024, Stefano Stabellini wrote: > After commit c36efb7fcea6 ("automation: use expect to run QEMU") we lost > the \r filtering introduced by b576497e3b7d ("automation: remove CR > characters from serial output"). This patch reintroduced it. > > Fixes: c36efb7fcea6 ("automation: use expect to run QEMU") > Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxx> > --- > Changes in v2: > - fix the sed expression to account for multiple \r > - ensure Xen logs are visible too I forgot to add: https://gitlab.com/xen-project/people/sstabellini/xen/-/pipelines/1421979833 > --- > automation/scripts/qemu-alpine-x86_64.sh | 2 +- > automation/scripts/qemu-smoke-dom0-arm32.sh | 2 +- > automation/scripts/qemu-smoke-dom0-arm64.sh | 2 +- > automation/scripts/qemu-smoke-dom0less-arm32.sh | 2 +- > automation/scripts/qemu-smoke-dom0less-arm64.sh | 2 +- > automation/scripts/qemu-smoke-ppc64le.sh | 2 +- > automation/scripts/qemu-smoke-riscv64.sh | 2 +- > automation/scripts/qemu-smoke-x86-64.sh | 2 +- > automation/scripts/qemu-xtf-dom0less-arm64.sh | 2 +- > 9 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/automation/scripts/qemu-alpine-x86_64.sh > b/automation/scripts/qemu-alpine-x86_64.sh > index 5359e0820b..42a89e86b0 100755 > --- a/automation/scripts/qemu-alpine-x86_64.sh > +++ b/automation/scripts/qemu-alpine-x86_64.sh > @@ -89,4 +89,4 @@ export QEMU_LOG="smoke.serial" > export LOG_MSG="Domain-0" > export PASSED="BusyBox" > > -./automation/scripts/qemu-key.exp > +./automation/scripts/qemu-key.exp | sed 's/\r\+$//' > diff --git a/automation/scripts/qemu-smoke-dom0-arm32.sh > b/automation/scripts/qemu-smoke-dom0-arm32.sh > index bbdcb39f1a..fd64b19358 100755 > --- a/automation/scripts/qemu-smoke-dom0-arm32.sh > +++ b/automation/scripts/qemu-smoke-dom0-arm32.sh > @@ -96,4 +96,4 @@ export QEMU_LOG="${serial_log}" > export LOG_MSG="Domain-0" > export PASSED="/ #" > > -../automation/scripts/qemu-key.exp > +../automation/scripts/qemu-key.exp | sed 's/\r\+$//' > diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh > b/automation/scripts/qemu-smoke-dom0-arm64.sh > index 0094bfc8e1..e0cea742b0 100755 > --- a/automation/scripts/qemu-smoke-dom0-arm64.sh > +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh > @@ -109,4 +109,4 @@ export QEMU_LOG="smoke.serial" > export LOG_MSG="Domain-0" > export PASSED="BusyBox" > > -./automation/scripts/qemu-key.exp > +./automation/scripts/qemu-key.exp | sed 's/\r\+$//' > diff --git a/automation/scripts/qemu-smoke-dom0less-arm32.sh > b/automation/scripts/qemu-smoke-dom0less-arm32.sh > index 68ffbabdb8..e824cb7c2a 100755 > --- a/automation/scripts/qemu-smoke-dom0less-arm32.sh > +++ b/automation/scripts/qemu-smoke-dom0less-arm32.sh > @@ -149,4 +149,4 @@ export QEMU_LOG="${serial_log}" > export LOG_MSG="${dom0_prompt}" > export PASSED="${passed}" > > -../automation/scripts/qemu-key.exp > +../automation/scripts/qemu-key.exp | sed 's/\r\+$//' > diff --git a/automation/scripts/qemu-smoke-dom0less-arm64.sh > b/automation/scripts/qemu-smoke-dom0less-arm64.sh > index eb25c4af4b..f42ba5d196 100755 > --- a/automation/scripts/qemu-smoke-dom0less-arm64.sh > +++ b/automation/scripts/qemu-smoke-dom0less-arm64.sh > @@ -220,4 +220,4 @@ export QEMU_LOG="smoke.serial" > export LOG_MSG="Welcome to Alpine Linux" > export PASSED="${passed}" > > -./automation/scripts/qemu-key.exp > +./automation/scripts/qemu-key.exp | sed 's/\r\+$//' > diff --git a/automation/scripts/qemu-smoke-ppc64le.sh > b/automation/scripts/qemu-smoke-ppc64le.sh > index ccb4a576f4..594f92c19c 100755 > --- a/automation/scripts/qemu-smoke-ppc64le.sh > +++ b/automation/scripts/qemu-smoke-ppc64le.sh > @@ -25,4 +25,4 @@ export QEMU_CMD="qemu-system-ppc64 \ > export QEMU_LOG="${serial_log}" > export PASSED="Hello, ppc64le!" > > -./automation/scripts/qemu-key.exp > +./automation/scripts/qemu-key.exp | sed 's/\r\+$//' > diff --git a/automation/scripts/qemu-smoke-riscv64.sh > b/automation/scripts/qemu-smoke-riscv64.sh > index 0355c075b7..c2595f657f 100755 > --- a/automation/scripts/qemu-smoke-riscv64.sh > +++ b/automation/scripts/qemu-smoke-riscv64.sh > @@ -16,4 +16,4 @@ export QEMU_CMD="qemu-system-riscv64 \ > export QEMU_LOG="smoke.serial" > export PASSED="All set up" > > -./automation/scripts/qemu-key.exp > +./automation/scripts/qemu-key.exp | sed 's/\r\+$//' > diff --git a/automation/scripts/qemu-smoke-x86-64.sh > b/automation/scripts/qemu-smoke-x86-64.sh > index 37ac10e068..3440b1761d 100755 > --- a/automation/scripts/qemu-smoke-x86-64.sh > +++ b/automation/scripts/qemu-smoke-x86-64.sh > @@ -24,4 +24,4 @@ export QEMU_CMD="qemu-system-x86_64 -nographic -kernel > binaries/xen \ > export QEMU_LOG="smoke.serial" > export PASSED="Test result: SUCCESS" > > -./automation/scripts/qemu-key.exp > +./automation/scripts/qemu-key.exp | sed 's/\r\+$//' > diff --git a/automation/scripts/qemu-xtf-dom0less-arm64.sh > b/automation/scripts/qemu-xtf-dom0less-arm64.sh > index 0666f6363e..4042fe5060 100755 > --- a/automation/scripts/qemu-xtf-dom0less-arm64.sh > +++ b/automation/scripts/qemu-xtf-dom0less-arm64.sh > @@ -65,4 +65,4 @@ export UBOOT_CMD="virtio scan; dhcp; tftpb 0x40000000 > boot.scr; source 0x4000000 > export QEMU_LOG="smoke.serial" > export PASSED="${passed}" > > -./automation/scripts/qemu-key.exp > +./automation/scripts/qemu-key.exp | sed 's/\r\+$//' > -- > 2.25.1 >
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |