xfs
[Top] [All Lists]

[PATCH 2/3] xfstests: Do not fail on non-existing tests/FSTYP directory

To: xfs@xxxxxxxxxxx
Subject: [PATCH 2/3] xfstests: Do not fail on non-existing tests/FSTYP directory
From: ranto.boris@xxxxxxxxx
Date: Thu, 2 May 2013 16:03:58 +0200
Cc: Boris Ranto <ranto.boris@xxxxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=VC65NrU+FTd79CGLsc11Zr1tteyI4HZRtcZ3YfirNpo=; b=xbiO3WLcehy5eaBo3aqO+vShjVWaJxRf+/rOZodxaxZDWWSQkFFlfhJC7S4zXFQOOg WWvRS+K3WovKGuG8Z+35Pf2WxDyRonw9X2UjuBJdFo5zD932bQ3dPBFm9NK9QpvjOqoT 1wkaNgqfOqryIFKRO98F0joJTOu1k2gybqAtd0XH7Ho8cWK0q/wyYpr7eBQIuOSpMDVC DdeefyxuTcQcghIu36Myeks6qbfXuq6MmqwvyzEtFEKZpPNCNTnT2hoCqisq55GQdoLt SG1z/FE2kH89gdG+XnD7Xh8gR+UJKYP09vlpRqol3haVsTuuq0Qj2+wwL7xqZd0TaPki xeDA==
In-reply-to: <1367503439-12827-1-git-send-email-ranto.boris@xxxxxxxxx>
References: <1367503439-12827-1-git-send-email-ranto.boris@xxxxxxxxx>
From: Boris Ranto <ranto.boris@xxxxxxxxx>

Currently, if a user runs ./check -n to get the list of tests to run on
a file system such as nfs or tmpfs, then the ./check script will fail
since there are no tests/nfs and tests/tmpfs subdirectories (and hence,
no group files and no specific tests for the directories). This patch
will conditionally add FSTYP to SRC_GROUPS and remove all further
additions of FSTYP to the variable.

Signed-off-by: Boris Ranto <ranto.boris@xxxxxxxxx>
---
 check |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/check b/check
index fc335ec..4af2dbd 100755
--- a/check
+++ b/check
@@ -64,7 +64,12 @@ fi
 export FSTYP
 
 SUPPORTED_TESTS="[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]"
-SRC_GROUPS="generic shared"
+# Include FSTYP to SRC_GROUPS if a directory for it exists
+if [ -d $SRC_DIR/$d ]; then
+       SRC_GROUPS="generic shared $FSTYP"
+else
+       SRC_GROUPS="generic shared"
+fi
 export SRC_DIR="tests"
 export RESULT_BASE=${RESULT_BASE:="$here/results"}
 
@@ -97,7 +102,7 @@ get_group_list()
 {
        grp=$1
 
-       for d in $SRC_GROUPS $FSTYP; do
+       for d in $SRC_GROUPS; do
                l=$(sed -n < $SRC_DIR/$d/group \
                        -e 's/#.*//' \
                        -e 's/$/ /' \
@@ -113,7 +118,7 @@ get_group_list()
 get_all_tests()
 {
        touch $tmp.list
-       for d in $SRC_GROUPS $FSTYP; do
+       for d in $SRC_GROUPS; do
                ls $SRC_DIR/$d/* | \
                        grep -v "\..*" | \
                        grep -v group >> $tmp.list 2>/dev/null
@@ -198,7 +203,7 @@ while [ $# -gt 0 ]; do
                ;;
 
        -X)     xfile=$2; shift ;
-               for d in $SRC_GROUPS $FSTYP; do
+               for d in $SRC_GROUPS; do
                        [ -f $SRC_DIR/$d/$xfile ] || continue
                        for f in `cat $SRC_DIR/$d/$xfile`; do
                                echo $d/$f >> $tmp.xlist
-- 
1.7.1

<Prev in Thread] Current Thread [Next in Thread>