From: Garrett C. <yan...@gm...> - 2009-10-13 17:30:58
|
On Tue, Oct 13, 2009 at 5:13 AM, Subrata Modak <su...@li...> wrote: > On Fri, 2009-10-02 at 21:23 -0700, Garrett Cooper wrote: >> 1. This option really doesn't buy us much in runltp*, and we've almost >> already run out of options anyhow... >> 2. Correct some ugly indentation. >> >> Signed-off-by: Garrett Cooper <yan...@gm...> > > Was difficult to apply over the changes you recently made. However, i > was able to ;-) > > Regards-- > Subrata > >> >> Index: runltp >> =================================================================== >> RCS file: /cvsroot/ltp/ltp/runltp,v >> retrieving revision 1.49 >> diff -u -r1.49 runltp >> --- runltp 26 Aug 2009 07:00:25 -0000 1.49 >> +++ runltp 3 Oct 2009 04:21:33 -0000 >> @@ -156,7 +156,6 @@ >> -t 24h = 24 hours >> -t 2d = 2 days >> -T REPETITION Execute the testsuite for REPETITION no. of times >> - -v Print more verbose output to screen. >> -w CMDFILEADDR Uses wget to get the user's list of testcases. >> -x INSTANCES Run multiple instances of this testsuite. >> -b DEVICE Some tests require an unmounted block device >> @@ -182,18 +181,17 @@ >> local RUN_NETEST=0 >> local RUN_REPEATED=0 >> local QUIET_MODE="" >> - local VERBOSE_MODE="" >> local NETPIPE=0 >> local GENLOAD=0 >> local MEMSIZE=0 >> local DURATION="" >> local CMDFILEADDR="" >> local FAILCMDFILE="" >> - local INJECT_KERNEL_FAULT="" >> - local INJECT_KERNEL_FAULT_PERCENTAGE="" >> - local INJECT_FAULT_LOOPS_PER_TEST="" >> - local VALGRIND_CHECK="" >> - local VALGRIND_CHECK_TYPE="" >> + local INJECT_KERNEL_FAULT="" >> + local INJECT_KERNEL_FAULT_PERCENTAGE="" >> + local INJECT_FAULT_LOOPS_PER_TEST="" >> + local VALGRIND_CHECK="" >> + local VALGRIND_CHECK_TYPE="" >> local LOGFILE_NAME="" >> local LOGFILE="" >> local OUTPUTFILE_NAME="" >> @@ -207,7 +205,7 @@ >> local DEFAULT_FILE_NAME_GENERATION_TIME=`date +"%Y_%b_%d-%Hh_%Mm_%Ss"` >> version_date=`head -n 1 $LTPROOT/ChangeLog` >> >> - while getopts a:c:C:d:D:f:F:ehi:g:l:m:M:Nno:pqr:s:S:t:T:vw:x:b:B: arg >> + while getopts a:c:C:d:D:f:F:ehi:g:l:m:M:Nno:pqr:s:S:t:T:w:x:b:B: arg >> do case $arg in >> a) EMAIL_TO=$OPTARG >> ALT_EMAIL_OUT=1;; >> @@ -398,8 +396,6 @@ >> T) # In case you want the testcases to runsequentially >> RUN_REPEATED times >> RUN_REPEATED=$OPTARG;; >> >> - v) VERBOSE_MODE=1;; >> - >> w) CMDFILEADDR=$OPTARG;; >> >> x) # number of ltp's to run >> @@ -755,11 +751,9 @@ >> [ ! -z "$QUIET_MODE" ] && { echo "INFO: Test start time: $(date)" ; } >> PAN_COMMAND="${LTPROOT}/pan/ltp-pan $QUIET_MODE -e -S $INSTANCES >> $DURATION -a $$ \ >> -n $$ $PRETTY_PRT -f ${TMP}/alltests $LOGFILE $OUTPUTFILE $FAILCMDFILE" >> - if [ ! -z "$VERBOSE_MODE" ] ; then >> - echo "COMMAND: $PAN_COMMAND" >> - if [ ! -z "$TAG_RESTRICT_STRING" ] ; then >> - echo "INFO: Restricted to $TAG_RESTRICT_STRING" >> - fi >> + echo "COMMAND: $PAN_COMMAND" >> + if [ ! -z "$TAG_RESTRICT_STRING" ] ; then >> + echo "INFO: Restricted to $TAG_RESTRICT_STRING" >> fi >> #$PAN_COMMAND #Duplicated code here, because otherwise if we >> fail, only "PAN_COMMAND" gets output >> >> Index: runltplite.sh >> =================================================================== >> RCS file: /cvsroot/ltp/ltp/runltplite.sh,v >> retrieving revision 1.5 >> diff -u -r1.5 runltplite.sh >> --- runltplite.sh 19 May 2009 09:39:11 -0000 1.5 >> +++ runltplite.sh 3 Oct 2009 04:21:33 -0000 >> @@ -85,7 +85,6 @@ >> -p Human readable format logfiles. >> -q Print less verbose output to screen. >> -r LTPROOT Fully qualified path where testsuite is installed. >> - -v Print more verbose output to screen. >> >> example: ./${0##*/} -i 1024 -m 128 -p -q -l /tmp/resultlog.$$ -d ${PWD} >> >> @@ -114,7 +113,7 @@ >> local TAG_RESTRICT_STRING="" >> local PAN_COMMAND="" >> >> - while getopts c:d:hi:l:m:No:pqr:v arg >> + while getopts c:d:hi:l:m:No:pqr: arg >> do case $arg in >> c) >> NUM_PROCS=$(($OPTARG)) Sorry -- if it gets too hard, just let me know that it looks sane and I'll commit it directly to CVS ><... Thanks, -Garrett |