From: Dean Roehrich <roehrich@sgi.com>
Date: Tue, 6 Jan 2004 18:44:26 +0000 (+0000)
Subject: Fix some regexps in xfstests
X-Git-Tag: v1.1.0~885
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=496086eaaf91626f0c05cba744fb25af803ac644;p=xfstests-dev.git

Fix some regexps in xfstests
Fix regexp for xvm devices
---

diff --git a/052 b/052
index d7d64416..87a4a0db 100755
--- a/052
+++ b/052
@@ -97,14 +97,14 @@ setquota -$type $id 1001 1001 10 10 $SCRATCH_DEV
 
 # cross check blks, softblks, hardblks <-> quota, xfs_db
 quota -$type $id | tee -a $seq.full | perl -ne '
-	if (m,^\s*'$SCRATCH_DEV'\s+(\d+)\s+(\d+)\s+(\d+), ||
+	if (m[^\s*'$SCRATCH_DEV'\s+(\d+)\s+(\d+)\s+(\d+)] ||
 		($next == 1 && m,^\s+(\d+)\s+(\d+)\s+(\d+),)) {
 		print "used_blocks=", $1, "\n";
 		print "soft_blocks=", $2, "\n";
 		print "hard_blocks=", $3, "\n";
 		$next = 0;
 	}
-	elsif (m,^\s*'$SCRATCH_DEV',) {		# devfs (long) names
+	elsif (m[^\s*'$SCRATCH_DEV']) {		# devfs (long) names
 		$next = 1;
 	}' | LC_COLLATE=POSIX sort >$tmp.quota
 
diff --git a/common.filter b/common.filter
index eff2d728..2fef3033 100644
--- a/common.filter
+++ b/common.filter
@@ -150,7 +150,7 @@ _filter_mkfs()
 {
     set -
     perl -ne '
-    if (/^meta-data=([\w|\/.-]+)\s+isize=(\d+)\s+agcount=(\d+), agsize=(\d+) blks/) {
+    if (/^meta-data=([\w,|\/.-]+)\s+isize=(\d+)\s+agcount=(\d+), agsize=(\d+) blks/) {
 	print STDERR "ddev=$1\nisize=$2\nagcount=$3\nagsize=$4\n";
 	print STDOUT "meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks\n";
     }
diff --git a/common.quota b/common.quota
index 5d691613..734dacd9 100644
--- a/common.quota
+++ b/common.quota
@@ -90,7 +90,7 @@ _filter_repquota()
 {
     head -$1 | perl -ne "
 	s/^(\w+)\s+([-|+])/[NAME]    \2/g;
-	s,$SCRATCH_DEV,[DEVICE],g;
+	s($SCRATCH_DEV)([DEVICE])g;
 	print"
 }