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

[rusty at netfilter.org]

Author: rusty at netfilter.org
Date: 2004-12-22 05:53:08 +0100 (Wed, 22 Dec 2004)
New Revision: 3489

Modified:
   trunk/nfsim-testsuite/test.sh
Log:
Ignore .orig and .rej files.
Add --time command to see where time goes.


Modified: trunk/nfsim-testsuite/test.sh
===================================================================
--- trunk/nfsim-testsuite/test.sh	2004-12-22 04:28:38 UTC (rev 3488)
+++ trunk/nfsim-testsuite/test.sh	2004-12-22 04:53:08 UTC (rev 3489)
@@ -17,8 +17,9 @@
 	-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|--nfsim=<nfsim>]" >&2; exit 1;;
+	    echo "Usage $0 [-k|-vv|-v|--failtest|--time|--nfsim=<nfsim>]" >&2; exit 1;;
 	*) break;;
     esac
 done
@@ -144,13 +145,13 @@
 	fi
 	case "$f" in
 	    # Ignore backups.
-	    *~)
+	    *~|*.orig|*.rej)
 		continue;;
 	    *.sh)
-		sh -e $EXTRA_ARGS "$f" > $ERROUT 2>&1
+		$TIME sh -e $EXTRA_ARGS "$f" > $ERROUT 2>&1
 		;;
 	    *.sim)
-		$NFSIM $NFSIM_ARGS < "$f" > $ERROUT 2>&1
+		$TIME $NFSIM $NFSIM_ARGS < "$f" > $ERROUT 2>&1
 		;;
 	    *)
 		echo Unknown test type "$f" >&2