From: Dave Chinner <dchinner@xxxxxxxxxx>
Whilst trying to debug test failures, I found a few places where
errors needed to be redirected to $seqres.full rather than
/dev/null. This is a collection of all the conversions that haven't
been captured by some other bug fix patch.
Note that calling _check_filesystems() after removing the
require_test/scratch files means it is a no-op, so I removed that
call at the same time as capturing unmount failures after the test
has failed.
Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
---
check | 5 ++---
tests/generic/049 | 2 +-
tests/generic/603 | 6 +++---
tests/xfs/495 | 2 +-
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/check b/check
index 9222cd7e4..8131f4e2e 100755
--- a/check
+++ b/check
@@ -1004,14 +1004,13 @@ function run_section()
if [ $sts -ne 0 ]; then
_dump_err_cont "[failed, exit status $sts]"
- _test_unmount 2> /dev/null
- _scratch_unmount 2> /dev/null
+ _test_unmount 2>> $seqres.full
+ _scratch_unmount 2>> $seqres.full
rm -f ${RESULT_DIR}/require_test*
rm -f ${RESULT_DIR}/require_scratch*
# Even though we failed, there may be something interesting in
# dmesg which can help debugging.
_check_dmesg
- (_adjust_oom_score 250; _check_filesystems)
tc_status="fail"
else
# The test apparently passed, so check for corruption
diff --git a/tests/generic/049 b/tests/generic/049
index 94b5afe96..fcfbd48ec 100755
--- a/tests/generic/049
+++ b/tests/generic/049
@@ -56,7 +56,7 @@ i=1;
while [ $i -lt 1000 ]
do
file=$SCRATCH_MNT/$i
- $XFS_IO_PROG -f -c "pwrite -b 32k -S 0xff 0 32k" $file > /dev/null
+ $XFS_IO_PROG -f -c "pwrite -b 32k -S 0xff 0 32k" $file >> $seqres.full
if [ $? -ne 0 ]
then
echo error creating/writing file $file
diff --git a/tests/generic/603 b/tests/generic/603
index a84695831..2a75cf9e0 100755
--- a/tests/generic/603
+++ b/tests/generic/603
@@ -77,7 +77,7 @@ test_grace()
_filter_xfs_io_error | tee -a $seqres.full
repquota -v -$type $SCRATCH_MNT | grep -v "^root" >>$seqres.full 2>&1
# Reset grace time here, make below grace time test more accurate
- setquota -$type $qa_user -T $bgrace $igrace $SCRATCH_MNT 2>/dev/null
+ setquota -$type $qa_user -T $bgrace $igrace $SCRATCH_MNT >>$seqres.full 2>&1
# Now sleep enough grace time and check that softlimit got enforced
sleep $((bgrace + 1))
echo "Try to write 1 one more block after grace..."
@@ -89,13 +89,13 @@ test_grace()
# And now the softlimit test for inodes
# First reset space limits so that we don't have problems with
# space reservations on XFS
- setquota -$type $qa_user 0 0 3 100 $SCRATCH_MNT
+ setquota -$type $qa_user 0 0 3 100 $SCRATCH_MNT
echo "Create 2 more files, over the inode softlimit..."
su $qa_user -c "touch $dir/file3 $dir/file4" 2>&1 >>$seqres.full | \
_filter_scratch | tee -a $seqres.full
repquota -v -$type $SCRATCH_MNT | grep -v "^root" >>$seqres.full 2>&1
# Reset grace time here, make below grace time test more accurate
- setquota -$type $qa_user -T $bgrace $igrace $SCRATCH_MNT 2>/dev/null
+ setquota -$type $qa_user -T $bgrace $igrace $SCRATCH_MNT >>$seqres.full 2>&1
# Wait and check grace time enforcement
sleep $((igrace+1))
echo "Try to create one more inode after grace..."
diff --git a/tests/xfs/495 b/tests/xfs/495
index b42e7e5b3..ce724f381 100755
--- a/tests/xfs/495
+++ b/tests/xfs/495
@@ -24,7 +24,7 @@ _require_populate_commands
_require_xfs_db_command "fuzz"
echo "Format and populate"
-_scratch_populate_cached nofill > $seqres.full 2>&1
+_scratch_populate_cached nofill >> $seqres.full 2>&1
filter_nbrepair() {
grep rebuilding | sed -e 's/directory inode [0-9]*/directory inode XXX/g'
--
2.45.2
