The following commit has been merged into the core/rcu branch of tip:

Commit-ID:     61251d6899803594a108c3165aeb072c73e09cc8
Gitweb:        
https://git.kernel.org/tip/61251d6899803594a108c3165aeb072c73e09cc8
Author:        Paul E. McKenney <[email protected]>
AuthorDate:    Sun, 26 Apr 2020 16:48:46 -07:00
Committer:     Paul E. McKenney <[email protected]>
CommitterDate: Mon, 29 Jun 2020 12:01:44 -07:00

torture: Set configfile variable to current scenario

The torture-test recheck logic fails to set the configfile variable to
the current scenario, so this commit properly initializes this variable.
This change isn't critical given that all errors for a given scenario
follow that scenario's heading, but it is easier on the eyes to repeat it.
And this repetition also prevents confusion as to whether a given message
goes with the previous heading or the next one.

Signed-off-by: Paul E. McKenney <[email protected]>
---
 tools/testing/selftests/rcutorture/bin/kvm-recheck.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh 
b/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh
index 736f047..2261aa6 100755
--- a/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh
@@ -31,6 +31,7 @@ do
                        head -1 $resdir/log
                fi
                TORTURE_SUITE="`cat $i/../TORTURE_SUITE`"
+               configfile=`echo $i | sed -e 's,^.*/,,'`
                rm -f $i/console.log.*.diags
                kvm-recheck-${TORTURE_SUITE}.sh $i
                if test -f "$i/qemu-retval" && test "`cat $i/qemu-retval`" -ne 
0 && test "`cat $i/qemu-retval`" -ne 137

Reply via email to