Skip to content

Commit 687d477

Browse files
committed
torture: Declare parse-console.sh independence from rcutorture
Currently, parse-torture.sh looks at the fifth field of torture-test console output for the version number. This works fine for rcutorture, but not for scftorture, which lacks the pointer field. This commit therefore adjusts matching lines so that the parse-console.sh awk script always sees the version number as the first field in the lines passed to it. Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
1 parent e9d338a commit 687d477

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

tools/testing/selftests/rcutorture/bin/parse-console.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,20 +67,21 @@ then
6767
grep --binary-files=text 'torture:.*ver:' $file |
6868
egrep --binary-files=text -v '\(null\)|rtc: 000000000* ' |
6969
sed -e 's/^(initramfs)[^]]*] //' -e 's/^\[[^]]*] //' |
70+
sed -e 's/^.*ver: //' |
7071
awk '
7172
BEGIN {
7273
ver = 0;
7374
badseq = 0;
7475
}
7576
7677
{
77-
if (!badseq && ($5 + 0 != $5 || $5 <= ver)) {
78+
if (!badseq && ($1 + 0 != $1 || $1 <= ver)) {
7879
badseqno1 = ver;
79-
badseqno2 = $5;
80+
badseqno2 = $1;
8081
badseqnr = NR;
8182
badseq = 1;
8283
}
83-
ver = $5
84+
ver = $1
8485
}
8586
8687
END {

0 commit comments

Comments
 (0)