apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix up failure of log qa test 018 due to running with Electric Fence

Browse Source 
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.
This commit is contained in:
ptools
2004-01-21 00:43:00 +00:00
parent 8745fd5938
commit 62f10f75b7
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
018.noquota.op
-1
View File
@@ -5507,7 +5507,6 @@ icount:<COUNT> ifree:<FREE> fdblks:<BLOCKS> frext:<COUNT>
Oper (1738): tid: <TID> len:<LEN> clientid: TRANS flags: COMMIT Oper (1738): tid: <TID> len:<LEN> clientid: TRANS flags: COMMIT
Oper (0): tid: <TID> len:<LEN> clientid: LOG flags: UNMOUNT Oper (0): tid: <TID> len:<LEN> clientid: LOG flags: UNMOUNT
Unmount filesystem Unmount filesystem
xfs_logprint: skipped <COUNT> cleared blocks in range: <COUNT> - <COUNT>
xfs_logprint: skipped <COUNT> zeroed blocks in range: <COUNT> - <COUNT> xfs_logprint: skipped <COUNT> zeroed blocks in range: <COUNT> - <COUNT>
xfs_logprint: physical end of log xfs_logprint: physical end of log
xfs_logprint: logical end of log xfs_logprint: logical end of log
common.log
+13 -3
View File
@@ -128,6 +128,7 @@ BEGIN {
_filter_logprint() _filter_logprint()
{ {
_fix_malloc |\
sed ' sed '
s/data device: 0x[0-9a-f][0-9a-f]*/data device: <DEVICE>/; 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>/; s/log device: 0x[0-9a-f][0-9a-f]*/log device: <DEVICE>/;
@@ -166,8 +167,7 @@ _filter_logprint()
/^[ ]*$/d; /^[ ]*$/d;
s/ */ /g; s/ */ /g;
s/ $//; s/ $//;
' \ '
| _fix_malloc
} }
_check_log() _check_log()
@@ -316,6 +316,11 @@ _clear_opts()
# - remove the log options in mount # - remove the log options in mount
# - remove the quota options in mount # - remove the quota options in mount
# leave any other options given # 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'` MKFS_OPTIONS=`echo $MKFS_OPTIONS | sed -e 's/-l[ ]*[^ $]*//g'`
MOUNT_OPTIONS=`echo $MOUNT_OPTIONS |\ MOUNT_OPTIONS=`echo $MOUNT_OPTIONS |\
sed -e 's/logbsize=[^ ,]*,*//g' \ sed -e 's/logbsize=[^ ,]*,*//g' \
@@ -324,13 +329,18 @@ _clear_opts()
-e 's/quota,*//g' \ -e 's/quota,*//g' \
-e 's/uqnoenforce,*//g' \ -e 's/uqnoenforce,*//g' \
-e 's/gqnoenforce,*//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' \ -e 's/-o *-/-/g' \
` `
# export opts # export opts
export MKFS_OPTIONS export MKFS_OPTIONS
export MOUNT_OPTIONS export MOUNT_OPTIONS
echo "MKFS_OPTIONS = $MKFS_OPTIONS" >>$seq.full
echo "MOUNT_OPTIONS = $MOUNT_OPTIONS" >>$seq.full
} }
# #