Prevent test 016 from running if mkfs options create an unworkable log for its purposes.

Merge of master-melb:xfs-cmds:26369a by kenmcd.
This commit is contained in:
Nathan Scott
2006-06-28 06:07:54 +00:00
parent ff8c3df50d
commit 0b79635a78
2 changed files with 6 additions and 1 deletions
+2
View File
@@ -57,6 +57,8 @@ _init()
_notrun "Cannot mkfs for this test using MKFS_OPTIONS specified" _notrun "Cannot mkfs for this test using MKFS_OPTIONS specified"
_filter_mkfs <$tmp.mkfs0 >/dev/null 2>$tmp.mkfs _filter_mkfs <$tmp.mkfs0 >/dev/null 2>$tmp.mkfs
. $tmp.mkfs . $tmp.mkfs
[ $logsunit -ne 0 ] && \
_notrun "Cannot run this test using log MKFS_OPTIONS specified"
} }
_log_traffic() _log_traffic()
+4 -1
View File
@@ -136,11 +136,14 @@ _filter_mkfs()
print STDERR "dirversion=$1\ndirbsize=$2\n"; print STDERR "dirversion=$1\ndirbsize=$2\n";
print STDOUT "naming =VERN bsize=XXX\n"; print STDOUT "naming =VERN bsize=XXX\n";
} }
if (/^log\s+=(internal log|[\w|\/.-]+)\s+bsize=(\d+)\s+blocks=(\d+),\s+version=(\d+)/ || if (/^log\s+=(internal log|[\w|\/.-]+)\s+bsize=(\d+)\s+blocks=(\d+),\s+version=(\d+)/ ||
/^log\s+=(internal log|[\w|\/.-]+)\s+bsize=(\d+)\s+blocks=(\d+)/) { /^log\s+=(internal log|[\w|\/.-]+)\s+bsize=(\d+)\s+blocks=(\d+)/) {
print STDERR "ldev=\"$1\"\nlbsize=$2\nlblocks=$3\nlversion=$4\n"; print STDERR "ldev=\"$1\"\nlbsize=$2\nlblocks=$3\nlversion=$4\n";
print STDOUT "log =LDEV bsize=XXX blocks=XXX\n"; print STDOUT "log =LDEV bsize=XXX blocks=XXX\n";
} }
if (/^\s+=\s+sectsz=(\d+)\s+sunit=(\d+) blks/) {
print STDERR "logsectsz=$1\nlogsunit=$2\n\n";
}
if (/^realtime\s+=([\w|\/.-]+)\s+extsz=(\d+)\s+blocks=(\d+), rtextents=(\d+)/) { if (/^realtime\s+=([\w|\/.-]+)\s+extsz=(\d+)\s+blocks=(\d+), rtextents=(\d+)/) {
print STDERR "rtdev=$1\nrtextsz=$2\nrtblocks=$3\nrtextents=$4\n"; print STDERR "rtdev=$1\nrtextsz=$2\nrtblocks=$3\nrtextents=$4\n";
print STDOUT "realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX\n"; print STDOUT "realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX\n";