From: Mohamed Barwani <mohamedb@sgi.com>
Date: Fri, 30 Nov 2007 03:07:14 +0000 (+0000)
Subject: Change common mkfs filter to fit the new changes.
X-Git-Tag: v1.1.0~425
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=10d8635dd3b7c7b85ef9b8394f3d4bde8c21686e;p=xfstests-dev.git

Change common mkfs filter to fit the new changes.
Merge of master-melb:xfs-cmds:30162a by kenmcd.

  explicitly mention the log version instead of assuming the default, with further filter changes.
---

diff --git a/096 b/096
index d9dfd488..55a42a35 100755
--- a/096
+++ b/096
@@ -57,6 +57,7 @@ _mkfs_filter()
 	-e 's/blocks=[0-9][0-9]*/blocks=N/' \
 	-e 's/agsize=[0-9][0-9]*/agsize=N/' \
 	-e 's/agcount=[0-9][0-9]*/agcount=N/' \
+        -e 's/swidth=[0-9][0-9]* blks$/&, unwritten=1/' \
 	-e 's/rtextents=[0-9][0-9]*/rtextents=N/' \
 	-e 's/meta-data=[^ ]*/meta-data=DEV/' \
         -e 's/ *isize/ isize/' \
@@ -105,9 +106,9 @@ cat >$tmp.seq.params <<EOF
 # same test but get log stripe from data stripe
   -l version=2 -d su=$big_su,sw=1
 # test out data stripe
-  -d su=$big_su,sw=1
+  -l version=1 -d su=$big_su,sw=1
 # test out data stripe the same but using sunit & swidth
-  -d sunit=`expr $big_su / 512`,swidth=`expr $big_su / 512`
+  -l version=1 -d sunit=`expr $big_su / 512`,swidth=`expr $big_su / 512`
 EOF
 
 
diff --git a/096.internal b/096.internal
index e6717d9b..e0e1ee4b 100644
--- a/096.internal
+++ b/096.internal
@@ -32,7 +32,7 @@ realtime =REALTIME               extsz=N, blocks=N, rtextents=N
 
 
 # test out data stripe
---- mkfs=-d su=266240,sw=1 ---
+--- mkfs=-l version=1 -d su=266240,sw=1 ---
 meta-data=DEV isize=256    agcount=N, agsize=N blks
 data     =                       bsize=4096   blocks=N, imaxpct=25
          =                       sunit=65     swidth=65 blks, unwritten=1
@@ -43,7 +43,7 @@ realtime =REALTIME               extsz=N, blocks=N, rtextents=N
 
 
 # test out data stripe the same but using sunit & swidth
---- mkfs=-d sunit=520,swidth=520 ---
+--- mkfs=-l version=1 -d sunit=520,swidth=520 ---
 meta-data=DEV isize=256    agcount=N, agsize=N blks
 data     =                       bsize=4096   blocks=N, imaxpct=25
          =                       sunit=65     swidth=65 blks, unwritten=1
diff --git a/common.filter b/common.filter
index 199b0c45..d1d4cb51 100644
--- a/common.filter
+++ b/common.filter
@@ -131,8 +131,8 @@ _filter_mkfs()
 	print STDERR "dbsize=$1\ndblocks=$2\nimaxpct=$3\n";
 	print STDOUT "data     = bsize=XXX blocks=XXX, imaxpct=PCT\n";
     }
-    if (/^\s+=\s+sunit=(\d+)\s+swidth=(\d+) blks, unwritten=(\d)/) {
-	print STDERR "sunit=$1\nswidth=$2\nunwritten=$3\n";
+    if (/^\s+=\s+sunit=(\d+)\s+swidth=(\d+) blks/) {
+        print STDERR "sunit=$1\nswidth=$2\nunwritten=1\n";
 	print STDOUT "         = sunit=XXX swidth=XXX, unwritten=X\n";
     }
     if (/^naming\s+=version\s+(\d+)\s+bsize=(\d+)/) {