* [PATCH 0/3] Random fixes for generic
@ 2021-10-29 6:59 Shiyang Ruan
2021-10-29 6:59 ` [PATCH 1/3] generic/138,139,140: fix the name for check file Shiyang Ruan
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Shiyang Ruan @ 2021-10-29 6:59 UTC (permalink / raw)
To: fstests
This patchset fixes some description or typo found in generic during me
reading the testcase.
Shiyang Ruan (3):
generic/138,139,140: fix the name for check file
generic: fix description or typo in head comment
generic/201: fix the description
tests/generic/138 | 54 +++++++++++++++++++++----------------------
tests/generic/138.out | 8 +++----
tests/generic/139 | 54 +++++++++++++++++++++----------------------
tests/generic/139.out | 8 +++----
tests/generic/140 | 54 +++++++++++++++++++++----------------------
tests/generic/140.out | 8 +++----
tests/generic/155 | 3 +--
tests/generic/201 | 2 +-
tests/generic/201.out | 2 +-
tests/generic/269 | 2 +-
tests/generic/270 | 2 +-
11 files changed, 98 insertions(+), 99 deletions(-)
--
2.33.0
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/3] generic/138,139,140: fix the name for check file
2021-10-29 6:59 [PATCH 0/3] Random fixes for generic Shiyang Ruan
@ 2021-10-29 6:59 ` Shiyang Ruan
2021-10-29 15:48 ` Darrick J. Wong
2021-10-29 6:59 ` [PATCH 2/3] generic: fix description or typo in head comment Shiyang Ruan
2021-10-29 6:59 ` [PATCH 3/3] generic/201: fix the description Shiyang Ruan
2 siblings, 1 reply; 8+ messages in thread
From: Shiyang Ruan @ 2021-10-29 6:59 UTC (permalink / raw)
To: fstests
The original 'file3' is used to check if the result after operation on
file2 is correct. So, rename it to be 'file2.chk' to make it easier to
understand.
Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
---
tests/generic/138 | 54 +++++++++++++++++++++----------------------
tests/generic/138.out | 8 +++----
tests/generic/139 | 54 +++++++++++++++++++++----------------------
tests/generic/139.out | 8 +++----
tests/generic/140 | 54 +++++++++++++++++++++----------------------
tests/generic/140.out | 8 +++----
6 files changed, 93 insertions(+), 93 deletions(-)
diff --git a/tests/generic/138 b/tests/generic/138
index 1037ed3e..d061ac34 100755
--- a/tests/generic/138
+++ b/tests/generic/138
@@ -35,37 +35,37 @@ echo "Create the original files"
blksz=65536
_pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file1 >> $seqres.full
_cp_reflink $testdir/file1 $testdir/file2 >> $seqres.full
-_pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file3 >> $seqres.full
+_pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file2.chk >> $seqres.full
_test_cycle_mount
echo "Compare files"
md5sum $testdir/file1 | _filter_test_dir
md5sum $testdir/file2 | _filter_test_dir
-md5sum $testdir/file3 | _filter_test_dir
+md5sum $testdir/file2.chk | _filter_test_dir
-cmp -s $testdir/file1 $testdir/file2 || echo "Files 1-2 do not match"
-cmp -s $testdir/file1 $testdir/file3 || echo "Files 1-3 do not match"
-cmp -s $testdir/file2 $testdir/file3 || echo "Files 2-3 do not match"
+cmp -s $testdir/file1 $testdir/file2 || echo "file1 and file2 do not match"
+cmp -s $testdir/file1 $testdir/file2.chk || echo "file1 and file2.chk do not match"
+cmp -s $testdir/file2 $testdir/file2.chk || echo "file1 and file2.chk do not match"
echo "pagecache CoW the second file"
_pwrite_byte 0x62 0 17 $testdir/file2 >> $seqres.full
-_pwrite_byte 0x62 0 17 $testdir/file3 >> $seqres.full
+_pwrite_byte 0x62 0 17 $testdir/file2.chk >> $seqres.full
_pwrite_byte 0x62 $((blksz * 16 - 34)) 17 $testdir/file2 >> $seqres.full
-_pwrite_byte 0x62 $((blksz * 16 - 34)) 17 $testdir/file3 >> $seqres.full
+_pwrite_byte 0x62 $((blksz * 16 - 34)) 17 $testdir/file2.chk >> $seqres.full
_pwrite_byte 0x62 $((blksz * 48 - 8)) 17 $testdir/file2 >> $seqres.full
-_pwrite_byte 0x62 $((blksz * 48 - 8)) 17 $testdir/file3 >> $seqres.full
+_pwrite_byte 0x62 $((blksz * 48 - 8)) 17 $testdir/file2.chk >> $seqres.full
_test_cycle_mount
echo "Compare files"
md5sum $testdir/file1 | _filter_test_dir
md5sum $testdir/file2 | _filter_test_dir
-md5sum $testdir/file3 | _filter_test_dir
+md5sum $testdir/file2.chk | _filter_test_dir
-cmp -s $testdir/file1 $testdir/file2 || echo "Files 1-2 do not match (intentional)"
-cmp -s $testdir/file1 $testdir/file3 || echo "Files 1-3 do not match (intentional)"
-cmp -s $testdir/file2 $testdir/file3 || echo "Files 2-3 do not match"
+cmp -s $testdir/file1 $testdir/file2 || echo "file1 and file2 do not match (intentional)"
+cmp -s $testdir/file1 $testdir/file2.chk || echo "file1 and file2.chk do not match (intentional)"
+cmp -s $testdir/file2 $testdir/file2.chk || echo "file2 and file2.chk do not match"
echo "Compare the CoW'd section to the before file"
_compare_range $testdir/file1 0 $testdir/file2 0 17 \
@@ -80,47 +80,47 @@ _compare_range $testdir/file1 $((blksz * 48 - 8)) \
|| echo "End sections do not match (intentional)"
echo "Compare the CoW'd section to the after file"
-_compare_range $testdir/file2 0 $testdir/file3 0 17 \
+_compare_range $testdir/file2 0 $testdir/file2.chk 0 17 \
|| echo "Start sections do not match"
_compare_range $testdir/file2 $((blksz * 16 - 34)) \
- $testdir/file3 $((blksz * 16 - 34)) 17 \
+ $testdir/file2.chk $((blksz * 16 - 34)) 17 \
|| echo "Middle sections do not match"
_compare_range $testdir/file2 $((blksz * 48 - 8)) \
- $testdir/file3 $((blksz * 48 - 8)) 17 \
+ $testdir/file2.chk $((blksz * 48 - 8)) 17 \
|| echo "End sections do not match"
echo "Compare the not CoW'd sections"
_compare_range $testdir/file1 18 $testdir/file2 18 17 \
- || echo "Start sections of 1-2 do not match"
+ || echo "Start sections of file1 and file2 do not match"
-_compare_range $testdir/file2 18 $testdir/file3 18 17 \
- || echo "Start sections of 2-3 do not match"
+_compare_range $testdir/file2 18 $testdir/file2.chk 18 17 \
+ || echo "Start sections of file2 and file2.chk do not match"
_compare_range $testdir/file1 $((blksz * 16 - 17)) \
$testdir/file2 $((blksz * 16 - 17)) 82 \
- || echo "Middle sections of 1-2 do not match"
+ || echo "Middle sections of file1 and file2 do not match"
_compare_range $testdir/file2 $((blksz * 16 - 17)) \
- $testdir/file3 $((blksz * 16 - 17)) 82 \
- || echo "Middle sections of 2-3 do not match"
+ $testdir/file2.chk $((blksz * 16 - 17)) 82 \
+ || echo "Middle sections of file2 and file2.chk do not match"
_compare_range $testdir/file1 $((blksz * 48 - 108)) \
$testdir/file2 $((blksz * 48 - 108)) 100 \
- || echo "End sections of 1-2 do not match"
+ || echo "End sections of file1 and file2 do not match"
_compare_range $testdir/file2 $((blksz * 48 - 108)) \
- $testdir/file3 $((blksz * 48 - 108)) 100 \
- || echo "End sections of 2-3 do not match"
+ $testdir/file2.chk $((blksz * 48 - 108)) 100 \
+ || echo "End sections of file2 and file2.chk do not match"
_compare_range $testdir/file1 $((blksz * 14)) \
$testdir/file2 $((blksz * 14)) $blksz \
- || echo "Untouched sections of 1-2 do not match"
+ || echo "Untouched sections of file1 and file2 do not match"
_compare_range $testdir/file2 $((blksz * 14)) \
- $testdir/file3 $((blksz * 14)) $blksz \
- || echo "Untouched sections of 2-3 do not match"
+ $testdir/file2.chk $((blksz * 14)) $blksz \
+ || echo "Untouched sections of file2 and file2.chk do not match"
# success, all done
status=0
diff --git a/tests/generic/138.out b/tests/generic/138.out
index b0cafabe..60cd876e 100644
--- a/tests/generic/138.out
+++ b/tests/generic/138.out
@@ -3,14 +3,14 @@ Create the original files
Compare files
60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-138/file1
60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-138/file2
-60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-138/file3
+60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-138/file2.chk
pagecache CoW the second file
Compare files
60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-138/file1
4a879c2f322121f6f4b8ebede1909a7c TEST_DIR/test-138/file2
-4a879c2f322121f6f4b8ebede1909a7c TEST_DIR/test-138/file3
-Files 1-2 do not match (intentional)
-Files 1-3 do not match (intentional)
+4a879c2f322121f6f4b8ebede1909a7c TEST_DIR/test-138/file2.chk
+file1 and file2 do not match (intentional)
+file1 and file2.chk do not match (intentional)
Compare the CoW'd section to the before file
Start sections do not match (intentional)
Middle sections do not match (intentional)
diff --git a/tests/generic/139 b/tests/generic/139
index 6422f66a..0bbc222c 100755
--- a/tests/generic/139
+++ b/tests/generic/139
@@ -36,37 +36,37 @@ echo "Create the original files"
blksz=65536
_pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file1 >> $seqres.full
_cp_reflink $testdir/file1 $testdir/file2 >> $seqres.full
-_pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file3 >> $seqres.full
+_pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file2.chk >> $seqres.full
_test_cycle_mount
echo "Compare files"
md5sum $testdir/file1 | _filter_test_dir
md5sum $testdir/file2 | _filter_test_dir
-md5sum $testdir/file3 | _filter_test_dir
+md5sum $testdir/file2.chk | _filter_test_dir
-cmp -s $testdir/file1 $testdir/file2 || echo "Files 1-2 should match"
-cmp -s $testdir/file1 $testdir/file3 || echo "Files 1-3 should match"
-cmp -s $testdir/file2 $testdir/file3 || echo "Files 2-3 should match"
+cmp -s $testdir/file1 $testdir/file2 || echo "file1 and file2 should match"
+cmp -s $testdir/file1 $testdir/file2.chk || echo "file1 and file2.chk should match"
+cmp -s $testdir/file2 $testdir/file2.chk || echo "file2 and file2.chk should match"
echo "directio CoW the second file"
_pwrite_byte 0x62 0 $blksz $testdir/file2 -d >> $seqres.full
-_pwrite_byte 0x62 0 $blksz $testdir/file3 -d >> $seqres.full
+_pwrite_byte 0x62 0 $blksz $testdir/file2.chk -d >> $seqres.full
_pwrite_byte 0x62 $((blksz * 16 - 512)) 512 $testdir/file2 -d >> $seqres.full
-_pwrite_byte 0x62 $((blksz * 16 - 512)) 512 $testdir/file3 -d >> $seqres.full
+_pwrite_byte 0x62 $((blksz * 16 - 512)) 512 $testdir/file2.chk -d >> $seqres.full
_pwrite_byte 0x62 $((blksz * 48)) $blksz $testdir/file2 -d >> $seqres.full
-_pwrite_byte 0x62 $((blksz * 48)) $blksz $testdir/file3 -d >> $seqres.full
+_pwrite_byte 0x62 $((blksz * 48)) $blksz $testdir/file2.chk -d >> $seqres.full
_test_cycle_mount
echo "Compare files"
md5sum $testdir/file1 | _filter_test_dir
md5sum $testdir/file2 | _filter_test_dir
-md5sum $testdir/file3 | _filter_test_dir
+md5sum $testdir/file2.chk | _filter_test_dir
-cmp -s $testdir/file1 $testdir/file2 || echo "Files 1-2 should not match (intentional)"
-cmp -s $testdir/file1 $testdir/file3 || echo "Files 1-3 should not match (intentional)"
-cmp -s $testdir/file2 $testdir/file3 || echo "Files 2-3 should match"
+cmp -s $testdir/file1 $testdir/file2 || echo "file1 and file2 should not match (intentional)"
+cmp -s $testdir/file1 $testdir/file2.chk || echo "file1 and file2.chk should not match (intentional)"
+cmp -s $testdir/file2 $testdir/file2.chk || echo "file2 and file2.chk should match"
echo "Compare the CoW'd section to the before file"
_compare_range $testdir/file1 0 $testdir/file2 0 $blksz \
@@ -81,46 +81,46 @@ _compare_range $testdir/file1 $((blksz * 48 - 512)) \
|| echo "End sections do not match (intentional)"
echo "Compare the CoW'd section to the after file"
-_compare_range $testdir/file2 0 $testdir/file3 0 $blksz \
+_compare_range $testdir/file2 0 $testdir/file2.chk 0 $blksz \
|| echo "Start sections do not match"
_compare_range $testdir/file2 $((blksz * 16 - 512)) \
- $testdir/file3 $((blksz * 16 - 512)) 512 \
+ $testdir/file2.chk $((blksz * 16 - 512)) 512 \
|| echo "Middle sections do not match"
_compare_range $testdir/file2 $((blksz * 48 - 512)) \
- $testdir/file3 $((blksz * 48 - 512)) $blksz \
+ $testdir/file2.chk $((blksz * 48 - 512)) $blksz \
|| echo "End sections do not match"
echo "Compare the not CoW'd sections"
_compare_range $testdir/file1 $blksz $testdir/file2 $blksz 512 \
- || echo "Start sections of 1-2 do not match"
-_compare_range $testdir/file2 $blksz $testdir/file3 $blksz 512 \
- || echo "Start sections of 2-3 do not match"
+ || echo "Start sections of file1 and file2 do not match"
+_compare_range $testdir/file2 $blksz $testdir/file2.chk $blksz 512 \
+ || echo "Start sections of file2 and file2.chk do not match"
_compare_range $testdir/file1 $((blksz * 16 - 1024)) \
$testdir/file2 $((blksz * 16 - 1024)) 512 \
- || echo "Middle sections of 1-2 do not match"
+ || echo "Middle sections of file1 and file2 do not match"
_compare_range $testdir/file2 $((blksz * 16 - 1024)) \
- $testdir/file3 $((blksz * 16 - 1024)) 512 \
- || echo "Middle sections of 2-3 do not match"
+ $testdir/file2.chk $((blksz * 16 - 1024)) 512 \
+ || echo "Middle sections of file2 and file2.chk do not match"
_compare_range $testdir/file1 $((blksz * 48 - 1024)) \
$testdir/file2 $((blksz * 48 - 1024)) 512 \
- || echo "End sections of 1-2 do not match"
+ || echo "End sections of file1 and file2 do not match"
_compare_range $testdir/file2 $((blksz * 48 - 1024)) \
- $testdir/file3 $((blksz * 48 - 1024)) 512 \
- || echo "End sections of 2-3 do not match"
+ $testdir/file2.chk $((blksz * 48 - 1024)) 512 \
+ || echo "End sections of file2 and file2.chk do not match"
_compare_range $testdir/file1 $((blksz * 16)) \
$testdir/file2 $((blksz * 16)) 512 \
- || echo "Untouched sections of 1-2 do not match"
+ || echo "Untouched sections of file1 and file2 do not match"
_compare_range $testdir/file2 $((blksz * 16)) \
- $testdir/file3 $((blksz * 16)) 512 \
- || echo "Untouched sections of 2-3 do not match"
+ $testdir/file2.chk $((blksz * 16)) 512 \
+ || echo "Untouched sections of file2 and file2.chk do not match"
# success, all done
status=0
diff --git a/tests/generic/139.out b/tests/generic/139.out
index 28d04f5f..56d6c9f9 100644
--- a/tests/generic/139.out
+++ b/tests/generic/139.out
@@ -3,14 +3,14 @@ Create the original files
Compare files
60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-139/file1
60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-139/file2
-60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-139/file3
+60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-139/file2.chk
directio CoW the second file
Compare files
60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-139/file1
ff5626fb6c71b242d6b1a43de25c9a85 TEST_DIR/test-139/file2
-ff5626fb6c71b242d6b1a43de25c9a85 TEST_DIR/test-139/file3
-Files 1-2 should not match (intentional)
-Files 1-3 should not match (intentional)
+ff5626fb6c71b242d6b1a43de25c9a85 TEST_DIR/test-139/file2.chk
+file1 and file2 should not match (intentional)
+file1 and file2.chk should not match (intentional)
Compare the CoW'd section to the before file
Start sections do not match (intentional)
Middle sections do not match (intentional)
diff --git a/tests/generic/140 b/tests/generic/140
index 6cba5791..52cf07dc 100755
--- a/tests/generic/140
+++ b/tests/generic/140
@@ -35,37 +35,37 @@ echo "Create the original files"
blksz=65536
_pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file1 >> $seqres.full
_cp_reflink $testdir/file1 $testdir/file2 >> $seqres.full
-_pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file3 >> $seqres.full
+_pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file2.chk >> $seqres.full
_test_cycle_mount
echo "Compare files"
md5sum $testdir/file1 | _filter_test_dir
md5sum $testdir/file2 | _filter_test_dir
-md5sum $testdir/file3 | _filter_test_dir
+md5sum $testdir/file2.chk | _filter_test_dir
-cmp -s $testdir/file1 $testdir/file2 || echo "Files 1-2 do not match"
-cmp -s $testdir/file1 $testdir/file3 || echo "Files 1-3 do not match"
-cmp -s $testdir/file2 $testdir/file3 || echo "Files 2-3 do not match"
+cmp -s $testdir/file1 $testdir/file2 || echo "file1 and file2 do not match"
+cmp -s $testdir/file1 $testdir/file2.chk || echo "file1 and file2.chk do not match"
+cmp -s $testdir/file2 $testdir/file2.chk || echo "file2 and file2.chk do not match"
echo "mmap CoW the second file"
_mwrite_byte 0x62 0 17 $((blksz * 48 - 3)) $testdir/file2 >> $seqres.full
-_mwrite_byte 0x62 0 17 $((blksz * 48 - 3)) $testdir/file3 >> $seqres.full
+_mwrite_byte 0x62 0 17 $((blksz * 48 - 3)) $testdir/file2.chk >> $seqres.full
_mwrite_byte 0x62 $((blksz * 16 - 34)) 17 $((blksz * 48 - 3)) $testdir/file2 >> $seqres.full
-_mwrite_byte 0x62 $((blksz * 16 - 34)) 17 $((blksz * 48 - 3)) $testdir/file3 >> $seqres.full
+_mwrite_byte 0x62 $((blksz * 16 - 34)) 17 $((blksz * 48 - 3)) $testdir/file2.chk >> $seqres.full
_mwrite_byte 0x62 $((blksz * 48 - 20)) 17 $((blksz * 48 - 3)) $testdir/file2 >> $seqres.full
-_mwrite_byte 0x62 $((blksz * 48 - 20)) 17 $((blksz * 48 - 3)) $testdir/file3 >> $seqres.full
+_mwrite_byte 0x62 $((blksz * 48 - 20)) 17 $((blksz * 48 - 3)) $testdir/file2.chk >> $seqres.full
_test_cycle_mount
echo "Compare files"
md5sum $testdir/file1 | _filter_test_dir
md5sum $testdir/file2 | _filter_test_dir
-md5sum $testdir/file3 | _filter_test_dir
+md5sum $testdir/file2.chk | _filter_test_dir
-cmp -s $testdir/file1 $testdir/file2 || echo "Files 1-2 do not match (intentional)"
-cmp -s $testdir/file1 $testdir/file3 || echo "Files 1-3 do not match (intentional)"
-cmp -s $testdir/file2 $testdir/file3 || echo "Files 2-3 do not match"
+cmp -s $testdir/file1 $testdir/file2 || echo "file1 and file2 do not match (intentional)"
+cmp -s $testdir/file1 $testdir/file2.chk || echo "file1 and file2.chk do not match (intentional)"
+cmp -s $testdir/file2 $testdir/file2.chk || echo "file2 and file2.chk do not match"
echo "Compare the CoW'd section to the before file"
_compare_range $testdir/file1 0 $testdir/file2 0 17 \
@@ -80,47 +80,47 @@ _compare_range $testdir/file1 $((blksz * 48 - 20)) \
|| echo "End sections do not match (intentional)"
echo "Compare the CoW'd section to the after file"
-_compare_range $testdir/file2 0 $testdir/file3 0 17 \
+_compare_range $testdir/file2 0 $testdir/file2.chk 0 17 \
|| echo "Start sections do not match"
_compare_range $testdir/file2 $((blksz * 16 - 34)) \
- $testdir/file3 $((blksz * 16 - 34)) 17 \
+ $testdir/file2.chk $((blksz * 16 - 34)) 17 \
|| echo "Middle sections do not match"
_compare_range $testdir/file2 $((blksz * 48 - 20)) \
- $testdir/file3 $((blksz * 48 - 20)) 17 \
+ $testdir/file2.chk $((blksz * 48 - 20)) 17 \
|| echo "End sections do not match"
echo "Compare the not CoW'd sections"
_compare_range $testdir/file1 18 $testdir/file2 18 17 \
- || echo "Start sections of 1-2 do not match"
+ || echo "Start sections of file1 and file2 do not match"
-_compare_range $testdir/file2 18 $testdir/file3 18 17 \
- || echo "Start sections of 2-3 do not match"
+_compare_range $testdir/file2 18 $testdir/file2.chk 18 17 \
+ || echo "Start sections of file2 and file2.chk do not match"
_compare_range $testdir/file1 $((blksz * 16 - 17)) \
$testdir/file2 $((blksz * 16 - 17)) 82 \
- || echo "Middle sections of 1-2 do not match"
+ || echo "Middle sections of file1 and file2 do not match"
_compare_range $testdir/file2 $((blksz * 16 - 17)) \
- $testdir/file3 $((blksz * 16 - 17)) 82 \
- || echo "Middle sections of 2-3 do not match"
+ $testdir/file2.chk $((blksz * 16 - 17)) 82 \
+ || echo "Middle sections of file2 and file2.chk do not match"
_compare_range $testdir/file1 $((blksz * 48 - 120)) \
$testdir/file2 $((blksz * 48 - 120)) 100 \
- || echo "End sections of 1-2 do not match"
+ || echo "End sections of file1 and file2 do not match"
_compare_range $testdir/file2 $((blksz * 48 - 120)) \
- $testdir/file3 $((blksz * 48 - 120)) 100 \
- || echo "End sections of 2-3 do not match"
+ $testdir/file2.chk $((blksz * 48 - 120)) 100 \
+ || echo "End sections of file2 and file2.chk do not match"
_compare_range $testdir/file1 $((blksz * 14)) \
$testdir/file2 $((blksz * 14)) $blksz \
- || echo "Untouched sections of 1-2 do not match"
+ || echo "Untouched sections of file1 and file2 do not match"
_compare_range $testdir/file2 $((blksz * 14)) \
- $testdir/file3 $((blksz * 14)) $blksz \
- || echo "Untouched sections of 2-3 do not match"
+ $testdir/file2.chk $((blksz * 14)) $blksz \
+ || echo "Untouched sections of file2 and file2.chk do not match"
# success, all done
status=0
diff --git a/tests/generic/140.out b/tests/generic/140.out
index 51a5b854..89389001 100644
--- a/tests/generic/140.out
+++ b/tests/generic/140.out
@@ -3,14 +3,14 @@ Create the original files
Compare files
60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-140/file1
60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-140/file2
-60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-140/file3
+60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-140/file2.chk
mmap CoW the second file
Compare files
60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-140/file1
795ecfd281dbda4916431376228e4187 TEST_DIR/test-140/file2
-795ecfd281dbda4916431376228e4187 TEST_DIR/test-140/file3
-Files 1-2 do not match (intentional)
-Files 1-3 do not match (intentional)
+795ecfd281dbda4916431376228e4187 TEST_DIR/test-140/file2.chk
+file1 and file2 do not match (intentional)
+file1 and file2.chk do not match (intentional)
Compare the CoW'd section to the before file
Start sections do not match (intentional)
Middle sections do not match (intentional)
--
2.33.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/3] generic: fix description or typo in head comment
2021-10-29 6:59 [PATCH 0/3] Random fixes for generic Shiyang Ruan
2021-10-29 6:59 ` [PATCH 1/3] generic/138,139,140: fix the name for check file Shiyang Ruan
@ 2021-10-29 6:59 ` Shiyang Ruan
2021-10-29 7:59 ` [PATCH v1.1 " Shiyang Ruan
2021-10-29 15:41 ` [PATCH " Darrick J. Wong
2021-10-29 6:59 ` [PATCH 3/3] generic/201: fix the description Shiyang Ruan
2 siblings, 2 replies; 8+ messages in thread
From: Shiyang Ruan @ 2021-10-29 6:59 UTC (permalink / raw)
To: fstests
1. update description according to the current testcase
2. "an the end -> at the end"
Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
---
tests/generic/155 | 3 +--
tests/generic/269 | 2 +-
tests/generic/270 | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/tests/generic/155 b/tests/generic/155
index 2fe7894a..13292fbb 100755
--- a/tests/generic/155
+++ b/tests/generic/155
@@ -13,8 +13,7 @@
# - CoW all the rest of the blocks of the copies
# - Compare fs block usage to (2), (1), and (0)
#
-# The main difference from 834 is that we use zero range, directio, and
-# mmap to mix things up a bit.
+# The main difference from No. 154 is that we use zero range to execute CoW.
#
. ./common/preamble
_begin_fstest auto quick clone zero
diff --git a/tests/generic/269 b/tests/generic/269
index d78b7463..60a07b44 100755
--- a/tests/generic/269
+++ b/tests/generic/269
@@ -4,7 +4,7 @@
#
# FSQA Test No. 269
#
-# Run fsstress and ENSPC hitters in parallel, check fs consistency an the end
+# Run fsstress and ENSPC hitters in parallel, check fs consistency at the end
#
. ./common/preamble
_begin_fstest auto rw prealloc ioctl enospc stress
diff --git a/tests/generic/270 b/tests/generic/270
index 1fb5795a..35141e05 100755
--- a/tests/generic/270
+++ b/tests/generic/270
@@ -5,7 +5,7 @@
# FSQA Test No. 270
#
# Run fsstress and ENSPC hitters in parallel, check quota and
-# fs consistency an the end
+# fs consistency at the end
#
. ./common/preamble
_begin_fstest auto quota rw prealloc ioctl enospc stress
--
2.33.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/3] generic/201: fix the description
2021-10-29 6:59 [PATCH 0/3] Random fixes for generic Shiyang Ruan
2021-10-29 6:59 ` [PATCH 1/3] generic/138,139,140: fix the name for check file Shiyang Ruan
2021-10-29 6:59 ` [PATCH 2/3] generic: fix description or typo in head comment Shiyang Ruan
@ 2021-10-29 6:59 ` Shiyang Ruan
2021-10-29 15:41 ` Darrick J. Wong
2 siblings, 1 reply; 8+ messages in thread
From: Shiyang Ruan @ 2021-10-29 6:59 UTC (permalink / raw)
To: fstests
This case is test for 'unlink', and there is no umount operation here.
Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
---
tests/generic/201 | 2 +-
tests/generic/201.out | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/generic/201 b/tests/generic/201
index 9b65445a..2598b44a 100755
--- a/tests/generic/201
+++ b/tests/generic/201
@@ -50,7 +50,7 @@ md5sum $testdir/file1 | _filter_scratch
md5sum $testdir/file3 | _filter_scratch
md5sum $testdir/file3.chk | _filter_scratch
-echo "CoW and unmount"
+echo "CoW and unlink"
cowoff=$((filesize / 4))
cowsz=$((filesize / 2))
$XFS_IO_PROG -f -c "pwrite -S 0x63 -b $cowsz $cowoff $cowsz" $testdir/file3 >> $seqres.full
diff --git a/tests/generic/201.out b/tests/generic/201.out
index 52669d27..6867704a 100644
--- a/tests/generic/201.out
+++ b/tests/generic/201.out
@@ -5,4 +5,4 @@ Compare files
bdbcf02ee0aa977795a79d25fcfdccb1 SCRATCH_MNT/test-201/file1
d3959a68638c50af07f0258e032cb554 SCRATCH_MNT/test-201/file3
d3959a68638c50af07f0258e032cb554 SCRATCH_MNT/test-201/file3.chk
-CoW and unmount
+CoW and unlink
--
2.33.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v1.1 2/3] generic: fix description or typo in head comment
2021-10-29 6:59 ` [PATCH 2/3] generic: fix description or typo in head comment Shiyang Ruan
@ 2021-10-29 7:59 ` Shiyang Ruan
2021-10-29 15:41 ` [PATCH " Darrick J. Wong
1 sibling, 0 replies; 8+ messages in thread
From: Shiyang Ruan @ 2021-10-29 7:59 UTC (permalink / raw)
To: fstests
==
The word "ENSPC" is a typo too. So update this patch.
==
1. update description according to the current testcase
2. "ENSPC" -> "ENOSPC" ,"an the end -> at the end"
Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
---
tests/generic/155 | 3 +--
tests/generic/269 | 2 +-
tests/generic/270 | 4 ++--
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/tests/generic/155 b/tests/generic/155
index 2fe7894a..13292fbb 100755
--- a/tests/generic/155
+++ b/tests/generic/155
@@ -13,8 +13,7 @@
# - CoW all the rest of the blocks of the copies
# - Compare fs block usage to (2), (1), and (0)
#
-# The main difference from 834 is that we use zero range, directio, and
-# mmap to mix things up a bit.
+# The main difference from No. 154 is that we use zero range to execute CoW.
#
. ./common/preamble
_begin_fstest auto quick clone zero
diff --git a/tests/generic/269 b/tests/generic/269
index d78b7463..838e696d 100755
--- a/tests/generic/269
+++ b/tests/generic/269
@@ -4,7 +4,7 @@
#
# FSQA Test No. 269
#
-# Run fsstress and ENSPC hitters in parallel, check fs consistency an the end
+# Run fsstress and ENOSPC hitters in parallel, check fs consistency at the end
#
. ./common/preamble
_begin_fstest auto rw prealloc ioctl enospc stress
diff --git a/tests/generic/270 b/tests/generic/270
index 1fb5795a..8a6a2822 100755
--- a/tests/generic/270
+++ b/tests/generic/270
@@ -4,8 +4,8 @@
#
# FSQA Test No. 270
#
-# Run fsstress and ENSPC hitters in parallel, check quota and
-# fs consistency an the end
+# Run fsstress and ENOSPC hitters in parallel, check quota and
+# fs consistency at the end
#
. ./common/preamble
_begin_fstest auto quota rw prealloc ioctl enospc stress
--
2.33.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/3] generic: fix description or typo in head comment
2021-10-29 6:59 ` [PATCH 2/3] generic: fix description or typo in head comment Shiyang Ruan
2021-10-29 7:59 ` [PATCH v1.1 " Shiyang Ruan
@ 2021-10-29 15:41 ` Darrick J. Wong
1 sibling, 0 replies; 8+ messages in thread
From: Darrick J. Wong @ 2021-10-29 15:41 UTC (permalink / raw)
To: Shiyang Ruan; +Cc: fstests
On Fri, Oct 29, 2021 at 02:59:42PM +0800, Shiyang Ruan wrote:
> 1. update description according to the current testcase
> 2. "an the end -> at the end"
>
> Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
> ---
> tests/generic/155 | 3 +--
> tests/generic/269 | 2 +-
> tests/generic/270 | 2 +-
> 3 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/tests/generic/155 b/tests/generic/155
> index 2fe7894a..13292fbb 100755
> --- a/tests/generic/155
> +++ b/tests/generic/155
> @@ -13,8 +13,7 @@
> # - CoW all the rest of the blocks of the copies
> # - Compare fs block usage to (2), (1), and (0)
> #
> -# The main difference from 834 is that we use zero range, directio, and
> -# mmap to mix things up a bit.
> +# The main difference from No. 154 is that we use zero range to execute CoW.
'The main difference from generic/154 is that...'
> #
> . ./common/preamble
> _begin_fstest auto quick clone zero
> diff --git a/tests/generic/269 b/tests/generic/269
> index d78b7463..60a07b44 100755
> --- a/tests/generic/269
> +++ b/tests/generic/269
> @@ -4,7 +4,7 @@
> #
> # FSQA Test No. 269
> #
> -# Run fsstress and ENSPC hitters in parallel, check fs consistency an the end
> +# Run fsstress and ENSPC hitters in parallel, check fs consistency at the end
ENOSPC, not ENSPC
> #
> . ./common/preamble
> _begin_fstest auto rw prealloc ioctl enospc stress
> diff --git a/tests/generic/270 b/tests/generic/270
> index 1fb5795a..35141e05 100755
> --- a/tests/generic/270
> +++ b/tests/generic/270
> @@ -5,7 +5,7 @@
> # FSQA Test No. 270
> #
> # Run fsstress and ENSPC hitters in parallel, check quota and
> -# fs consistency an the end
> +# fs consistency at the end
This looks good to me, assuming the lack of a period at the end of the
sentence doesn't bother anyone. Apparently that's the new style in this
'texting' thing I keep hearing about. ;)
--D
> #
> . ./common/preamble
> _begin_fstest auto quota rw prealloc ioctl enospc stress
> --
> 2.33.0
>
>
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 3/3] generic/201: fix the description
2021-10-29 6:59 ` [PATCH 3/3] generic/201: fix the description Shiyang Ruan
@ 2021-10-29 15:41 ` Darrick J. Wong
0 siblings, 0 replies; 8+ messages in thread
From: Darrick J. Wong @ 2021-10-29 15:41 UTC (permalink / raw)
To: Shiyang Ruan; +Cc: fstests
On Fri, Oct 29, 2021 at 02:59:43PM +0800, Shiyang Ruan wrote:
> This case is test for 'unlink', and there is no umount operation here.
>
> Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
Thanks for fixing this
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> ---
> tests/generic/201 | 2 +-
> tests/generic/201.out | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tests/generic/201 b/tests/generic/201
> index 9b65445a..2598b44a 100755
> --- a/tests/generic/201
> +++ b/tests/generic/201
> @@ -50,7 +50,7 @@ md5sum $testdir/file1 | _filter_scratch
> md5sum $testdir/file3 | _filter_scratch
> md5sum $testdir/file3.chk | _filter_scratch
>
> -echo "CoW and unmount"
> +echo "CoW and unlink"
> cowoff=$((filesize / 4))
> cowsz=$((filesize / 2))
> $XFS_IO_PROG -f -c "pwrite -S 0x63 -b $cowsz $cowoff $cowsz" $testdir/file3 >> $seqres.full
> diff --git a/tests/generic/201.out b/tests/generic/201.out
> index 52669d27..6867704a 100644
> --- a/tests/generic/201.out
> +++ b/tests/generic/201.out
> @@ -5,4 +5,4 @@ Compare files
> bdbcf02ee0aa977795a79d25fcfdccb1 SCRATCH_MNT/test-201/file1
> d3959a68638c50af07f0258e032cb554 SCRATCH_MNT/test-201/file3
> d3959a68638c50af07f0258e032cb554 SCRATCH_MNT/test-201/file3.chk
> -CoW and unmount
> +CoW and unlink
> --
> 2.33.0
>
>
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/3] generic/138,139,140: fix the name for check file
2021-10-29 6:59 ` [PATCH 1/3] generic/138,139,140: fix the name for check file Shiyang Ruan
@ 2021-10-29 15:48 ` Darrick J. Wong
0 siblings, 0 replies; 8+ messages in thread
From: Darrick J. Wong @ 2021-10-29 15:48 UTC (permalink / raw)
To: Shiyang Ruan; +Cc: fstests
On Fri, Oct 29, 2021 at 02:59:41PM +0800, Shiyang Ruan wrote:
> The original 'file3' is used to check if the result after operation on
> file2 is correct. So, rename it to be 'file2.chk' to make it easier to
> understand.
>
> Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
LGTM,
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> ---
> tests/generic/138 | 54 +++++++++++++++++++++----------------------
> tests/generic/138.out | 8 +++----
> tests/generic/139 | 54 +++++++++++++++++++++----------------------
> tests/generic/139.out | 8 +++----
> tests/generic/140 | 54 +++++++++++++++++++++----------------------
> tests/generic/140.out | 8 +++----
> 6 files changed, 93 insertions(+), 93 deletions(-)
>
> diff --git a/tests/generic/138 b/tests/generic/138
> index 1037ed3e..d061ac34 100755
> --- a/tests/generic/138
> +++ b/tests/generic/138
> @@ -35,37 +35,37 @@ echo "Create the original files"
> blksz=65536
> _pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file1 >> $seqres.full
> _cp_reflink $testdir/file1 $testdir/file2 >> $seqres.full
> -_pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file3 >> $seqres.full
> +_pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file2.chk >> $seqres.full
> _test_cycle_mount
>
> echo "Compare files"
> md5sum $testdir/file1 | _filter_test_dir
> md5sum $testdir/file2 | _filter_test_dir
> -md5sum $testdir/file3 | _filter_test_dir
> +md5sum $testdir/file2.chk | _filter_test_dir
>
> -cmp -s $testdir/file1 $testdir/file2 || echo "Files 1-2 do not match"
> -cmp -s $testdir/file1 $testdir/file3 || echo "Files 1-3 do not match"
> -cmp -s $testdir/file2 $testdir/file3 || echo "Files 2-3 do not match"
> +cmp -s $testdir/file1 $testdir/file2 || echo "file1 and file2 do not match"
> +cmp -s $testdir/file1 $testdir/file2.chk || echo "file1 and file2.chk do not match"
> +cmp -s $testdir/file2 $testdir/file2.chk || echo "file1 and file2.chk do not match"
>
> echo "pagecache CoW the second file"
> _pwrite_byte 0x62 0 17 $testdir/file2 >> $seqres.full
> -_pwrite_byte 0x62 0 17 $testdir/file3 >> $seqres.full
> +_pwrite_byte 0x62 0 17 $testdir/file2.chk >> $seqres.full
>
> _pwrite_byte 0x62 $((blksz * 16 - 34)) 17 $testdir/file2 >> $seqres.full
> -_pwrite_byte 0x62 $((blksz * 16 - 34)) 17 $testdir/file3 >> $seqres.full
> +_pwrite_byte 0x62 $((blksz * 16 - 34)) 17 $testdir/file2.chk >> $seqres.full
>
> _pwrite_byte 0x62 $((blksz * 48 - 8)) 17 $testdir/file2 >> $seqres.full
> -_pwrite_byte 0x62 $((blksz * 48 - 8)) 17 $testdir/file3 >> $seqres.full
> +_pwrite_byte 0x62 $((blksz * 48 - 8)) 17 $testdir/file2.chk >> $seqres.full
> _test_cycle_mount
>
> echo "Compare files"
> md5sum $testdir/file1 | _filter_test_dir
> md5sum $testdir/file2 | _filter_test_dir
> -md5sum $testdir/file3 | _filter_test_dir
> +md5sum $testdir/file2.chk | _filter_test_dir
>
> -cmp -s $testdir/file1 $testdir/file2 || echo "Files 1-2 do not match (intentional)"
> -cmp -s $testdir/file1 $testdir/file3 || echo "Files 1-3 do not match (intentional)"
> -cmp -s $testdir/file2 $testdir/file3 || echo "Files 2-3 do not match"
> +cmp -s $testdir/file1 $testdir/file2 || echo "file1 and file2 do not match (intentional)"
> +cmp -s $testdir/file1 $testdir/file2.chk || echo "file1 and file2.chk do not match (intentional)"
> +cmp -s $testdir/file2 $testdir/file2.chk || echo "file2 and file2.chk do not match"
>
> echo "Compare the CoW'd section to the before file"
> _compare_range $testdir/file1 0 $testdir/file2 0 17 \
> @@ -80,47 +80,47 @@ _compare_range $testdir/file1 $((blksz * 48 - 8)) \
> || echo "End sections do not match (intentional)"
>
> echo "Compare the CoW'd section to the after file"
> -_compare_range $testdir/file2 0 $testdir/file3 0 17 \
> +_compare_range $testdir/file2 0 $testdir/file2.chk 0 17 \
> || echo "Start sections do not match"
>
> _compare_range $testdir/file2 $((blksz * 16 - 34)) \
> - $testdir/file3 $((blksz * 16 - 34)) 17 \
> + $testdir/file2.chk $((blksz * 16 - 34)) 17 \
> || echo "Middle sections do not match"
>
> _compare_range $testdir/file2 $((blksz * 48 - 8)) \
> - $testdir/file3 $((blksz * 48 - 8)) 17 \
> + $testdir/file2.chk $((blksz * 48 - 8)) 17 \
> || echo "End sections do not match"
>
> echo "Compare the not CoW'd sections"
> _compare_range $testdir/file1 18 $testdir/file2 18 17 \
> - || echo "Start sections of 1-2 do not match"
> + || echo "Start sections of file1 and file2 do not match"
>
> -_compare_range $testdir/file2 18 $testdir/file3 18 17 \
> - || echo "Start sections of 2-3 do not match"
> +_compare_range $testdir/file2 18 $testdir/file2.chk 18 17 \
> + || echo "Start sections of file2 and file2.chk do not match"
>
> _compare_range $testdir/file1 $((blksz * 16 - 17)) \
> $testdir/file2 $((blksz * 16 - 17)) 82 \
> - || echo "Middle sections of 1-2 do not match"
> + || echo "Middle sections of file1 and file2 do not match"
>
> _compare_range $testdir/file2 $((blksz * 16 - 17)) \
> - $testdir/file3 $((blksz * 16 - 17)) 82 \
> - || echo "Middle sections of 2-3 do not match"
> + $testdir/file2.chk $((blksz * 16 - 17)) 82 \
> + || echo "Middle sections of file2 and file2.chk do not match"
>
> _compare_range $testdir/file1 $((blksz * 48 - 108)) \
> $testdir/file2 $((blksz * 48 - 108)) 100 \
> - || echo "End sections of 1-2 do not match"
> + || echo "End sections of file1 and file2 do not match"
>
> _compare_range $testdir/file2 $((blksz * 48 - 108)) \
> - $testdir/file3 $((blksz * 48 - 108)) 100 \
> - || echo "End sections of 2-3 do not match"
> + $testdir/file2.chk $((blksz * 48 - 108)) 100 \
> + || echo "End sections of file2 and file2.chk do not match"
>
> _compare_range $testdir/file1 $((blksz * 14)) \
> $testdir/file2 $((blksz * 14)) $blksz \
> - || echo "Untouched sections of 1-2 do not match"
> + || echo "Untouched sections of file1 and file2 do not match"
>
> _compare_range $testdir/file2 $((blksz * 14)) \
> - $testdir/file3 $((blksz * 14)) $blksz \
> - || echo "Untouched sections of 2-3 do not match"
> + $testdir/file2.chk $((blksz * 14)) $blksz \
> + || echo "Untouched sections of file2 and file2.chk do not match"
>
> # success, all done
> status=0
> diff --git a/tests/generic/138.out b/tests/generic/138.out
> index b0cafabe..60cd876e 100644
> --- a/tests/generic/138.out
> +++ b/tests/generic/138.out
> @@ -3,14 +3,14 @@ Create the original files
> Compare files
> 60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-138/file1
> 60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-138/file2
> -60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-138/file3
> +60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-138/file2.chk
> pagecache CoW the second file
> Compare files
> 60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-138/file1
> 4a879c2f322121f6f4b8ebede1909a7c TEST_DIR/test-138/file2
> -4a879c2f322121f6f4b8ebede1909a7c TEST_DIR/test-138/file3
> -Files 1-2 do not match (intentional)
> -Files 1-3 do not match (intentional)
> +4a879c2f322121f6f4b8ebede1909a7c TEST_DIR/test-138/file2.chk
> +file1 and file2 do not match (intentional)
> +file1 and file2.chk do not match (intentional)
> Compare the CoW'd section to the before file
> Start sections do not match (intentional)
> Middle sections do not match (intentional)
> diff --git a/tests/generic/139 b/tests/generic/139
> index 6422f66a..0bbc222c 100755
> --- a/tests/generic/139
> +++ b/tests/generic/139
> @@ -36,37 +36,37 @@ echo "Create the original files"
> blksz=65536
> _pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file1 >> $seqres.full
> _cp_reflink $testdir/file1 $testdir/file2 >> $seqres.full
> -_pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file3 >> $seqres.full
> +_pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file2.chk >> $seqres.full
> _test_cycle_mount
>
> echo "Compare files"
> md5sum $testdir/file1 | _filter_test_dir
> md5sum $testdir/file2 | _filter_test_dir
> -md5sum $testdir/file3 | _filter_test_dir
> +md5sum $testdir/file2.chk | _filter_test_dir
>
> -cmp -s $testdir/file1 $testdir/file2 || echo "Files 1-2 should match"
> -cmp -s $testdir/file1 $testdir/file3 || echo "Files 1-3 should match"
> -cmp -s $testdir/file2 $testdir/file3 || echo "Files 2-3 should match"
> +cmp -s $testdir/file1 $testdir/file2 || echo "file1 and file2 should match"
> +cmp -s $testdir/file1 $testdir/file2.chk || echo "file1 and file2.chk should match"
> +cmp -s $testdir/file2 $testdir/file2.chk || echo "file2 and file2.chk should match"
>
> echo "directio CoW the second file"
> _pwrite_byte 0x62 0 $blksz $testdir/file2 -d >> $seqres.full
> -_pwrite_byte 0x62 0 $blksz $testdir/file3 -d >> $seqres.full
> +_pwrite_byte 0x62 0 $blksz $testdir/file2.chk -d >> $seqres.full
>
> _pwrite_byte 0x62 $((blksz * 16 - 512)) 512 $testdir/file2 -d >> $seqres.full
> -_pwrite_byte 0x62 $((blksz * 16 - 512)) 512 $testdir/file3 -d >> $seqres.full
> +_pwrite_byte 0x62 $((blksz * 16 - 512)) 512 $testdir/file2.chk -d >> $seqres.full
>
> _pwrite_byte 0x62 $((blksz * 48)) $blksz $testdir/file2 -d >> $seqres.full
> -_pwrite_byte 0x62 $((blksz * 48)) $blksz $testdir/file3 -d >> $seqres.full
> +_pwrite_byte 0x62 $((blksz * 48)) $blksz $testdir/file2.chk -d >> $seqres.full
> _test_cycle_mount
>
> echo "Compare files"
> md5sum $testdir/file1 | _filter_test_dir
> md5sum $testdir/file2 | _filter_test_dir
> -md5sum $testdir/file3 | _filter_test_dir
> +md5sum $testdir/file2.chk | _filter_test_dir
>
> -cmp -s $testdir/file1 $testdir/file2 || echo "Files 1-2 should not match (intentional)"
> -cmp -s $testdir/file1 $testdir/file3 || echo "Files 1-3 should not match (intentional)"
> -cmp -s $testdir/file2 $testdir/file3 || echo "Files 2-3 should match"
> +cmp -s $testdir/file1 $testdir/file2 || echo "file1 and file2 should not match (intentional)"
> +cmp -s $testdir/file1 $testdir/file2.chk || echo "file1 and file2.chk should not match (intentional)"
> +cmp -s $testdir/file2 $testdir/file2.chk || echo "file2 and file2.chk should match"
>
> echo "Compare the CoW'd section to the before file"
> _compare_range $testdir/file1 0 $testdir/file2 0 $blksz \
> @@ -81,46 +81,46 @@ _compare_range $testdir/file1 $((blksz * 48 - 512)) \
> || echo "End sections do not match (intentional)"
>
> echo "Compare the CoW'd section to the after file"
> -_compare_range $testdir/file2 0 $testdir/file3 0 $blksz \
> +_compare_range $testdir/file2 0 $testdir/file2.chk 0 $blksz \
> || echo "Start sections do not match"
>
> _compare_range $testdir/file2 $((blksz * 16 - 512)) \
> - $testdir/file3 $((blksz * 16 - 512)) 512 \
> + $testdir/file2.chk $((blksz * 16 - 512)) 512 \
> || echo "Middle sections do not match"
>
> _compare_range $testdir/file2 $((blksz * 48 - 512)) \
> - $testdir/file3 $((blksz * 48 - 512)) $blksz \
> + $testdir/file2.chk $((blksz * 48 - 512)) $blksz \
> || echo "End sections do not match"
>
> echo "Compare the not CoW'd sections"
> _compare_range $testdir/file1 $blksz $testdir/file2 $blksz 512 \
> - || echo "Start sections of 1-2 do not match"
> -_compare_range $testdir/file2 $blksz $testdir/file3 $blksz 512 \
> - || echo "Start sections of 2-3 do not match"
> + || echo "Start sections of file1 and file2 do not match"
> +_compare_range $testdir/file2 $blksz $testdir/file2.chk $blksz 512 \
> + || echo "Start sections of file2 and file2.chk do not match"
>
> _compare_range $testdir/file1 $((blksz * 16 - 1024)) \
> $testdir/file2 $((blksz * 16 - 1024)) 512 \
> - || echo "Middle sections of 1-2 do not match"
> + || echo "Middle sections of file1 and file2 do not match"
>
> _compare_range $testdir/file2 $((blksz * 16 - 1024)) \
> - $testdir/file3 $((blksz * 16 - 1024)) 512 \
> - || echo "Middle sections of 2-3 do not match"
> + $testdir/file2.chk $((blksz * 16 - 1024)) 512 \
> + || echo "Middle sections of file2 and file2.chk do not match"
>
> _compare_range $testdir/file1 $((blksz * 48 - 1024)) \
> $testdir/file2 $((blksz * 48 - 1024)) 512 \
> - || echo "End sections of 1-2 do not match"
> + || echo "End sections of file1 and file2 do not match"
>
> _compare_range $testdir/file2 $((blksz * 48 - 1024)) \
> - $testdir/file3 $((blksz * 48 - 1024)) 512 \
> - || echo "End sections of 2-3 do not match"
> + $testdir/file2.chk $((blksz * 48 - 1024)) 512 \
> + || echo "End sections of file2 and file2.chk do not match"
>
> _compare_range $testdir/file1 $((blksz * 16)) \
> $testdir/file2 $((blksz * 16)) 512 \
> - || echo "Untouched sections of 1-2 do not match"
> + || echo "Untouched sections of file1 and file2 do not match"
>
> _compare_range $testdir/file2 $((blksz * 16)) \
> - $testdir/file3 $((blksz * 16)) 512 \
> - || echo "Untouched sections of 2-3 do not match"
> + $testdir/file2.chk $((blksz * 16)) 512 \
> + || echo "Untouched sections of file2 and file2.chk do not match"
>
> # success, all done
> status=0
> diff --git a/tests/generic/139.out b/tests/generic/139.out
> index 28d04f5f..56d6c9f9 100644
> --- a/tests/generic/139.out
> +++ b/tests/generic/139.out
> @@ -3,14 +3,14 @@ Create the original files
> Compare files
> 60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-139/file1
> 60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-139/file2
> -60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-139/file3
> +60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-139/file2.chk
> directio CoW the second file
> Compare files
> 60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-139/file1
> ff5626fb6c71b242d6b1a43de25c9a85 TEST_DIR/test-139/file2
> -ff5626fb6c71b242d6b1a43de25c9a85 TEST_DIR/test-139/file3
> -Files 1-2 should not match (intentional)
> -Files 1-3 should not match (intentional)
> +ff5626fb6c71b242d6b1a43de25c9a85 TEST_DIR/test-139/file2.chk
> +file1 and file2 should not match (intentional)
> +file1 and file2.chk should not match (intentional)
> Compare the CoW'd section to the before file
> Start sections do not match (intentional)
> Middle sections do not match (intentional)
> diff --git a/tests/generic/140 b/tests/generic/140
> index 6cba5791..52cf07dc 100755
> --- a/tests/generic/140
> +++ b/tests/generic/140
> @@ -35,37 +35,37 @@ echo "Create the original files"
> blksz=65536
> _pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file1 >> $seqres.full
> _cp_reflink $testdir/file1 $testdir/file2 >> $seqres.full
> -_pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file3 >> $seqres.full
> +_pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file2.chk >> $seqres.full
> _test_cycle_mount
>
> echo "Compare files"
> md5sum $testdir/file1 | _filter_test_dir
> md5sum $testdir/file2 | _filter_test_dir
> -md5sum $testdir/file3 | _filter_test_dir
> +md5sum $testdir/file2.chk | _filter_test_dir
>
> -cmp -s $testdir/file1 $testdir/file2 || echo "Files 1-2 do not match"
> -cmp -s $testdir/file1 $testdir/file3 || echo "Files 1-3 do not match"
> -cmp -s $testdir/file2 $testdir/file3 || echo "Files 2-3 do not match"
> +cmp -s $testdir/file1 $testdir/file2 || echo "file1 and file2 do not match"
> +cmp -s $testdir/file1 $testdir/file2.chk || echo "file1 and file2.chk do not match"
> +cmp -s $testdir/file2 $testdir/file2.chk || echo "file2 and file2.chk do not match"
>
> echo "mmap CoW the second file"
> _mwrite_byte 0x62 0 17 $((blksz * 48 - 3)) $testdir/file2 >> $seqres.full
> -_mwrite_byte 0x62 0 17 $((blksz * 48 - 3)) $testdir/file3 >> $seqres.full
> +_mwrite_byte 0x62 0 17 $((blksz * 48 - 3)) $testdir/file2.chk >> $seqres.full
>
> _mwrite_byte 0x62 $((blksz * 16 - 34)) 17 $((blksz * 48 - 3)) $testdir/file2 >> $seqres.full
> -_mwrite_byte 0x62 $((blksz * 16 - 34)) 17 $((blksz * 48 - 3)) $testdir/file3 >> $seqres.full
> +_mwrite_byte 0x62 $((blksz * 16 - 34)) 17 $((blksz * 48 - 3)) $testdir/file2.chk >> $seqres.full
>
> _mwrite_byte 0x62 $((blksz * 48 - 20)) 17 $((blksz * 48 - 3)) $testdir/file2 >> $seqres.full
> -_mwrite_byte 0x62 $((blksz * 48 - 20)) 17 $((blksz * 48 - 3)) $testdir/file3 >> $seqres.full
> +_mwrite_byte 0x62 $((blksz * 48 - 20)) 17 $((blksz * 48 - 3)) $testdir/file2.chk >> $seqres.full
> _test_cycle_mount
>
> echo "Compare files"
> md5sum $testdir/file1 | _filter_test_dir
> md5sum $testdir/file2 | _filter_test_dir
> -md5sum $testdir/file3 | _filter_test_dir
> +md5sum $testdir/file2.chk | _filter_test_dir
>
> -cmp -s $testdir/file1 $testdir/file2 || echo "Files 1-2 do not match (intentional)"
> -cmp -s $testdir/file1 $testdir/file3 || echo "Files 1-3 do not match (intentional)"
> -cmp -s $testdir/file2 $testdir/file3 || echo "Files 2-3 do not match"
> +cmp -s $testdir/file1 $testdir/file2 || echo "file1 and file2 do not match (intentional)"
> +cmp -s $testdir/file1 $testdir/file2.chk || echo "file1 and file2.chk do not match (intentional)"
> +cmp -s $testdir/file2 $testdir/file2.chk || echo "file2 and file2.chk do not match"
>
> echo "Compare the CoW'd section to the before file"
> _compare_range $testdir/file1 0 $testdir/file2 0 17 \
> @@ -80,47 +80,47 @@ _compare_range $testdir/file1 $((blksz * 48 - 20)) \
> || echo "End sections do not match (intentional)"
>
> echo "Compare the CoW'd section to the after file"
> -_compare_range $testdir/file2 0 $testdir/file3 0 17 \
> +_compare_range $testdir/file2 0 $testdir/file2.chk 0 17 \
> || echo "Start sections do not match"
>
> _compare_range $testdir/file2 $((blksz * 16 - 34)) \
> - $testdir/file3 $((blksz * 16 - 34)) 17 \
> + $testdir/file2.chk $((blksz * 16 - 34)) 17 \
> || echo "Middle sections do not match"
>
> _compare_range $testdir/file2 $((blksz * 48 - 20)) \
> - $testdir/file3 $((blksz * 48 - 20)) 17 \
> + $testdir/file2.chk $((blksz * 48 - 20)) 17 \
> || echo "End sections do not match"
>
> echo "Compare the not CoW'd sections"
> _compare_range $testdir/file1 18 $testdir/file2 18 17 \
> - || echo "Start sections of 1-2 do not match"
> + || echo "Start sections of file1 and file2 do not match"
>
> -_compare_range $testdir/file2 18 $testdir/file3 18 17 \
> - || echo "Start sections of 2-3 do not match"
> +_compare_range $testdir/file2 18 $testdir/file2.chk 18 17 \
> + || echo "Start sections of file2 and file2.chk do not match"
>
> _compare_range $testdir/file1 $((blksz * 16 - 17)) \
> $testdir/file2 $((blksz * 16 - 17)) 82 \
> - || echo "Middle sections of 1-2 do not match"
> + || echo "Middle sections of file1 and file2 do not match"
>
> _compare_range $testdir/file2 $((blksz * 16 - 17)) \
> - $testdir/file3 $((blksz * 16 - 17)) 82 \
> - || echo "Middle sections of 2-3 do not match"
> + $testdir/file2.chk $((blksz * 16 - 17)) 82 \
> + || echo "Middle sections of file2 and file2.chk do not match"
>
> _compare_range $testdir/file1 $((blksz * 48 - 120)) \
> $testdir/file2 $((blksz * 48 - 120)) 100 \
> - || echo "End sections of 1-2 do not match"
> + || echo "End sections of file1 and file2 do not match"
>
> _compare_range $testdir/file2 $((blksz * 48 - 120)) \
> - $testdir/file3 $((blksz * 48 - 120)) 100 \
> - || echo "End sections of 2-3 do not match"
> + $testdir/file2.chk $((blksz * 48 - 120)) 100 \
> + || echo "End sections of file2 and file2.chk do not match"
>
> _compare_range $testdir/file1 $((blksz * 14)) \
> $testdir/file2 $((blksz * 14)) $blksz \
> - || echo "Untouched sections of 1-2 do not match"
> + || echo "Untouched sections of file1 and file2 do not match"
>
> _compare_range $testdir/file2 $((blksz * 14)) \
> - $testdir/file3 $((blksz * 14)) $blksz \
> - || echo "Untouched sections of 2-3 do not match"
> + $testdir/file2.chk $((blksz * 14)) $blksz \
> + || echo "Untouched sections of file2 and file2.chk do not match"
>
> # success, all done
> status=0
> diff --git a/tests/generic/140.out b/tests/generic/140.out
> index 51a5b854..89389001 100644
> --- a/tests/generic/140.out
> +++ b/tests/generic/140.out
> @@ -3,14 +3,14 @@ Create the original files
> Compare files
> 60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-140/file1
> 60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-140/file2
> -60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-140/file3
> +60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-140/file2.chk
> mmap CoW the second file
> Compare files
> 60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-140/file1
> 795ecfd281dbda4916431376228e4187 TEST_DIR/test-140/file2
> -795ecfd281dbda4916431376228e4187 TEST_DIR/test-140/file3
> -Files 1-2 do not match (intentional)
> -Files 1-3 do not match (intentional)
> +795ecfd281dbda4916431376228e4187 TEST_DIR/test-140/file2.chk
> +file1 and file2 do not match (intentional)
> +file1 and file2.chk do not match (intentional)
> Compare the CoW'd section to the before file
> Start sections do not match (intentional)
> Middle sections do not match (intentional)
> --
> 2.33.0
>
>
>
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-10-29 15:48 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-29 6:59 [PATCH 0/3] Random fixes for generic Shiyang Ruan
2021-10-29 6:59 ` [PATCH 1/3] generic/138,139,140: fix the name for check file Shiyang Ruan
2021-10-29 15:48 ` Darrick J. Wong
2021-10-29 6:59 ` [PATCH 2/3] generic: fix description or typo in head comment Shiyang Ruan
2021-10-29 7:59 ` [PATCH v1.1 " Shiyang Ruan
2021-10-29 15:41 ` [PATCH " Darrick J. Wong
2021-10-29 6:59 ` [PATCH 3/3] generic/201: fix the description Shiyang Ruan
2021-10-29 15:41 ` Darrick J. Wong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).