From: Nathan Straz <nstraz@sgi.com>
Date: Wed, 31 Jul 2002 22:21:07 +0000 (+0000)
Subject: Fix more filters that will fail on xscsi names
X-Git-Tag: v1.1.0~1065
X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=25e71d60aaf67367036391f381a40468bbbe5a11

Fix more filters that will fail on xscsi names
---

diff --git a/029 b/029
index 4828d77a..82b1541e 100755
--- a/029
+++ b/029
@@ -63,9 +63,9 @@ fi
 _filter_logprint()
 {
 	perl -ne '
-	    s/data device: ([\w|\/]+)/data device: DDEV/;
-	    s/log device: ([\w|\/]+) daddr: (\d+) length: (\d+)/log device: LDEV daddr: XXX length: XXX/;
-	    s/log file: "([\w|\/]+)" daddr: (\d+) length: (\d+)/log device: LDEV daddr: XXX length: XXX/;
+	    s/data device: ([\w|\/.-]+)/data device: DDEV/;
+	    s/log device: ([\w|\/.-]+) daddr: (\d+) length: (\d+)/log device: LDEV daddr: XXX length: XXX/;
+	    s/log file: "([\w|\/.-]+)" daddr: (\d+) length: (\d+)/log device: LDEV daddr: XXX length: XXX/;
 	    s/skipped (\w+) zeroed blocks/skipped XXX zeroed blocks/;
             s/^uuid: *[0-9a-f-][0-9a-f-]* *format: *.*$/uuid: <UUID> format: <FORMAT>/;
 	    print;
diff --git a/044 b/044
index b994b7c3..8e47bd78 100755
--- a/044
+++ b/044
@@ -58,9 +58,9 @@ _require_logdev
 _filter_logprint()
 {
 	perl -ne '
-	    s/data device: ([\w|\/]+)/data device: DDEV/;
-	    s/log device: ([\w|\/]+) daddr: (\d+) length: (\d+)/log device: LDEV daddr: XXX length: XXX/;
-	    s/log file: "([\w|\/]+)" daddr: (\d+) length: (\d+)/log device: LDEV daddr: XXX length: XXX/;
+	    s/data device: ([\w|\/.-]+)/data device: DDEV/;
+	    s/log device: ([\w|\/.-]+) daddr: (\d+) length: (\d+)/log device: LDEV daddr: XXX length: XXX/;
+	    s/log file: "([\w|\/.-]+)" daddr: (\d+) length: (\d+)/log device: LDEV daddr: XXX length: XXX/;
 	    s/uuid: ([abcdef\d-]+)\s+format: (.+)/uuid: UUID format: FORMAT/;
 	    s/skipped (\w+) zeroed blocks/skipped XXX zeroed blocks/;
 	    print;