summaryrefslogtreecommitdiffstats
path: root/tools/testing/selftests/rcutorture
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@kernel.org>2022-08-29 16:21:19 -0700
committerPaul E. McKenney <paulmck@kernel.org>2022-10-18 15:02:59 -0700
commitf14c20cf3c1053702efe55c4ea62da2e05fdced7 (patch)
tree7aba866a590c667721335d1a521c8a3c968074ec /tools/testing/selftests/rcutorture
parentc211ae9ce424793a24cac346ee73613965a40646 (diff)
downloadlinux-stable-f14c20cf3c1053702efe55c4ea62da2e05fdced7.tar.gz
linux-stable-f14c20cf3c1053702efe55c4ea62da2e05fdced7.tar.bz2
linux-stable-f14c20cf3c1053702efe55c4ea62da2e05fdced7.zip
rcutorture: Make kvm-test-1-run-qemu.sh check for alternative output
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>
Diffstat (limited to 'tools/testing/selftests/rcutorture')
-rwxr-xr-xtools/testing/selftests/rcutorture/bin/kvm-test-1-run-qemu.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run-qemu.sh b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run-qemu.sh
index 9da86e6cd181..76f24cd5825b 100755
--- a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run-qemu.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run-qemu.sh
@@ -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