From: ptools <ptools>
Date: Wed, 21 Jan 2004 00:43:00 +0000 (+0000)
Subject: Fix up failure of log qa test 018 due to running with Electric Fence
X-Git-Tag: v1.1.0~881
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=62f10f75b7092bde8fc5026123b6e542e3c19386;p=users%2Fhch%2Fxfstests-dev.git

Fix up failure of log qa test 018 due to running with Electric Fence
and somehow me not checking in my 018.noquota.op change in ages ago
and left in my workarea.
This change was done at the time of a change to common.log but somehow
didn't get checked in.
---

diff --git a/018.noquota.op b/018.noquota.op
index 34b9c793b..b1fdb0e41 100644
--- a/018.noquota.op
+++ b/018.noquota.op
@@ -5507,7 +5507,6 @@ icount:<COUNT> ifree:<FREE> fdblks:<BLOCKS> frext:<COUNT>
 Oper (1738): tid: <TID> len:<LEN> clientid: TRANS flags: COMMIT
 Oper (0): tid: <TID> len:<LEN> clientid: LOG flags: UNMOUNT
 Unmount filesystem
-xfs_logprint: skipped <COUNT> cleared blocks in range: <COUNT> - <COUNT>
 xfs_logprint: skipped <COUNT> zeroed blocks in range: <COUNT> - <COUNT>
 xfs_logprint: physical end of log
 xfs_logprint: logical end of log
diff --git a/common.log b/common.log
index 7a8156078..ca6d27d01 100644
--- a/common.log
+++ b/common.log
@@ -128,6 +128,7 @@ BEGIN {
 
 _filter_logprint()
 {
+    _fix_malloc |\
     sed '
         s/data device: 0x[0-9a-f][0-9a-f]*/data device: <DEVICE>/;
         s/log device: 0x[0-9a-f][0-9a-f]*/log device: <DEVICE>/;
@@ -166,8 +167,7 @@ _filter_logprint()
 	/^[ 	]*$/d;
 	s/  */ /g;
 	s/ $//;
-    ' \
-    | _fix_malloc
+    '
 }
 
 _check_log()
@@ -316,6 +316,11 @@ _clear_opts()
     # - remove the log options in mount
     # - remove the quota options in mount
     # leave any other options given
+    # fix up removals when remaining -o or comma:
+    #   "-o blah," -> "-o blah"
+    #   "-o blah, -x woof" -> "-o blah -x woof"
+    #   "-x woof -o   " -> "-x woof"   
+    #   "-x woof -o  -y wow" -> "-x woof -y wow"   
     MKFS_OPTIONS=`echo $MKFS_OPTIONS | sed -e 's/-l[ ]*[^ $]*//g'`
     MOUNT_OPTIONS=`echo $MOUNT_OPTIONS |\
 	    sed -e 's/logbsize=[^ ,]*,*//g' \
@@ -324,13 +329,18 @@ _clear_opts()
 		-e 's/quota,*//g'           \
 		-e 's/uqnoenforce,*//g'     \
 		-e 's/gqnoenforce,*//g'     \
-		-e 's/-o *$//g'		    \
+		-e 's/\(-o[^-,]*\), *$/\1/g'    \
+		-e 's/\(-o[^-,]*\), *-/\1 -/g'  \
+ 		-e 's/-o *$//g'		    \
 		-e 's/-o *-/-/g'	    \
 		`
 	
     # export opts
     export MKFS_OPTIONS
     export MOUNT_OPTIONS
+    echo "MKFS_OPTIONS = $MKFS_OPTIONS" >>$seq.full
+    echo "MOUNT_OPTIONS = $MOUNT_OPTIONS" >>$seq.full
+
 }
 
 #