generic/269,xfs/051: don't drop fsstress failures to stdout

Prior to commit f55e46d629, these two tests would run fsstress until it
hit a failure -- ENOSPC in the case of generic/269, and EIO in the case
of xfs/051.  These errors are expected, which was why stderr was also
redirected to /dev/null.  Commit f55e46d629 removed the stderr
redirection, which has resulted in a 100% failure rate.

Fix this regression by pushing stderr stream to $seqres.full.

Fixes: f55e46d629 ("fstests: redirect fsstress' stdout to $seqres.full instead of /dev/null")
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Zorro Lang <zlang@kernel.org>

diff --git a/tests/generic/269 b/tests/generic/269
index b852f6bf7e094d1948a9e25062cc5bad77789d03..b7cdecd94f219a33d11c8a1cfce2724fdf6b4e68 100755 (executable)
--- a/tests/generic/269
+++ b/tests/generic/269
@@ -23,7 +23,7 @@ _workout()
        out=$SCRATCH_MNT/fsstress.$$
        args=`_scale_fsstress_args -p128 -n999999999 -f setattr=1 $FSSTRESS_AVOID -d $out`
        echo "fsstress $args" >> $seqres.full
-       $FSSTRESS_PROG $args >> $seqres.full &
+       $FSSTRESS_PROG $args &>> $seqres.full &
        pid=$!
        echo "Run dd writers in parallel"
        for ((i=0; i < num_iterations; i++))

diff --git a/tests/xfs/051 b/tests/xfs/051
index 1c6709648d6a7631b60bb790e160b2c28616e366..aca867c9402f1175740fcbe84ef34fd06d2c9a53 100755 (executable)
--- a/tests/xfs/051
+++ b/tests/xfs/051
@@ -38,7 +38,7 @@ _scratch_mount
 
 # Start a workload and shutdown the fs. The subsequent mount will require log
 # recovery.
-$FSSTRESS_PROG -n 9999 -p 2 -w -d $SCRATCH_MNT >> $seqres.full &
+$FSSTRESS_PROG -n 9999 -p 2 -w -d $SCRATCH_MNT &>> $seqres.full &
 sleep 5
 _scratch_shutdown -f
 $KILLALL_PROG -q $FSSTRESS_PROG