generic: honor the FSSTRESS_AVOID environment variable

Make sure all tests which run fsstress, and which do not have a very
specific custom profile of which file system operations to run, honor
the FSSTRESS_AVOID environment variable.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>

diff --git a/tests/generic/051 b/tests/generic/051
index b0c37824ac7feb7927c8fc08305b50f8bcdeceff..7b807b9f9d09263f05dd652e806e37b79e8fe0cb 100755 (executable)
--- a/tests/generic/051
+++ b/tests/generic/051
@@ -63,7 +63,7 @@ PROCS=$((2 * LOAD_FACTOR))
 load_dir=$SCRATCH_MNT/test
 
 # let this run for a while
-$FSSTRESS_PROG -n10000000 -p $PROCS -d $load_dir >> $seqres.full 2>&1 &
+$FSSTRESS_PROG $FSSTRESS_AVOID -n10000000 -p $PROCS -d $load_dir >> $seqres.full 2>&1 &
 sleep $SLEEP_TIME
 $KILLALL_PROG -q $FSSTRESS_PROG
 wait

diff --git a/tests/generic/232 b/tests/generic/232
index 6b197791880fb858a3768e2f0611f103e041e772..f4853f72faa7dcbcb1f4c177ab927ff805f7efe4 100755 (executable)
--- a/tests/generic/232
+++ b/tests/generic/232
@@ -53,7 +53,7 @@ _fsstress()
 
        out=$SCRATCH_MNT/fsstress.$$
        count=2000
-       args=`_scale_fsstress_args -d $out -n $count -p 7`
+       args=`_scale_fsstress_args -d $out -n $count -p 7 $FSSTRESS_AVOID`
 
        echo "fsstress $args" >> $seqres.full
        if ! $FSSTRESS_PROG $args | tee -a $seqres.full | _filter_num

diff --git a/tests/generic/388 b/tests/generic/388
index 9d4ba9d6ce0470399a49fb52031ee353f6e9ff32..3729aa5b2f524d04511b113163dbab129cc89f3d 100755 (executable)
--- a/tests/generic/388
+++ b/tests/generic/388
@@ -65,7 +65,7 @@ _scratch_mkfs >> $seqres.full 2>&1
 _scratch_mount || _fail "mount failed"
 
 for i in $(seq 1 50); do
-       ($FSSTRESS_PROG -d $SCRATCH_MNT -n 999999 -p 4 >> $seqres.full &) \
+       ($FSSTRESS_PROG $FSSTRESS_AVOID -d $SCRATCH_MNT -n 999999 -p 4 >> $seqres.full &) \
                > /dev/null 2>&1
 
        # purposely include 0 second sleeps to test shutdown immediately after