From: Anthony Iliopoulos Date: Wed, 10 Oct 2018 23:55:50 +0000 (+0200) Subject: common/reflink: fix error messages in _require_scratch_dedupe() X-Git-Tag: v2022.05.01~1387 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=60d700e885ffd686e8e4d641a9250450af9c9fe5;p=xfstests-dev.git common/reflink: fix error messages in _require_scratch_dedupe() In case dedupe returns an error in _require_scratch_dedupe(), report the error for the scratch rather than for the test filesystem. Signed-off-by: Anthony Iliopoulos Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- diff --git a/common/reflink b/common/reflink index e2663277..11561a76 100644 --- a/common/reflink +++ b/common/reflink @@ -145,11 +145,11 @@ _require_scratch_dedupe() $XFS_IO_PROG -f -c "pwrite -S 0x61 0 65536" "$SCRATCH_MNT/file2" > /dev/null testio="$($XFS_IO_PROG -f -c "dedupe $SCRATCH_MNT/file1 0 0 65536" "$SCRATCH_MNT/file2" 2>&1)" echo $testio | grep -q "Operation not supported" && \ - _notrun "Dedupe not supported by test filesystem type: $FSTYP" + _notrun "Dedupe not supported by scratch filesystem type: $FSTYP" echo $testio | grep -q "Inappropriate ioctl for device" && \ - _notrun "Dedupe not supported by test filesystem type: $FSTYP" + _notrun "Dedupe not supported by scratch filesystem type: $FSTYP" echo $testio | grep -q "Invalid argument" && \ - _notrun "Dedupe not supported by test filesystem type: $FSTYP" + _notrun "Dedupe not supported by scratch filesystem type: $FSTYP" _scratch_unmount }