apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Darrick J. Wong
2015-12-21 18:08:01 +11:00
committed by Dave Chinner
parent 26aad2e053
commit 11dd9959b8
4 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/generic/157
+13 -5
View File
@@ -75,10 +75,18 @@ mkdir "$TESTDIR1/dir1"
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
_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
@@ -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/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"
_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"
_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"
_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"
tests/generic/157.out
+3 -3
View File
@@ -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
/mnt/test-157/dir1: Is a directory
TEST_DIR/test-157/dir1: Is a directory
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
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
tests/generic/158
+13 -5
View File
@@ -76,10 +76,18 @@ mkdir "$TESTDIR1/dir1"
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
_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
@@ -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/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"
_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"
_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"
_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"
tests/generic/158.out
+4 -4
View File
@@ -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
XFS_IOC_FILE_EXTENT_SAME: Permission denied
XFS_IOC_FILE_EXTENT_SAME: Invalid argument
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
dedupe: Permission denied
dedupe: Invalid argument
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