diff options
-rwxr-xr-x | tools/testing/selftests/rcutorture/bin/kvm-recheck.sh | 2 | ||||
-rwxr-xr-x | tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh | 2 | ||||
-rwxr-xr-x | tools/testing/selftests/rcutorture/bin/parse-torture.sh (renamed from tools/testing/selftests/rcutorture/bin/parse-rcutorture.sh) | 22 |
3 files changed, 13 insertions, 13 deletions
diff --git a/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh b/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh index a44daaa259a9..26d78b7eaccf 100755 --- a/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh | |||
@@ -41,7 +41,7 @@ do | |||
41 | kvm-recheck-${TORTURE_SUITE}.sh $i | 41 | kvm-recheck-${TORTURE_SUITE}.sh $i |
42 | configcheck.sh $i/.config $i/ConfigFragment | 42 | configcheck.sh $i/.config $i/ConfigFragment |
43 | parse-build.sh $i/Make.out $configfile | 43 | parse-build.sh $i/Make.out $configfile |
44 | parse-rcutorture.sh $i/console.log $configfile | 44 | parse-torture.sh $i/console.log $configfile |
45 | parse-console.sh $i/console.log $configfile | 45 | parse-console.sh $i/console.log $configfile |
46 | if test -r $i/Warnings | 46 | if test -r $i/Warnings |
47 | then | 47 | then |
diff --git a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh index 94b28bb37d36..e82f4f201c8c 100755 --- a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh | |||
@@ -199,5 +199,5 @@ then | |||
199 | fi | 199 | fi |
200 | 200 | ||
201 | cp $builddir/console.log $resdir | 201 | cp $builddir/console.log $resdir |
202 | parse-${TORTURE_SUITE}torture.sh $resdir/console.log $title | 202 | parse-torture.sh $resdir/console.log $title |
203 | parse-console.sh $resdir/console.log $title | 203 | parse-console.sh $resdir/console.log $title |
diff --git a/tools/testing/selftests/rcutorture/bin/parse-rcutorture.sh b/tools/testing/selftests/rcutorture/bin/parse-torture.sh index dd0a275d9796..3455560ab4e4 100755 --- a/tools/testing/selftests/rcutorture/bin/parse-rcutorture.sh +++ b/tools/testing/selftests/rcutorture/bin/parse-torture.sh | |||
@@ -1,14 +1,14 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | # | 2 | # |
3 | # Check the console output from an rcutorture run for goodness. | 3 | # Check the console output from a torture run for goodness. |
4 | # The "file" is a pathname on the local system, and "title" is | 4 | # The "file" is a pathname on the local system, and "title" is |
5 | # a text string for error-message purposes. | 5 | # a text string for error-message purposes. |
6 | # | 6 | # |
7 | # The file must contain rcutorture output, but can be interspersed | 7 | # The file must contain torture output, but can be interspersed |
8 | # with other dmesg text. | 8 | # with other dmesg text, as in console-log output. |
9 | # | 9 | # |
10 | # Usage: | 10 | # Usage: |
11 | # sh parse-rcutorture.sh file title | 11 | # sh parse-torture.sh file title |
12 | # | 12 | # |
13 | # This program is free software; you can redistribute it and/or modify | 13 | # This program is free software; you can redistribute it and/or modify |
14 | # it under the terms of the GNU General Public License as published by | 14 | # it under the terms of the GNU General Public License as published by |
@@ -28,7 +28,7 @@ | |||
28 | # | 28 | # |
29 | # Authors: Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 29 | # Authors: Paul E. McKenney <paulmck@linux.vnet.ibm.com> |
30 | 30 | ||
31 | T=/tmp/parse-rcutorture.sh.$$ | 31 | T=/tmp/parse-torture.sh.$$ |
32 | file="$1" | 32 | file="$1" |
33 | title="$2" | 33 | title="$2" |
34 | 34 | ||
@@ -36,13 +36,13 @@ trap 'rm -f $T.seq' 0 | |||
36 | 36 | ||
37 | . functions.sh | 37 | . functions.sh |
38 | 38 | ||
39 | # check for presence of rcutorture.txt file | 39 | # check for presence of torture output file. |
40 | 40 | ||
41 | if test -f "$file" -a -r "$file" | 41 | if test -f "$file" -a -r "$file" |
42 | then | 42 | then |
43 | : | 43 | : |
44 | else | 44 | else |
45 | echo $title unreadable rcutorture.txt file: $file | 45 | echo $title unreadable torture output file: $file |
46 | exit 1 | 46 | exit 1 |
47 | fi | 47 | fi |
48 | 48 | ||
@@ -76,9 +76,9 @@ BEGIN { | |||
76 | END { | 76 | END { |
77 | if (badseq) { | 77 | if (badseq) { |
78 | if (badseqno1 == badseqno2 && badseqno2 == ver) | 78 | if (badseqno1 == badseqno2 && badseqno2 == ver) |
79 | print "RCU GP HANG at " ver " rcutorture stat " badseqnr; | 79 | print "GP HANG at " ver " torture stat " badseqnr; |
80 | else | 80 | else |
81 | print "BAD SEQ " badseqno1 ":" badseqno2 " last:" ver " RCU version " badseqnr; | 81 | print "BAD SEQ " badseqno1 ":" badseqno2 " last:" ver " version " badseqnr; |
82 | } | 82 | } |
83 | }' > $T.seq | 83 | }' > $T.seq |
84 | 84 | ||
@@ -91,13 +91,13 @@ then | |||
91 | exit 2 | 91 | exit 2 |
92 | fi | 92 | fi |
93 | else | 93 | else |
94 | if grep -q RCU_HOTPLUG $file | 94 | if grep -q "_HOTPLUG:" $file |
95 | then | 95 | then |
96 | print_warning HOTPLUG FAILURES $title `cat $T.seq` | 96 | print_warning HOTPLUG FAILURES $title `cat $T.seq` |
97 | echo " " $file | 97 | echo " " $file |
98 | exit 3 | 98 | exit 3 |
99 | fi | 99 | fi |
100 | echo $title no success message, `grep --binary-files=text 'ver:' $file | wc -l` successful RCU version messages | 100 | echo $title no success message, `grep --binary-files=text 'ver:' $file | wc -l` successful version messages |
101 | if test -s $T.seq | 101 | if test -s $T.seq |
102 | then | 102 | then |
103 | print_warning $title `cat $T.seq` | 103 | print_warning $title `cat $T.seq` |