The btrfs utils are printing a status message about TRIM'ing device on replace and this is throwing off the golden output, redirect stdout from 'device replace start' to $seqres.full so we don't get false negatives. Signed-off-by: Josef Bacik <josef@xxxxxxxxxxxxxx> --- v1->v2: - Had vim open in another pane for btrfs/223 and forgot to save, my bad. tests/btrfs/176 | 6 ++++-- tests/btrfs/223 | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/btrfs/176 b/tests/btrfs/176 index 9a833575..4cd510b6 100755 --- a/tests/btrfs/176 +++ b/tests/btrfs/176 @@ -53,10 +53,12 @@ swapon "$SCRATCH_MNT/swap" 2>&1 | _filter_scratch # Again, we know the swap file is on device 1. $BTRFS_UTIL_PROG replace start -fB "$scratch_dev1" "$scratch_dev3" "$SCRATCH_MNT" 2>&1 | grep -o "Text file busy" # Replacing device 2 should still work. -$BTRFS_UTIL_PROG replace start -fB "$scratch_dev2" "$scratch_dev3" "$SCRATCH_MNT" +$BTRFS_UTIL_PROG replace start -fB "$scratch_dev2" "$scratch_dev3" "$SCRATCH_MNT" \ + >> $seqres.full swapoff "$SCRATCH_MNT/swap" > /dev/null 2>&1 # Replacing device 1 should work again after swapoff. -$BTRFS_UTIL_PROG replace start -fB "$scratch_dev1" "$scratch_dev2" "$SCRATCH_MNT" +$BTRFS_UTIL_PROG replace start -fB "$scratch_dev1" "$scratch_dev2" "$SCRATCH_MNT" \ + >> $seqres.full _scratch_unmount _check_scratch_fs "$scratch_dev2" diff --git a/tests/btrfs/223 b/tests/btrfs/223 index af072ede..8125cdf2 100755 --- a/tests/btrfs/223 +++ b/tests/btrfs/223 @@ -33,7 +33,7 @@ _require_batched_discard $SCRATCH_MNT $XFS_IO_PROG -f -c "pwrite -S 0xab 0 10M" $SCRATCH_MNT/foo | _filter_xfs_io # Replace the first device, $dev1, with a new device. -$BTRFS_UTIL_PROG replace start -Bf $dev1 $SPARE_DEV $SCRATCH_MNT +$BTRFS_UTIL_PROG replace start -Bf $dev1 $SPARE_DEV $SCRATCH_MNT >> $seqres.full # Run fstrim, it should not trim/discard allocated extents in the new device. $FSTRIM_PROG $SCRATCH_MNT -- 2.26.3
