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

[rusty at netfilter.org]

Author: rusty at netfilter.org
Date: 2004-12-17 05:50:39 +0100 (Fri, 17 Dec 2004)
New Revision: 3425

Modified:
   trunk/nfsim-testsuite/test.sh
Log:
Extract iptables version and report which one we're doing (../iptables/iptables if possible).


Modified: trunk/nfsim-testsuite/test.sh
===================================================================
--- trunk/nfsim-testsuite/test.sh	2004-12-17 04:34:32 UTC (rev 3424)
+++ trunk/nfsim-testsuite/test.sh	2004-12-17 04:50:39 UTC (rev 3425)
@@ -101,6 +101,22 @@
 fi
 export NFSIM NFSIM_ARGS
 
+# Use iptables from SVN dir if we're in it.
+if [ -z "$NFSIM_IPTABLES_PREFIX" ]; then
+    if [ -x ../iptables/iptables ]; then
+	NFSIM_IPTABLES_PREFIX=../iptables
+    fi
+fi
+if [ -z "$NFSIM_IPTABLES_PREFIX" ]; then
+    IPTABLES=iptables
+else
+    IPTABLES=$NFSIM_IPTABLES_PREFIX/iptables
+fi
+export IPTABLES NFSIM_IPTABLES_PREFIX
+
+IPTABLES_VERSION=$($IPTABLES --version | tr ' ' '\n' | grep '^[v0-9.-]*$')
+echo Using `which $IPTABLES` version $IPTABLES_VERSION
+
 # Test can be named on command line.
 if [ $# -eq 1 ]; then DOING=0; else DOING=1; fi