dedupe: record dedupe errors in golden output

The xfs_io dedupe command originally didn't print dedupe errors
to stderr like you'd expect.  Since that was fixed, the golden
output should be changed to reflect that.

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/122.out b/tests/generic/122.out
index c7cfec21e59dc01780e3131ad8465ddb198edfec..7925e903ff324bda7e2352087ba56d5d11a2c866 100644 (file)
--- a/tests/generic/122.out
+++ b/tests/generic/122.out
@@ -4,6 +4,7 @@ Create the original files
 5e3501f97fd2669babfcbd3e1972e833  TEST_DIR/test-122/file2
 Files 1-2 do not match (intentional)
 (Fail to) dedupe the middle blocks together
+dedupe: Extents did not match.
 Compare sections
 35ac8d7917305c385c30f3d82c30a8f6  TEST_DIR/test-122/file1
 5e3501f97fd2669babfcbd3e1972e833  TEST_DIR/test-122/file2

diff --git a/tests/generic/136 b/tests/generic/136
index 89ee751d223168c98edc4db95864a6998a6ca2a7..5d021f868b4625e01a576b98037d10f4b2d938ce 100755 (executable)
--- a/tests/generic/136
+++ b/tests/generic/136
@@ -82,7 +82,9 @@ test "${C2}" != "${C4}" || echo "file2 and file4 should not match"
 test "${C3}" = "${C4}" || echo "file3 and file4 should match"
 
 echo "Dedupe the last blocks together"
+echo "1->2"
 _dedupe_range "$TESTDIR/file1" $BLKSZ "$TESTDIR/file2" $BLKSZ 37 >> "$seqres.full"
+echo "1->3"
 _dedupe_range "$TESTDIR/file1" $BLKSZ "$TESTDIR/file3" $BLKSZ 37 >> "$seqres.full"
 _test_remount
 

diff --git a/tests/generic/136.out b/tests/generic/136.out
index 99a54652d0efe644ce76c88bc8fe49fe52dd247f..f76f40a3a76e5c3d198703311fb603489d48bc15 100644 (file)
--- a/tests/generic/136.out
+++ b/tests/generic/136.out
@@ -5,6 +5,9 @@ c4fd505be25a0c91bcca9f502b9a8156  TEST_DIR/test-136/file2
 07ac67bf7f271195442509e79cde4cee  TEST_DIR/test-136/file3
 07ac67bf7f271195442509e79cde4cee  TEST_DIR/test-136/file4
 Dedupe the last blocks together
+1->2
+1->3
+dedupe: Extents did not match.
 c4fd505be25a0c91bcca9f502b9a8156  TEST_DIR/test-136/file1
 c4fd505be25a0c91bcca9f502b9a8156  TEST_DIR/test-136/file2
 07ac67bf7f271195442509e79cde4cee  TEST_DIR/test-136/file3

diff --git a/tests/generic/137 b/tests/generic/137
index a640f4f25397091ce7e1c4b05ae5ea37cf9aeec7..9cc7948e8112ac47518c26edef40b50aaf7380a1 100755 (executable)
--- a/tests/generic/137
+++ b/tests/generic/137
@@ -83,7 +83,7 @@ done
 echo "Dedupe block two to the sevens"
 seq 1 $((NR_BLKS / 7)) | while read nr; do
        _dedupe_range "$TESTDIR/file1" $((BLKSZ * 2)) "$TESTDIR/file1" \
-                       $((nr * 7 * BLKSZ)) $BLKSZ >> "$seqres.full"
+                       $((nr * 7 * BLKSZ)) $BLKSZ >> "$seqres.full" 2>&1
 done
 
 _test_remount

diff --git a/tests/generic/182.out b/tests/generic/182.out
index 9841b76ea38d93e6d33dcda7163878e44ca5e7c8..049a3ee384849dae1565a5ab0edd01277f4a7d31 100644 (file)
--- a/tests/generic/182.out
+++ b/tests/generic/182.out
@@ -1,10 +1,12 @@
 QA output created by 182
 Create the original files
+dedupe: Extents did not match.
 f4820540fc0ac02750739896fe028d56  TEST_DIR/test-182/file1
 69ad53078a16243d98e21d9f8704a071  TEST_DIR/test-182/file2
 69ad53078a16243d98e21d9f8704a071  TEST_DIR/test-182/file2.chk
 Compare against check files
 Make the original file almost dedup-able
+dedupe: Extents did not match.
 f4820540fc0ac02750739896fe028d56  TEST_DIR/test-182/file1
 158d4e3578b94b89cbb44493a2110fb9  TEST_DIR/test-182/file2
 158d4e3578b94b89cbb44493a2110fb9  TEST_DIR/test-182/file2.chk