[netfilter-cvslog] r3496 - trunk/nfsim-testsuite

rusty at netfilter.org rusty at netfilter.org
Thu Dec 23 03:16:33 CET 2004


Author: rusty at netfilter.org
Date: 2004-12-23 03:16:32 +0100 (Thu, 23 Dec 2004)
New Revision: 3496

Modified:
   trunk/nfsim-testsuite/test.sh
Log:
Improve commandline handling: hand unknown options through to nfsim.


Modified: trunk/nfsim-testsuite/test.sh
===================================================================
--- trunk/nfsim-testsuite/test.sh	2004-12-23 02:08:43 UTC (rev 3495)
+++ trunk/nfsim-testsuite/test.sh	2004-12-23 02:16:32 UTC (rev 3496)
@@ -2,30 +2,30 @@
 # Shell script to run test suite.
 
 NFSIM=nfsim
-NFSIM_ARGS="-q"
+NFSIM_QUIET_ARGS="-q"
+NFSIM_ARGS="-e"
 
 while true; do
     case "$1" in
-	-vv) VERBOSE=1; EXTRA_ARGS=-x; NFSIM_ARGS="-x"; shift;;
+	-vv) VERBOSE=1; EXTRA_ARGS=-x; NFSIM_QUIET_ARGS="-x"; shift;;
 	-v)
 	    if [ -n "$VERBOSE" ]; then
-		EXTRA_ARGS=-x; NFSIM_ARGS="-x"
+		EXTRA_ARGS=-x; NFSIM_QUIET_ARGS="-x"
 	    else
 		VERBOSE=1
 	    fi
 	    shift;;
 	-k) KEEP_GOING=1; shift;;
-	--failtest) FAILTEST=1; shift;;
 	--nfsim=*) NFSIM=`echo "$1" | cut -d= -f2-`; shift;;
 	--time) TIME=time; VERBOSE=1; shift;;
-	--*)
-	    echo "Usage $0 [-k|-vv|-v|--failtest|--time|--nfsim=<nfsim>]" >&2; exit 1;;
+	--help)
+	    echo "Usage $0 [-k|-vv|-v|--failtest|--time|--nfsim=<nfsim>]" >&2; exit 0;;
+	--*) NFSIM_ARGS="$NFSIM_ARGS $1"; shift;;
 	*) break;;
     esac
 done
 
-NFSIM_ARGS="$NFSIM_ARGS -e"
-[ -z "$FAILTEST" ] || NFSIM_ARGS="$NFSIM_ARGS --failtest"
+NFSIM_ARGS="$NFSIM_QUIET_ARGS $NFSIM_ARGS"
 KVERSION=`echo version kernel | $NFSIM -q`
 
 # Creates a temporary file and exports the name of the file to




More information about the netfilter-cvslog mailing list