]> git.apps.os.sepia.ceph.com Git - xfstests-dev.git/commitdiff
xfstests: filter EA paths used by dump
authorDave Chinner <dchinner@redhat.com>
Wed, 1 May 2013 08:32:01 +0000 (08:32 +0000)
committerRich Johnston <rjohnston@sgi.com>
Fri, 3 May 2013 14:22:13 +0000 (09:22 -0500)
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>
common/dump

index 73d0304c064a3ae962e877ce87ca71b3a2e8f7a4..7fe50f68de955a7b94711d989fd7223fe2733674 100644 (file)
@@ -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
 }