aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrick J. Wong <djwong@kernel.org>2023-10-09 11:18:45 -0700
committerZorro Lang <zlang@kernel.org>2023-10-22 14:32:30 +0800
commitbbeaf7d1cbf2db50549cdc95b4d2099748641b1c (patch)
tree991c541182a401a874665fae3abe21a9cc45e848
parentba2905da44e7ac9f087316ea62f2ea7d8f3fbe7f (diff)
downloadxfstests-dev-bbeaf7d1cbf2db50549cdc95b4d2099748641b1c.tar.gz
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>
-rwxr-xr-xtests/generic/2692
-rwxr-xr-xtests/xfs/0512
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/generic/269 b/tests/generic/269
index b852f6bf7e..b7cdecd94f 100755
--- 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 1c6709648d..aca867c940 100755
--- 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