btrfs/029: filter mkfs and cp output

I noticed while testing a different mkfs option that btrfs/029 was
failing because it was getting the extra output from our mkfs.btrfs.
After I fixed that I was still failing because my version of cp will
spit out the source and destination files, not just the destination
file.  So redirect _scratch_mkfs to /dev/null like everybody does
and make the golden output just expect to see "cp failed" instead of
the cp specific output.  Thanks,

Signed-off-by: Josef Bacik <jbacik@fb.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Josef Bacik
2014-02-03 10:06:41 +11:00
committed by Dave Chinner
parent 20641b8749
commit 78d86b996c
2 changed files with 5 additions and 5 deletions
+2 -2
View File
@@ -4,12 +4,12 @@ reflink=auto:
42d69d1a6d333a7ebdf64792a555e392 TEST_DIR/test-029/original
42d69d1a6d333a7ebdf64792a555e392 SCRATCH_MNT/test-029/copy
reflink=always:
cp: failed to clone 'SCRATCH_MNT/test-029/copyfail': Invalid cross-device link
cp reflink failed
SCRATCH_MNT/test-029/copyfail
test reflinks across different mountpoints of same device
reflink=auto:
42d69d1a6d333a7ebdf64792a555e392 TEST_DIR/test-029/original
42d69d1a6d333a7ebdf64792a555e392 SCRATCH_MNT/test-bis-029/copy
reflink=always:
cp: failed to clone 'SCRATCH_MNT/test-bis-029/copyfail': Invalid cross-device link
cp reflink failed
SCRATCH_MNT/test-bis-029/copyfail