From: Nathan Scott <nathans@sgi.com>
Date: Wed, 28 Jun 2006 06:07:54 +0000 (+0000)
Subject: Prevent test 016 from running if mkfs options create an unworkable log for its purposes.
X-Git-Tag: v1.1.0~620
X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=0b79635a7870e34d59fca9adbcb16175224f56e8

Prevent test 016 from running if mkfs options create an unworkable log for its purposes.
Merge of master-melb:xfs-cmds:26369a by kenmcd.
---

diff --git a/016 b/016
index 0b0ce507..6f79d6d4 100755
--- a/016
+++ b/016
@@ -57,6 +57,8 @@ _init()
         _notrun "Cannot mkfs for this test using MKFS_OPTIONS specified"
     _filter_mkfs <$tmp.mkfs0 >/dev/null 2>$tmp.mkfs
     . $tmp.mkfs
+    [ $logsunit -ne 0 ] && \
+        _notrun "Cannot run this test using log MKFS_OPTIONS specified"
 }
 
 _log_traffic()
diff --git a/common.filter b/common.filter
index a4912cc9..5cd982e4 100644
--- a/common.filter
+++ b/common.filter
@@ -136,11 +136,14 @@ _filter_mkfs()
 	print STDERR "dirversion=$1\ndirbsize=$2\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+)/) {
 	print STDERR "ldev=\"$1\"\nlbsize=$2\nlblocks=$3\nlversion=$4\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+)/) {
 	print STDERR "rtdev=$1\nrtextsz=$2\nrtblocks=$3\nrtextents=$4\n";
 	print STDOUT "realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX\n";