Skip to content

Commit e40e239

Browse files
paulmckrcuNeeraj Upadhyay (AMD)
authored andcommitted
torture: Suppress torture.sh "Zero time" messages for disabled tests
The torture.sh script prints " --- Zero time for locktorture, disabling" when the --duration parameter is too short to allow the test to run even when locktorture has been disabled, for example, via --do-none. The same is true for scftorture and rcutorture. This commit therefore suppresses this message when the corresponding test has been disabled. Signed-off-by: Paul E. McKenney <[email protected]> Signed-off-by: Joel Fernandes <[email protected]> Signed-off-by: Neeraj Upadhyay (AMD) <[email protected]>
1 parent 86731a2 commit e40e239

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

tools/testing/selftests/rcutorture/bin/torture.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ then
274274
configs_rcutorture=CFLIST
275275
fi
276276
duration_rcutorture=$((duration_base*duration_rcutorture_frac/10))
277-
if test "$duration_rcutorture" -eq 0
277+
if test "$duration_rcutorture" -eq 0 && test "$do_locktorture" = "yes"
278278
then
279279
echo " --- Zero time for rcutorture, disabling" | tee -a $T/log
280280
do_rcutorture=no
@@ -286,7 +286,7 @@ then
286286
configs_locktorture=CFLIST
287287
fi
288288
duration_locktorture=$((duration_base*duration_locktorture_frac/10))
289-
if test "$duration_locktorture" -eq 0
289+
if test "$duration_locktorture" -eq 0 && test "$do_locktorture" = "yes"
290290
then
291291
echo " --- Zero time for locktorture, disabling" | tee -a $T/log
292292
do_locktorture=no
@@ -298,7 +298,7 @@ then
298298
configs_scftorture=CFLIST
299299
fi
300300
duration_scftorture=$((duration_base*duration_scftorture_frac/10))
301-
if test "$duration_scftorture" -eq 0
301+
if test "$duration_scftorture" -eq 0 && test "$do_scftorture" = "yes"
302302
then
303303
echo " --- Zero time for scftorture, disabling" | tee -a $T/log
304304
do_scftorture=no

0 commit comments

Comments
 (0)