From 7687a3293c96b9cdccf716545e059842d5a5f982 Mon Sep 17 00:00:00 2001 From: Zorro Lang Date: Wed, 22 Mar 2017 14:46:28 +0800 Subject: [PATCH] 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 Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- common/rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/rc b/common/rc index edfba5d2..e1ab2c67 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 -- 2.39.5