From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: david@fromorbit.com, darrick.wong@oracle.com
Cc: fstests@vger.kernel.org, xfs@oss.sgi.com
Subject: [PATCH 4/5] dedupe: record dedupe errors in golden output
Date: Fri, 22 Jan 2016 16:37:07 -0800 [thread overview]
Message-ID: <20160123003706.2666.81569.stgit@birch.djwong.org> (raw)
In-Reply-To: <20160123003648.2666.37062.stgit@birch.djwong.org>
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>
---
tests/generic/122.out | 1 +
tests/generic/136 | 2 ++
tests/generic/136.out | 3 +++
tests/generic/137 | 2 +-
tests/generic/182.out | 2 ++
5 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/tests/generic/122.out b/tests/generic/122.out
index c7cfec2..7925e90 100644
--- 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 89ee751..5d021f8 100755
--- 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 99a5465..f76f40a 100644
--- 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 a640f4f..9cc7948 100755
--- 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 9841b76..049a3ee 100644
--- 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
next prev parent reply other threads:[~2016-01-23 0:37 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-23 0:36 [PATCH 1/5] tools/mvtest: call out to the correct group sort program Darrick J. Wong
2016-01-23 0:36 ` [PATCH 2/5] reflink: fix off-by-one errors when iterating file blocks in a loop Darrick J. Wong
2016-01-23 11:32 ` Filipe Manana
2016-01-23 20:52 ` Darrick J. Wong
2016-01-23 22:00 ` Filipe Manana
2016-01-23 0:37 ` [PATCH 3/5] xfs/122: update against xfsprogs 4.3 Darrick J. Wong
2016-01-23 0:37 ` Darrick J. Wong [this message]
2016-01-23 0:37 ` [PATCH 5/5] tests: use lowercase variables for all the new reflink tests Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160123003706.2666.81569.stgit@birch.djwong.org \
--to=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=fstests@vger.kernel.org \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox