diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2018-04-19 11:57:36 -0400 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2018-05-15 13:32:13 -0400 |
commit | 413e5512bcb464633fbb1b56b665ff063f4e3cc9 (patch) | |
tree | 25efd80d7c28c1e7a00c546a2bd79d078ee87701 /tools | |
parent | 034777d7f5c6bc5326184ffa63b7a840ef0e9759 (diff) |
rcutorture: Print end-of-test state in kvm.sh summary
This commit adds the end-of-test test, if present in the console output,
to the kvm.sh test summary that is printed by kvm-recheck.sh. Note that
this only applies to rcutorture console output.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Tested-by: Nicholas Piggin <npiggin@gmail.com>
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh b/tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh index c2e1bb6d0cba..166aed550bc9 100755 --- a/tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh | |||
@@ -34,9 +34,13 @@ fi | |||
34 | 34 | ||
35 | configfile=`echo $i | sed -e 's/^.*\///'` | 35 | configfile=`echo $i | sed -e 's/^.*\///'` |
36 | ngps=`grep ver: $i/console.log 2> /dev/null | tail -1 | sed -e 's/^.* ver: //' -e 's/ .*$//'` | 36 | ngps=`grep ver: $i/console.log 2> /dev/null | tail -1 | sed -e 's/^.* ver: //' -e 's/ .*$//'` |
37 | stopstate="`grep 'End-test grace-period state: g' $i/console.log 2> /dev/null | | ||
38 | tail -1 | sed -e 's/^\[[ 0-9.]*] //' | | ||
39 | awk '{ print \"[\" $1 \" \" $5 \" \" $6 \" \" $7 \"]\"; }' | | ||
40 | tr -d '\012\015'`" | ||
37 | if test -z "$ngps" | 41 | if test -z "$ngps" |
38 | then | 42 | then |
39 | echo "$configfile -------" | 43 | echo "$configfile ------- " $stopstate |
40 | else | 44 | else |
41 | title="$configfile ------- $ngps grace periods" | 45 | title="$configfile ------- $ngps grace periods" |
42 | dur=`sed -e 's/^.* rcutorture.shutdown_secs=//' -e 's/ .*$//' < $i/qemu-cmd 2> /dev/null` | 46 | dur=`sed -e 's/^.* rcutorture.shutdown_secs=//' -e 's/ .*$//' < $i/qemu-cmd 2> /dev/null` |
@@ -48,7 +52,7 @@ else | |||
48 | BEGIN { print ngps / dur }' < /dev/null` | 52 | BEGIN { print ngps / dur }' < /dev/null` |
49 | title="$title ($ngpsps per second)" | 53 | title="$title ($ngpsps per second)" |
50 | fi | 54 | fi |
51 | echo $title | 55 | echo $title $stopstate |
52 | nclosecalls=`grep --binary-files=text 'torture: Reader Batch' $i/console.log | tail -1 | awk '{for (i=NF-8;i<=NF;i++) sum+=$i; } END {print sum}'` | 56 | nclosecalls=`grep --binary-files=text 'torture: Reader Batch' $i/console.log | tail -1 | awk '{for (i=NF-8;i<=NF;i++) sum+=$i; } END {print sum}'` |
53 | if test -z "$nclosecalls" | 57 | if test -z "$nclosecalls" |
54 | then | 58 | then |