summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@kernel.org>2020-06-30 13:37:22 -0700
committerPaul E. McKenney <paulmck@kernel.org>2020-08-24 18:38:31 -0700
commit687d4775db56d24c81b4704056186d6c506de30d (patch)
tree2a059b059c6ec0351312aa0b6c3b5f37b368efcf /tools
parente9d338a0b1799c988b678e8ccb66a442272e6aa3 (diff)
downloadlinux-687d4775db56d24c81b4704056186d6c506de30d.tar.gz
linux-687d4775db56d24c81b4704056186d6c506de30d.tar.bz2
linux-687d4775db56d24c81b4704056186d6c506de30d.zip
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>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/testing/selftests/rcutorture/bin/parse-console.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/testing/selftests/rcutorture/bin/parse-console.sh b/tools/testing/selftests/rcutorture/bin/parse-console.sh
index 71a9f43a3918..4e081a25761e 100755
--- a/tools/testing/selftests/rcutorture/bin/parse-console.sh
+++ b/tools/testing/selftests/rcutorture/bin/parse-console.sh
@@ -67,6 +67,7 @@ then
grep --binary-files=text 'torture:.*ver:' $file |
egrep --binary-files=text -v '\(null\)|rtc: 000000000* ' |
sed -e 's/^(initramfs)[^]]*] //' -e 's/^\[[^]]*] //' |
+ sed -e 's/^.*ver: //' |
awk '
BEGIN {
ver = 0;
@@ -74,13 +75,13 @@ then
}
{
- if (!badseq && ($5 + 0 != $5 || $5 <= ver)) {
+ if (!badseq && ($1 + 0 != $1 || $1 <= ver)) {
badseqno1 = ver;
- badseqno2 = $5;
+ badseqno2 = $1;
badseqnr = NR;
badseq = 1;
}
- ver = $5
+ ver = $1
}
END {