[LTP] [PATCH] runltp: Change -s option to select single case instead of matched name string of case

jin.li
2012-10-15T05:40:13Z

From: Jin Li <jin.li@windriver.com>

The scenario group file can be used if a set of related test cases need executing
at one time. Therefore, it's better to use runltp -s to select single test case.

Also, it is not a good practice to bind the option format of runltp with the implementation
of runltp internal code.Say the test case ar should be invoked in this way:

./runltp -s ar

instead of

./runltp -s "^ar "

Signed-off-by: Jin Li <jin.li@windriver.com>
---
runltp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/runltp b/runltp
index f95c17b..7788275 100755
--- a/runltp
+++ b/runltp
@@ -150,7 +150,7 @@ usage()
-p Human readable format logfiles.
-q Print less verbose output to screen.
-r LTPROOT Fully qualified path where testsuite is installed.
- -s PATTERN Only run test cases which match PATTERN.
+ -s TESTCASE Only run single test case.
-S SKIPFILE Skip tests specified in SKIPFILE
-t DURATION Execute the testsuite for given duration. Examples:
-t 60s = 60 seconds
@@ -203,7 +203,7 @@ main()
local HTMLFILE=""
local DMESG_DIR=""
local EMAIL_TO=""
- local TAG_RESTRICT_STRING=""
+ local TESTCASE=""
local PAN_COMMAND=""
local DEFAULT_FILE_NAME_GENERATION_TIME=`date +"%Y_%b_%d-%Hh_%Mm_%Ss"`

@@ -394,7 +394,7 @@ main()

r) LTPROOT=$OPTARG;;

- s) TAG_RESTRICT_STRING=$OPTARG;;
+ s) TESTCASE=$OPTARG;;

S) case $OPTARG in
/*)
@@ -647,11 +647,11 @@ main()
}
}

- # If enabled, execute only test cases that match the PATTERN
- if [ -n "$TAG_RESTRICT_STRING" ]
+ # If enabled, execute single test cases
+ if [ -n "$TESTCASE" ]
then
mv -f ${TMP}/alltests ${TMP}/alltests.orig
- grep $TAG_RESTRICT_STRING ${TMP}/alltests.orig > ${TMP}/alltests #Not worth checking return codes for this case
+ grep "^$TESTCASE " ${TMP}/alltests.orig > ${TMP}/alltests #Not worth checking return codes for this case
fi

# Blacklist or skip tests if a SKIPFILE was specified with -S
@@ -743,8 +743,8 @@ main()
PAN_COMMAND="${LTPROOT}/bin/ltp-pan $QUIET_MODE -e -S $INSTANCES $DURATION -a $$ \
-n $$ $PRETTY_PRT -f ${TMP}/alltests $LOGFILE $OUTPUTFILE $FAILCMDFILE"
echo "COMMAND: $PAN_COMMAND"
- if [ ! -z "$TAG_RESTRICT_STRING" ] ; then
- echo "INFO: Restricted to $TAG_RESTRICT_STRING"
+ if [ ! -z "$TESTCASE" ] ; then
+ echo "INFO: Run single test case $TESTCASE"
fi
#$PAN_COMMAND #Duplicated code here, because otherwise if we fail, only "PAN_COMMAND" gets output

--
1.7.11