Added filter to allow older versions of xfsdump to pass xfsqa

[xfstests-dev.git] / common.dump

diff --git a/common.dump b/common.dump
index c3b6cea0415ba87540d3f71902b22f79eb99e884..4c8e8dbe72e0f5ecff7c18b919ce18873b4b5d50 100644 (file)
--- a/common.dump
+++ b/common.dump
@@ -188,7 +188,7 @@ _require_tape()
 {
     dumptape=$1
 
-    if [ -z "$dumptape" ]; then
+    if [ -z "$dumptape" -o "@" == "$dumptape" ]; then
         echo "This test requires a dump tape - none was specified"
        echo "No dump tape specified" >$seq.notrun
        status=$NOTRUNSTS
@@ -282,10 +282,10 @@ _create_dumpdir_stress()
     then
         echo "    fsstress (count=$_count) returned $? - see $here/$seq.full"
 
-        echo "--------------------------------------"       >>$here/$here/$seq.full
-        echo "output from fsstress:"                        >>$here/$here/$seq.full
-        echo "--------------------------------------"       >>$here/$here/$seq.full
-        cat $tmp.out                                        >>$here/$here/$seq.full
+        echo "--------------------------------------"       >>$here/$seq.full
+        echo "output from fsstress:"                        >>$here/$seq.full
+        echo "--------------------------------------"       >>$here/$seq.full
+        cat $tmp.out                                        >>$here/$seq.full
         status=1
     fi
 
@@ -791,6 +791,11 @@ _dump_filter_main()
       -e 's/(pid[       ]*[1-9][0-9]*)/\(pid PID\)/'   \
       -e '/version 3\.0/d'                             \
       -e 's/\/hw\/module.*$/SCRATCH_DEV/'              \
+      -e 's/xfsdump: ino map phase 1: .*/xfsdump: ino map <PHASES>/' \
+      -e '/xfsdump: ino map phase [2]/,1d'             \
+      -e '/xfsdump: ino map phase [3]/,1d'             \
+      -e '/xfsdump: ino map phase [4]/,1d'             \
+      -e '/xfsdump: ino map phase [5]/,1d'             \
       -e 's/id:[[:space:]]*[0-9a-f]\{8\}-[0-9a-f]\{4\}-[0-9a-f]\{4\}-[0-9a-f]\{4\}-[0-9a-f]\{12\}/ID: ID/'                                             \
       -e 's/\[y\/n\][- ]----------------------*/\[y\/n\]/'             \
   | perl -ne '