generic/15[78]: fix error messages in the golden output

Fix the error messages in the golden output for generic/15[78], which
examine the responses to invalid inputs as returned by the
clone/clone_range/extent_same ioctls.  Also fix a filtering omission.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/tests/generic/157 b/tests/generic/157
index 2fe06d1c4d59acd2b26a42d8a0daa6ffee534021..67f3ea5fec40b1afc85bc9e77a0ecccdc5359033 100755 (executable)
--- a/tests/generic/157
+++ b/tests/generic/157
@@ -75,10 +75,18 @@ mkdir "$TESTDIR1/dir1"
 seq 1 $((2 * BLKSZ / 250)) | while read f; do
        touch "$TESTDIR1/dir1/$f"
 done
 seq 1 $((2 * BLKSZ / 250)) | while read f; do
        touch "$TESTDIR1/dir1/$f"
 done

-mknod "$TESTDIR1/dev1" b 8 0
+mknod "$TESTDIR1/dev1" c 1 3

 mkfifo "$TESTDIR1/fifo1"
 sync
 
 mkfifo "$TESTDIR1/fifo1"
 sync
 

+_filter_enotty() {
+       sed -e 's/Inappropriate ioctl for device/Invalid argument/g'
+}
+
+_filter_einval() {
+       sed -e 's/Invalid argument/Bad file descriptor/g'
+}
+

 echo "Try cross-device reflink"
 _reflink_range "$TESTDIR1/file1" 0 "$TESTDIR2/file1" 0 $BLKSZ
 
 echo "Try cross-device reflink"
 _reflink_range "$TESTDIR1/file1" 0 "$TESTDIR2/file1" 0 $BLKSZ
 


@@ -98,16 +106,16 @@ echo "Try to reflink a device"
 _reflink_range "$TESTDIR1/dev1" 0 "$TESTDIR1/file2" 0 $BLKSZ
 
 echo "Try to reflink to a dir"
 _reflink_range "$TESTDIR1/dev1" 0 "$TESTDIR1/file2" 0 $BLKSZ
 
 echo "Try to reflink to a dir"

-_reflink_range "$TESTDIR1/file1" 0 "$TESTDIR1/dir1" 0 $BLKSZ
+_reflink_range "$TESTDIR1/file1" 0 "$TESTDIR1/dir1" 0 $BLKSZ 2>&1 | _filter_test_dir

 
 echo "Try to reflink to a device"
 
 echo "Try to reflink to a device"

-_reflink_range "$TESTDIR1/file1" 0 "$TESTDIR1/dev1" 0 $BLKSZ
+_reflink_range "$TESTDIR1/file1" 0 "$TESTDIR1/dev1" 0 $BLKSZ 2>&1 | _filter_enotty

 
 echo "Try to reflink to a fifo"
 
 echo "Try to reflink to a fifo"

-_reflink_range "$TESTDIR1/file1" 0 "$TESTDIR1/fifo1" 0 $BLKSZ -n
+_reflink_range "$TESTDIR1/file1" 0 "$TESTDIR1/fifo1" 0 $BLKSZ -n 2>&1 | _filter_enotty

 
 echo "Try to reflink an append-only file"
 
 echo "Try to reflink an append-only file"

-_reflink_range "$TESTDIR1/file1" 0 "$TESTDIR1/file3" 0 $BLKSZ -a
+_reflink_range "$TESTDIR1/file1" 0 "$TESTDIR1/file3" 0 $BLKSZ -a 2>&1 | _filter_einval

 
 echo "Reflink two files"
 _reflink_range "$TESTDIR1/file1" 0 "$TESTDIR1/file2" 0 $BLKSZ >> "$seqres.full"
 
 echo "Reflink two files"
 _reflink_range "$TESTDIR1/file1" 0 "$TESTDIR1/file2" 0 $BLKSZ >> "$seqres.full"

diff --git a/tests/generic/157.out b/tests/generic/157.out
index 177e7f8dff786b875db73bdaf5461caad6ac8558..ac3c4406cab1b5b10c63de17568f8a166d0ecbcf 100644 (file)
--- a/tests/generic/157.out
+++ b/tests/generic/157.out
@@ -14,11 +14,11 @@ XFS_IOC_CLONE_RANGE: Is a directory
 Try to reflink a device
 XFS_IOC_CLONE_RANGE: Invalid argument
 Try to reflink to a dir
 Try to reflink a device
 XFS_IOC_CLONE_RANGE: Invalid argument
 Try to reflink to a dir

-/mnt/test-157/dir1: Is a directory
+TEST_DIR/test-157/dir1: Is a directory

 Try to reflink to a device
 Try to reflink to a device

-XFS_IOC_CLONE_RANGE: Operation not supported
+XFS_IOC_CLONE_RANGE: Invalid argument

 Try to reflink to a fifo
 Try to reflink to a fifo

-XFS_IOC_CLONE_RANGE: Operation not supported
+XFS_IOC_CLONE_RANGE: Invalid argument

 Try to reflink an append-only file
 XFS_IOC_CLONE_RANGE: Bad file descriptor
 Reflink two files
 Try to reflink an append-only file
 XFS_IOC_CLONE_RANGE: Bad file descriptor
 Reflink two files

diff --git a/tests/generic/158 b/tests/generic/158
index 91cc041b8a4f6933f68f9d1e0f199b9ec34bfaa1..18bda382ef1f36ab60741ecbc186104caecac148 100755 (executable)
--- a/tests/generic/158
+++ b/tests/generic/158
@@ -76,10 +76,18 @@ mkdir "$TESTDIR1/dir1"
 seq 1 $((2 * BLKSZ / 250)) | while read f; do
        touch "$TESTDIR1/dir1/$f"
 done
 seq 1 $((2 * BLKSZ / 250)) | while read f; do
        touch "$TESTDIR1/dir1/$f"
 done

-mknod "$TESTDIR1/dev1" b 8 0
+mknod "$TESTDIR1/dev1" c 1 3

 mkfifo "$TESTDIR1/fifo1"
 sync
 
 mkfifo "$TESTDIR1/fifo1"
 sync
 

+_filter_enotty() {
+       sed -e 's/Inappropriate ioctl for device/Invalid argument/g'
+}
+
+_filter_eperm() {
+       sed -e 's/Permission denied/Invalid argument/g'
+}
+

 echo "Try cross-device dedupe"
 _dedupe_range "$TESTDIR1/file1" 0 "$TESTDIR2/file1" 0 $BLKSZ
 
 echo "Try cross-device dedupe"
 _dedupe_range "$TESTDIR1/file1" 0 "$TESTDIR2/file1" 0 $BLKSZ
 


@@ -96,16 +104,16 @@ echo "Try to dedupe a dir"
 _dedupe_range "$TESTDIR1/dir1" 0 "$TESTDIR1/file2" 0 $BLKSZ
 
 echo "Try to dedupe a device"
 _dedupe_range "$TESTDIR1/dir1" 0 "$TESTDIR1/file2" 0 $BLKSZ
 
 echo "Try to dedupe a device"

-_dedupe_range "$TESTDIR1/dev1" 0 "$TESTDIR1/file2" 0 $BLKSZ
+_dedupe_range "$TESTDIR1/dev1" 0 "$TESTDIR1/file2" 0 $BLKSZ 2>&1 | _filter_enotty

 
 echo "Try to dedupe to a dir"
 
 echo "Try to dedupe to a dir"

-_dedupe_range "$TESTDIR1/file1" 0 "$TESTDIR1/dir1" 0 $BLKSZ
+_dedupe_range "$TESTDIR1/file1" 0 "$TESTDIR1/dir1" 0 $BLKSZ 2>&1 | _filter_test_dir

 
 echo "Try to dedupe to a device"
 
 echo "Try to dedupe to a device"

-_dedupe_range "$TESTDIR1/file1" 0 "$TESTDIR1/dev1" 0 $BLKSZ
+_dedupe_range "$TESTDIR1/file1" 0 "$TESTDIR1/dev1" 0 $BLKSZ 2>&1 | _filter_eperm

 
 echo "Try to dedupe to a fifo"
 
 echo "Try to dedupe to a fifo"

-_dedupe_range "$TESTDIR1/file1" 0 "$TESTDIR1/fifo1" 0 $BLKSZ -n
+_dedupe_range "$TESTDIR1/file1" 0 "$TESTDIR1/fifo1" 0 $BLKSZ -n 2>&1 | _filter_eperm

 
 echo "Try to dedupe an append-only file"
 _dedupe_range "$TESTDIR1/file1" 0 "$TESTDIR1/file3" 0 $BLKSZ -a >> "$seqres.full"
 
 echo "Try to dedupe an append-only file"
 _dedupe_range "$TESTDIR1/file1" 0 "$TESTDIR1/file3" 0 $BLKSZ -a >> "$seqres.full"

diff --git a/tests/generic/158.out b/tests/generic/158.out
index 36a3f1f78f3b22e13c4012cc6d1f333913e2bc6c..dff369256ee17c9899c0f38b1d8bb66f037d3789 100644 (file)
--- a/tests/generic/158.out
+++ b/tests/generic/158.out
@@ -12,13 +12,13 @@ dedupe: Invalid argument
 Try to dedupe a dir
 XFS_IOC_FILE_EXTENT_SAME: Is a directory
 Try to dedupe a device
 Try to dedupe a dir
 XFS_IOC_FILE_EXTENT_SAME: Is a directory
 Try to dedupe a device

-XFS_IOC_FILE_EXTENT_SAME: Permission denied
+XFS_IOC_FILE_EXTENT_SAME: Invalid argument

 Try to dedupe to a dir
 Try to dedupe to a dir

-/mnt/test-158/dir1: Is a directory
+TEST_DIR/test-158/dir1: Is a directory

 Try to dedupe to a device
 Try to dedupe to a device

-dedupe: Permission denied
+dedupe: Invalid argument

 Try to dedupe to a fifo
 Try to dedupe to a fifo

-dedupe: Permission denied
+dedupe: Invalid argument

 Try to dedupe an append-only file
 Dedupe two files
 Check scratch fs
 Try to dedupe an append-only file
 Dedupe two files
 Check scratch fs