From: Dave Chinner <dchinner@redhat.com>
Date: Wed, 1 May 2013 08:32:01 +0000 (+0000)
Subject: xfstests: filter EA paths used by dump
X-Git-Tag: v2022.05.01~3448
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3ac75605de1fbbaae9505799b46c44fbe053f04e;p=users%2Fhch%2Fxfstests-dev.git

xfstests: filter EA paths used by dump

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>
Reviewed-by: Rich Johnston <rjohnston@sgi.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>
---

diff --git a/common/dump b/common/dump
index 73d0304c0..7fe50f68d 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
 }