From: fsgqa <fsgqa>
Date: Sun, 1 Sep 2002 11:48:05 +0000 (+0000)
Subject: simple change to make this work for v2 logs - should be revisited.  loggen
X-Git-Tag: v1.1.0~1060
X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=af943cb4c61061c5e1c0f3ca8e3f5ba7023fb017

simple change to make this work for v2 logs - should be revisited.  loggen
tool needs real v2 log support...
---

diff --git a/044 b/044
index 8e47bd78..36f8ae94 100755
--- a/044
+++ b/044
@@ -2,7 +2,7 @@
 # XFS QA Test No. 044
 # $Id: 1.1 $
 #
-# external log uuid/format tests
+# external log uuid/format tests (TODO - version 2 log format)
 #
 #-----------------------------------------------------------------------
 # Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
@@ -125,9 +125,11 @@ _require_scratch
 echo -e -n "\n\r*** XFS QA 044 - expect mount failure messages\n\r\n\r" >/dev/console
 
 echo "*** mkfs"
+lversion=1
 lsize=16777216
 ldev=$SCRATCH_LOGDEV
-mkfs_xfs -llogdev=$ldev,size=$lsize $SCRATCH_DEV | _filter_mkfs 2>/dev/null
+logopts="-llogdev=$ldev,size=$lsize,version=$lversion"
+mkfs_xfs $logopts $SCRATCH_DEV | _filter_mkfs 2>/dev/null
 _check_mount
 _check_require_logdev
 
diff --git a/common.filter b/common.filter
index c7d4eea8..2b73253a 100644
--- a/common.filter
+++ b/common.filter
@@ -166,7 +166,7 @@ _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+)/) {
 	print STDERR "ldev=\"$1\"\nlbsize=$2\nlblocks=$3\nlversion=$4";
 	print STDOUT "log      =LDEV bsize=XXX blocks=XXX\n";
     }