Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
tools/memory-model: Make cmplitmushist.sh note timeouts
Currently, cmplitmushist.sh treats timeouts (as in the "--timeout"
argument) as "Missing Observation line". This can be misleading because
it is quite possible that running the test longer would have produced
a verification. This commit therefore changes cmplitmushist.sh to check
for timeouts and to report them with "Timed out".
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
+22
+22
tools/memory-model/scripts/cmplitmushist.sh
+22
tools/memory-model/scripts/cmplitmushist.sh
···
12
12
mkdir $T
13
13
14
14
# comparetest oldpath newpath
15
+
timedout=0
15
16
perfect=0
16
17
obsline=0
17
18
noobsline=0
18
19
obsresult=0
19
20
badcompare=0
20
21
comparetest () {
22
+
if grep -q '^Command exited with non-zero status 124' $1 ||
23
+
grep -q '^Command exited with non-zero status 124' $2
24
+
then
25
+
if grep -q '^Command exited with non-zero status 124' $1 &&
26
+
grep -q '^Command exited with non-zero status 124' $2
27
+
then
28
+
echo Both runs timed out: $2
29
+
elif grep -q '^Command exited with non-zero status 124' $1
30
+
then
31
+
echo Old run timed out: $2
32
+
elif grep -q '^Command exited with non-zero status 124' $2
33
+
then
34
+
echo New run timed out: $2
35
+
fi
36
+
timedout=`expr "$timedout" + 1`
37
+
return 0
38
+
fi
21
39
grep -v 'maxresident)k\|minor)pagefaults\|^Time' $1 > $T/oldout
22
40
grep -v 'maxresident)k\|minor)pagefaults\|^Time' $2 > $T/newout
23
41
if cmp -s $T/oldout $T/newout && grep -q '^Observation' $1
···
95
77
if test "$obsresult" -ne 0
96
78
then
97
79
echo Matching Observation Always/Sometimes/Never result: $obsresult 1>&2
80
+
fi
81
+
if test "$timedout" -ne 0
82
+
then
83
+
echo "!!!" Timed out: $timedout 1>&2
98
84
fi
99
85
if test "$badcompare" -ne 0
100
86
then