From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id EC9168000 for ; Fri, 15 Mar 2013 07:28:40 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay3.corp.sgi.com (Postfix) with ESMTP id 86CAEAC001 for ; Fri, 15 Mar 2013 05:28:40 -0700 (PDT) Received: from ipmail04.adl6.internode.on.net (ipmail04.adl6.internode.on.net [150.101.137.141]) by cuda.sgi.com with ESMTP id 0evR6nGeCJepaUDB for ; Fri, 15 Mar 2013 05:28:38 -0700 (PDT) Received: from disappointment ([192.168.1.1]) by dastard with esmtp (Exim 4.76) (envelope-from ) id 1UGTkS-0001a5-Dm for xfs@oss.sgi.com; Fri, 15 Mar 2013 23:28:36 +1100 Received: from dave by disappointment with local (Exim 4.80) (envelope-from ) id 1UGTkI-0005rP-Aq for xfs@oss.sgi.com; Fri, 15 Mar 2013 23:28:26 +1100 From: Dave Chinner Subject: [PATCH 15/25] xfstests: rework CLI individual test specification Date: Fri, 15 Mar 2013 23:27:59 +1100 Message-Id: <1363350489-22257-16-git-send-email-david@fromorbit.com> In-Reply-To: <1363350489-22257-1-git-send-email-david@fromorbit.com> References: <1363350489-22257-1-git-send-email-david@fromorbit.com> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com To: xfs@oss.sgi.com From: Dave Chinner Now that tests are in separate subdirectories, they cannot be selected purely by test number on the command line. We need to specify the test by subdir and test name, so effectively we move to specifying them by regexes on the command line rather than by expanding a range internally. This is needed to support non-numeric test names as well, so the change may as well be made here. This means the command line parsing needs to change from trying to detect tests by a regex match to a processing loop that simply parses the tests and checks for there existence. Hence the moment we find an argument that is not a switch (i.e no preceeding "-"), we move from the arg processing loop to the test name processing loop. IOWs, tests must be specified last on the command line. Signed-off-by: Dave Chinner --- check | 86 ++++++++++++++++++++++++++++------------------------------------- 1 file changed, 37 insertions(+), 49 deletions(-) diff --git a/check b/check index 195c25d..620de0f 100755 --- a/check +++ b/check @@ -71,8 +71,7 @@ check options testlist options -g group[,group...] include tests from these groups -x group[,group...] exclude tests from these groups - NNN include test NNN - NNN-NNN include test range (eg. 012-021) + [testlist] include tests matching names in testlist ' exit 0 } @@ -97,26 +96,6 @@ get_group_list() echo $grpl } -expand_test_numbers() -{ - # strip leading zeros, could be considered octal. - start=`echo $1 | sed 's/^0*//'` - end=`echo $2 | sed 's/^0*//'` - - $AWK_PROG /dev/null ; then - # in group file ... OK - echo $id >>$tmp.list - else - # oops - echo "$id - unknown test, ignored" - fi - done -} - _wallclock() { date "+%H %M %S" | $AWK_PROG '{ print $1*3600 + $2*60 + $3 }' @@ -146,6 +125,7 @@ then exit 1 fi +# Process command arguments first. while [ $# -gt 0 ]; do case "$1" in -\? | -h | --help) usage ;; @@ -202,42 +182,50 @@ while [ $# -gt 0 ]; do -T) timestamp=true ;; - "$SUPPORTED_TESTS") - echo "No tests?" - status=1 - exit $status - ;; - - [0-9]*-[0-9]*) - eval `echo $1 | sed -e 's/^/start=/' -e 's/-/ end=/'` - expand_test_numbers $start $end - have_test_arg=true - ;; - - [0-9]*-) - eval `echo $1 | sed -e 's/^/start=/' -e 's/-//'` - end=`echo $SUPPORTED_TESTS | sed -e 's/\[0-9]//g' -e 's/ *$//' -e 's/.* //'` - if [ -z "$end" ]; then - echo "No tests in range \"$1\"?" - status=1 - exit $status - fi - expand_test_numbers $start $end - have_test_arg=true - ;; - --large-fs) export LARGE_SCRATCH_DEV=yes ;; --extra-space=*) export SCRATCH_DEV_EMPTY_SPACE=${r#*=} ;; -*) usage ;; - *) expand_test_numbers $1 $1 ; - have_test_arg=true - ;; + *) # not an argument, we've got tests now. + have_test_arg=true ;; esac + # if we've found a test specification, the break out of the processing + # loop before we shift the arguments so that this is the first argument + # that we process in the test arg loop below. + if $have_test_arg; then + break; + fi + shift done +# Process tests from command line now. +if $have_test_arg; then + while [ $# -gt 0 ]; do + case "$1" in + -*) echo "Argments before tests, please!" + status=1 + exit $status + ;; + *) test_dir=`dirname $1` + test_name=`basename $1` + group_file=$SRC_DIR/$test_dir/group + + if grep "^$testname" $group_file >/dev/null ; then + # in group file ... OK + echo $SRC_DIR/$1 >>$tmp.list + else + # oops + echo "$1 - unknown test, ignored" + fi + ;; + esac + + shift + done +fi + if [ -s $tmp.list ]; then # found some valid test numbers ... this is good : -- 1.7.10.4 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs