From: Zorro Lang <zlang@redhat.com>
Date: Wed, 22 Mar 2017 06:46:28 +0000 (+0800)
Subject: common/rc: support gluster volume start with a slash
X-Git-Tag: v2022.05.01~2112
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7687a3293c96b9cdccf716545e059842d5a5f982;p=users%2Fhch%2Fxfstests-dev.git

common/rc: support gluster volume start with a slash

The format of glusterfs' TEST_DEV or SCRATCH_DEV is XXX:XXX or
XXX:/XXX, but xfstests can't accept the latter now. So change
the regular expression from "\w:\w" to ":/?", to accept more
glusterfs device format.

Signed-off-by: Zorro Lang <zlang@redhat.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
---

diff --git a/common/rc b/common/rc
index edfba5d25..e1ab2c677 100644
--- a/common/rc
+++ b/common/rc
@@ -1496,7 +1496,7 @@ _require_scratch_nocheck()
 {
     case "$FSTYP" in
 	glusterfs)
-		echo $SCRATCH_DEV | grep -q "\w:\w" > /dev/null 2>&1
+		echo $SCRATCH_DEV | egrep -q ":/?" > /dev/null 2>&1
 		if [ -z "$SCRATCH_DEV" -o "$?" != "0" ]; then
 			_notrun "this test requires a valid \$SCRATCH_DEV"
 		fi
@@ -1584,7 +1584,7 @@ _require_test()
 {
     case "$FSTYP" in
 	glusterfs)
-		echo $TEST_DEV | grep -q "\w:\w" > /dev/null 2>&1
+		echo $TEST_DEV | egrep -q ":/?" > /dev/null 2>&1
 		if [ -z "$TEST_DEV" -o "$?" != "0" ]; then
 			_notrun "this test requires a valid \$TEST_DEV"
 		fi