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 34b9c793bdccc54ecf914a3f7042e176b1882570..b1fdb0e41589640b9e3bc116476cbf87349f40eb 100644 (file)
--- 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 7a815607892fa61d80ddea32eeea0b29416e07a3..ca6d27d01e4a165df9f1717b7cae6b43612cd307 100644 (file)
--- 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
+
 }
 
 #