On Wed, 29 May 2024, Andrew Cooper wrote: > Have PPC put serial to stdout like all other tests, so it shows up in the main > job log. > > Signed-off-by: Andrew Cooper <[email protected]>
Reviewed-by: Stefano Stabellini <[email protected]> > --- > CC: Roger Pau Monné <[email protected]> > CC: Stefano Stabellini <[email protected]> > CC: Michal Orzel <[email protected]> > CC: Marek Marczykowski-Górecki <[email protected]> > CC: Oleksii Kurochko <[email protected]> > --- > automation/scripts/qemu-smoke-ppc64le.sh | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/automation/scripts/qemu-smoke-ppc64le.sh > b/automation/scripts/qemu-smoke-ppc64le.sh > index 2adbdac87ef5..701d81107d18 100755 > --- a/automation/scripts/qemu-smoke-ppc64le.sh > +++ b/automation/scripts/qemu-smoke-ppc64le.sh > @@ -2,15 +2,15 @@ > > set -ex > > +serial_log="$(pwd)/smoke.serial" > + > # machine type from first arg passed directly to qemu -M > machine=$1 > > # Run the test > -rm -f smoke.serial > +rm -f ${serial_log} > set +e > > -touch smoke.serial > - > timeout -k 1 20 \ > binaries/qemu-system-ppc64 \ > -bios binaries/skiboot.lid \ > @@ -20,9 +20,10 @@ binaries/qemu-system-ppc64 \ > -vga none \ > -monitor none \ > -nographic \ > - -serial file:smoke.serial \ > - -kernel binaries/xen > + -serial stdio \ > + -kernel binaries/xen \ > + |& tee ${serial_log} | sed 's/\r//' > > set -e > -(grep -q "Hello, ppc64le!" smoke.serial) || exit 1 > +(grep -q "Hello, ppc64le!" ${serial_log}) || exit 1 > exit 0 > -- > 2.30.2 >
