xfs
[Top] [All Lists]

[PATCH 3/5] xfstests: filter EA paths used by dump

To: xfs@xxxxxxxxxxx
Subject: [PATCH 3/5] xfstests: filter EA paths used by dump
From: Dave Chinner <david@xxxxxxxxxxxxx>
Date: Wed, 1 May 2013 18:32:01 +1000
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1367397123-2530-1-git-send-email-david@xxxxxxxxxxxxx>
References: <1367397123-2530-1-git-send-email-david@xxxxxxxxxxxxx>
From: Dave Chinner <dchinner@xxxxxxxxxx>

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@xxxxxxxxxx>
---
 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

<Prev in Thread] Current Thread [Next in Thread>