From: Filipe Manana <fdmanana@xxxxxxxx>
The use of run_check() immediately stops a test because it calls the
_fail() function when execution of its argument fails. This is generally
not encouraged in fstests as it prevents a test from detecting further
problems after that failure. Since the next patch in this series updates
other tests to use _run_btrfs_balance_start() for which a failure to
run balance can be expected (btrfs/187 for example), remove the use of
run_check() from _run_btrfs_balance_start(). Existing tests that use
_run_btrfs_balance_start() now redirect standard output to the test's
.full file for debugging purposes. In case balance fails the tests will
fail due to unexpected output from the standard error.
Signed-off-by: Filipe Manana <fdmanana@xxxxxxxx>
---
common/btrfs | 2 +-
tests/btrfs/124 | 2 +-
tests/btrfs/177 | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/btrfs b/common/btrfs
index 7971c046..b43932df 100644
--- a/common/btrfs
+++ b/common/btrfs
@@ -382,7 +382,7 @@ _run_btrfs_balance_start()
$BTRFS_UTIL_PROG balance start --help | grep -q "full-balance"
(( $? == 0 )) && bal_opt="--full-balance"
- run_check $BTRFS_UTIL_PROG balance start $bal_opt $*
+ $BTRFS_UTIL_PROG balance start $bal_opt $*
}
#return the sector size of the btrfs scratch fs
diff --git a/tests/btrfs/124 b/tests/btrfs/124
index 0686a3b5..0600ae50 100755
--- a/tests/btrfs/124
+++ b/tests/btrfs/124
@@ -114,7 +114,7 @@ _run_btrfs_util_prog device scan
_scratch_mount >> $seqres.full 2>&1
_run_btrfs_util_prog filesystem show
echo >> $seqres.full
-_run_btrfs_balance_start ${SCRATCH_MNT}
+_run_btrfs_balance_start ${SCRATCH_MNT} >>$seqres.full
checkpoint2=`md5sum $SCRATCH_MNT/tf2`
echo $checkpoint2 >> $seqres.full 2>&1
diff --git a/tests/btrfs/177 b/tests/btrfs/177
index 69b9a539..ec715c21 100755
--- a/tests/btrfs/177
+++ b/tests/btrfs/177
@@ -44,7 +44,7 @@ _scratch_mount
# Create a small file and run balance so we shall deal with the chunk
# size as allocated by the kernel, mkfs allocated chunks are smaller.
dd if=/dev/zero of="$SCRATCH_MNT/fill" bs=4096 count=1 >> $seqres.full 2>&1
-_run_btrfs_balance_start "$SCRATCH_MNT"
+_run_btrfs_balance_start "$SCRATCH_MNT" >>$seqres.full
# Now fill it up.
dd if=/dev/zero of="$SCRATCH_MNT/refill" bs=4096 >> $seqres.full 2>&1
@@ -63,7 +63,7 @@ rm -f "$SCRATCH_MNT/refill"
# Get rid of empty block groups and also make sure that balance skips block
# groups containing active swap files.
-_run_btrfs_balance_start "$SCRATCH_MNT"
+_run_btrfs_balance_start "$SCRATCH_MNT" >>$seqres.full
# Try to shrink away the area occupied by the swap file, which should fail.
$BTRFS_UTIL_PROG filesystem resize 1G "$SCRATCH_MNT" 2>&1 | grep -o "Text file busy"
--
2.11.0
