mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
xfstests: filter whitespace in 128 and 132
Seems either I have a different lsattr version, or different mount points cause differences in the golden output. Send the lsattr output through the whitespaces filter so that it works everywhere. The lsattr output /does/ change depending on mountpoints. Ick. I'd actually changed it to the long format output because line length in the short format changes every time the flags change. Signed-off-by: Christoph Hellwig <hch@lst.de> [darrick.wong@oracle.com: update changelog] Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
+1
-1
@@ -97,7 +97,7 @@ c13=$(_md5_checksum "$testdir/file3")
|
||||
c14=$(_md5_checksum "$testdir/file4")
|
||||
|
||||
echo "Defragment"
|
||||
lsattr -l "$testdir/" | _filter_scratch
|
||||
lsattr -l "$testdir/" | _filter_scratch | _filter_spaces
|
||||
xfs_fsr -v -d "$testdir/file1" >> "$seqres.full"
|
||||
xfs_fsr -v -d "$testdir/file2" >> "$seqres.full" # fsr probably breaks the link
|
||||
xfs_fsr -v -d "$testdir/file3" >> "$seqres.full" # fsr probably breaks the link
|
||||
|
||||
+4
-4
@@ -11,10 +11,10 @@ c650f1cf6c9f07b22e3e21ec7d49ded5 SCRATCH_MNT/test-128/file2
|
||||
56ed2f712c91e035adeeb26ed105a982 SCRATCH_MNT/test-128/file3
|
||||
b81534f439aac5c34ce3ed60a03eba70 SCRATCH_MNT/test-128/file4
|
||||
Defragment
|
||||
SCRATCH_MNT/test-128/file1 ---
|
||||
SCRATCH_MNT/test-128/file2 ---
|
||||
SCRATCH_MNT/test-128/file3 ---
|
||||
SCRATCH_MNT/test-128/file4 ---
|
||||
SCRATCH_MNT/test-128/file1 ---
|
||||
SCRATCH_MNT/test-128/file2 ---
|
||||
SCRATCH_MNT/test-128/file3 ---
|
||||
SCRATCH_MNT/test-128/file4 ---
|
||||
b81534f439aac5c34ce3ed60a03eba70 SCRATCH_MNT/test-128/file1
|
||||
c650f1cf6c9f07b22e3e21ec7d49ded5 SCRATCH_MNT/test-128/file2
|
||||
56ed2f712c91e035adeeb26ed105a982 SCRATCH_MNT/test-128/file3
|
||||
|
||||
+5
-5
@@ -87,32 +87,32 @@ for i in `seq 2 $nr`; do
|
||||
done
|
||||
_test_remount
|
||||
free_blocks1=$(stat -f "$testdir" -c '%f')
|
||||
lsattr -l $testdir/ | _filter_test_dir
|
||||
lsattr -l $testdir/ | _filter_test_dir | _filter_spaces
|
||||
|
||||
echo "funshare part of a file"
|
||||
"$XFS_IO_PROG" -f -c "falloc 0 $((sz / 2))" "$testdir/file2"
|
||||
_test_remount
|
||||
lsattr -l $testdir/ | _filter_test_dir
|
||||
lsattr -l $testdir/ | _filter_test_dir | _filter_spaces
|
||||
|
||||
echo "funshare some of the copies"
|
||||
"$XFS_IO_PROG" -f -c "falloc 0 $sz" "$testdir/file2"
|
||||
"$XFS_IO_PROG" -f -c "falloc 0 $sz" "$testdir/file3"
|
||||
_test_remount
|
||||
free_blocks2=$(stat -f "$testdir" -c '%f')
|
||||
lsattr -l $testdir/ | _filter_test_dir
|
||||
lsattr -l $testdir/ | _filter_test_dir | _filter_spaces
|
||||
|
||||
echo "funshare the rest of the files"
|
||||
"$XFS_IO_PROG" -f -c "falloc 0 $sz" "$testdir/file4"
|
||||
"$XFS_IO_PROG" -f -c "falloc 0 $sz" "$testdir/file1"
|
||||
_test_remount
|
||||
free_blocks3=$(stat -f "$testdir" -c '%f')
|
||||
lsattr -l $testdir/ | _filter_test_dir
|
||||
lsattr -l $testdir/ | _filter_test_dir | _filter_spaces
|
||||
|
||||
echo "Rewrite the original file"
|
||||
_pwrite_byte 0x65 0 $sz "$testdir/file1" >> "$seqres.full"
|
||||
_test_remount
|
||||
free_blocks4=$(stat -f "$testdir" -c '%f')
|
||||
lsattr -l $testdir/ | _filter_test_dir
|
||||
lsattr -l $testdir/ | _filter_test_dir | _filter_spaces
|
||||
#echo $free_blocks0 $free_blocks1 $free_blocks2 $free_blocks3 $free_blocks4
|
||||
|
||||
_within_tolerance "free blocks after reflinking" $free_blocks1 $((free_blocks0 - blks)) $margin -v
|
||||
|
||||
+20
-20
@@ -1,30 +1,30 @@
|
||||
QA output created by 132
|
||||
Create the original file blocks
|
||||
Create the reflink copies
|
||||
TEST_DIR/test-132/file1 ---
|
||||
TEST_DIR/test-132/file2 ---
|
||||
TEST_DIR/test-132/file3 ---
|
||||
TEST_DIR/test-132/file4 ---
|
||||
TEST_DIR/test-132/file1 ---
|
||||
TEST_DIR/test-132/file2 ---
|
||||
TEST_DIR/test-132/file3 ---
|
||||
TEST_DIR/test-132/file4 ---
|
||||
funshare part of a file
|
||||
TEST_DIR/test-132/file1 ---
|
||||
TEST_DIR/test-132/file2 ---
|
||||
TEST_DIR/test-132/file3 ---
|
||||
TEST_DIR/test-132/file4 ---
|
||||
TEST_DIR/test-132/file1 ---
|
||||
TEST_DIR/test-132/file2 ---
|
||||
TEST_DIR/test-132/file3 ---
|
||||
TEST_DIR/test-132/file4 ---
|
||||
funshare some of the copies
|
||||
TEST_DIR/test-132/file1 ---
|
||||
TEST_DIR/test-132/file2 No_COW
|
||||
TEST_DIR/test-132/file3 No_COW
|
||||
TEST_DIR/test-132/file4 ---
|
||||
TEST_DIR/test-132/file1 ---
|
||||
TEST_DIR/test-132/file2 No_COW
|
||||
TEST_DIR/test-132/file3 No_COW
|
||||
TEST_DIR/test-132/file4 ---
|
||||
funshare the rest of the files
|
||||
TEST_DIR/test-132/file1 No_COW
|
||||
TEST_DIR/test-132/file2 No_COW
|
||||
TEST_DIR/test-132/file3 No_COW
|
||||
TEST_DIR/test-132/file4 No_COW
|
||||
TEST_DIR/test-132/file1 No_COW
|
||||
TEST_DIR/test-132/file2 No_COW
|
||||
TEST_DIR/test-132/file3 No_COW
|
||||
TEST_DIR/test-132/file4 No_COW
|
||||
Rewrite the original file
|
||||
TEST_DIR/test-132/file1 No_COW
|
||||
TEST_DIR/test-132/file2 No_COW
|
||||
TEST_DIR/test-132/file3 No_COW
|
||||
TEST_DIR/test-132/file4 No_COW
|
||||
TEST_DIR/test-132/file1 No_COW
|
||||
TEST_DIR/test-132/file2 No_COW
|
||||
TEST_DIR/test-132/file3 No_COW
|
||||
TEST_DIR/test-132/file4 No_COW
|
||||
free blocks after reflinking is in range
|
||||
free blocks after nocow'ing some copies is in range
|
||||
free blocks after nocow'ing all copies is in range
|
||||
|
||||
Reference in New Issue
Block a user