rcutorture: Make kvm-test-1-run-qemu.sh check for alternative output
authorPaul E. McKenney <paulmck@kernel.org>
Mon, 29 Aug 2022 23:21:19 +0000 (16:21 -0700)
committerPaul E. McKenney <paulmck@kernel.org>
Tue, 18 Oct 2022 22:02:59 +0000 (15:02 -0700)
The kvm-again.sh script, when running locally, can place the QEMU output
into kvm-test-1-run-qemu.sh.out instead of kvm-test-1-run.sh.out.  This
commit therefore makes kvm-test-1-run-qemu.sh check both locations.

Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
tools/testing/selftests/rcutorture/bin/kvm-test-1-run-qemu.sh

index 9da86e6..76f24cd 100755 (executable)
@@ -108,7 +108,7 @@ do
                if test $kruntime -lt $seconds
                then
                        echo Completed in $kruntime vs. $seconds >> $resdir/Warnings 2>&1
-                       grep "^(qemu) qemu:" $resdir/kvm-test-1-run.sh.out >> $resdir/Warnings 2>&1
+                       grep "^(qemu) qemu:" $resdir/kvm-test-1-run*.sh.out >> $resdir/Warnings 2>&1
                        killpid="`sed -n "s/^(qemu) qemu: terminating on signal [0-9]* from pid \([0-9]*\).*$/\1/p" $resdir/Warnings`"
                        if test -n "$killpid"
                        then