apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

common/rc: support gluster volume start with a slash

Browse Source 
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>
This commit is contained in:
Zorro Lang
2017-03-22 14:46:28 +08:00
committed by Eryu Guan
parent 0753e1278f
commit 7687a3293c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/rc
+2 -2
View File
@@ -1496,7 +1496,7 @@ _require_scratch_nocheck()
{ {
case "$FSTYP" in case "$FSTYP" in
glusterfs) 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 if [ -z "$SCRATCH_DEV" -o "$?" != "0" ]; then
_notrun "this test requires a valid \$SCRATCH_DEV" _notrun "this test requires a valid \$SCRATCH_DEV"
fi fi
@@ -1584,7 +1584,7 @@ _require_test()
{ {
case "$FSTYP" in case "$FSTYP" in
glusterfs) 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 if [ -z "$TEST_DEV" -o "$?" != "0" ]; then
_notrun "this test requires a valid \$TEST_DEV" _notrun "this test requires a valid \$TEST_DEV"
fi fi