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 0b0ce507529a82ad3e09d5869c61e4dd37f6e2cb..6f79d6d4aed77a218ac259be36c7b0989afabdfe 100755 (executable)
--- 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
         _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()
 }
 
 _log_traffic()

diff --git a/common.filter b/common.filter
index a4912cc9dc8c70be4b843333469457a14e52fc9c..5cd982e436b96d7873a8b3a9fb9159f193c3d315 100644 (file)
--- 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";
     }
        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";
     }
        /^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";
     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";