public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Dave Chinner <david@fromorbit.com>
To: xfs@oss.sgi.com
Subject: [PATCH 3/5] xfstests: filter EA paths used by dump
Date: Wed,  1 May 2013 18:32:01 +1000	[thread overview]
Message-ID: <1367397123-2530-4-git-send-email-david@fromorbit.com> (raw)
In-Reply-To: <1367397123-2530-1-git-send-email-david@fromorbit.com>

From: Dave Chinner <dchinner@redhat.com>

Test 063 fails because the diff output now has entire paths to the
files in the results directory in it rather than just the file name.
Add the results directory to the directory filter used by the dump
tests to remove the path from the diff output.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
 common/dump |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/dump b/common/dump
index 73d0304..7fe50f6 100644
--- a/common/dump
+++ b/common/dump
@@ -927,6 +927,7 @@ _dir_filter()
     -e "s#$restore_sdir#RESTORE_SUBDIR#g" \
     -e "s#$$#PID#g" \
     -e "/Only in SCRATCH_MNT: .use_space/d" \
+    -e "s#$RESULT_DIR/##g" \
 
 }
 
@@ -1358,7 +1359,7 @@ _diff_compare_eas()
     | sed -e "s#$restore_sdir\/##" \
     | tee $seqres.ea2 \
     | _dir_filter
-    diff -s $seqres.ea1 $seqres.ea2
+    diff -s $seqres.ea1 $seqres.ea2 | _dir_filter
 }
 
 
-- 
1.7.10.4

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

  parent reply	other threads:[~2013-05-01  8:32 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-01  8:31 [PATCH 0/5] xfstests: various fixes Dave Chinner
2013-05-01  8:31 ` [PATCH 1/5] xfstests: fix last test runtime output Dave Chinner
2013-05-03 14:24   ` Rich Johnston
2013-05-01  8:32 ` [PATCH 2/5] xfstests: 310 fails with existing directory error Dave Chinner
2013-05-03 14:25   ` Rich Johnston
2013-05-01  8:32 ` Dave Chinner [this message]
2013-05-03 14:25   ` [PATCH 3/5] xfstests: filter EA paths used by dump Rich Johnston
2013-05-01  8:32 ` [PATCH 4/5] xfstests: fix incorrect redirect in generic/232 Dave Chinner
2013-05-03 14:26   ` Rich Johnston
2013-05-01  8:32 ` [PATCH 5/5] xfstests: fix broken redirects in generic/131 Dave Chinner
2013-05-03 14:26   ` Rich Johnston
2013-05-01  9:31 ` [PATCH 0/5] xfstests: various fixes Dave Chinner
2013-05-03 14:32   ` Rich Johnston

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=1367397123-2530-4-git-send-email-david@fromorbit.com \
    --to=david@fromorbit.com \
    --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