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

[rusty at netfilter.org]

Author: rusty at netfilter.org
Date: 2004-12-17 07:16:35 +0100 (Fri, 17 Dec 2004)
New Revision: 3427

Modified:
   trunk/nfsim-testsuite/expected-failures
   trunk/nfsim-testsuite/test.sh
Log:
patch from peejix: allow testing of iptables version in exceptions

Modified: trunk/nfsim-testsuite/expected-failures
===================================================================
--- trunk/nfsim-testsuite/expected-failures	2004-12-17 05:03:37 UTC (rev 3426)
+++ trunk/nfsim-testsuite/expected-failures	2004-12-17 06:16:35 UTC (rev 3427)
@@ -1,22 +1,29 @@
-2.6.[0-9]*:01iptables/20ipt_MARK.sim
-2.6.[0-9]*:03NAT/03ip_dnat.sim
-2.6.[0-9]*:03NAT/05dnat_reply.sim
-2.6.[0-9]*:03NAT/13ip_nat_fill.sim
-2.6.[0-9]*:03NAT/17masq.sim
-2.6.[0-9]*:03NAT/21loopback.sim
-2.4*:01iptables/20ipt_MARK.sim
-2.4*:02conntrack/05loopback.sim
-2.4*:02conntrack/10ftp-pasv.sim
-2.4*:02conntrack/10ftp-port.sim
-2.4*:03NAT/03ip_dnat.sim
-2.4*:03NAT/05dnat_reply.sim
-2.4*:03NAT/13ip_nat_fill.sim
-2.4*:03NAT/17masq.sim
-2.4*:03NAT/21loopback.sim
-2.6.10*:01iptables/20ipt_MARK.sim
-2.6.10*:03NAT/03ip_dnat.sim
-2.6.10*:03NAT/05dnat_reply.sim
-2.6.10*:03NAT/13ip_nat_fill.sim
-2.6.10*:03NAT/17masq.sim
-2.6.10*:03NAT/21loopback.sim
-*:01iptables/26ipt_ttl-out-of-range.sim
+# Format: TYPE:VERSIONPATTERN:TESTNAME
+# TYPE is "linux" or "iptables" currently
+# VERSIONPATTERN is a wildcard-style pattern to match
+# TESTNAME is the test which is expected to fail if this matches
+linux:2.6.[0-9]*:01iptables/20ipt_MARK.sim
+linux:2.6.[0-9]*:03NAT/03ip_dnat.sim
+linux:2.6.[0-9]*:03NAT/05dnat_reply.sim
+linux:2.6.[0-9]*:03NAT/13ip_nat_fill.sim
+linux:2.6.[0-9]*:03NAT/17masq.sim
+linux:2.6.[0-9]*:03NAT/21loopback.sim
+linux:2.6.9:03NAT/10source-map.sim
+linux:2.4*:01iptables/20ipt_MARK.sim
+linux:2.4*:02conntrack/05loopback.sim
+linux:2.4*:02conntrack/10ftp-pasv.sim
+linux:2.4*:02conntrack/10ftp-port.sim
+linux:2.4*:03NAT/03ip_dnat.sim
+linux:2.4*:03NAT/05dnat_reply.sim
+linux:2.4*:03NAT/13ip_nat_fill.sim
+linux:2.4*:03NAT/17masq.sim
+linux:2.4*:03NAT/21loopback.sim
+linux:2.6.10*:01iptables/20ipt_MARK.sim
+linux:2.6.10*:03NAT/03ip_dnat.sim
+linux:2.6.10*:03NAT/05dnat_reply.sim
+linux:2.6.10*:03NAT/13ip_nat_fill.sim
+linux:2.6.10*:03NAT/17masq.sim
+linux:2.6.10*:03NAT/21loopback.sim
+iptables:*:01iptables/26ipt_ttl-out-of-range.sim
+iptables:*:01iptables/27ipt_iprange-bad-addr.sim
+*:01iptables/27ipt_iprange-bad-addr.sim

Modified: trunk/nfsim-testsuite/test.sh
===================================================================
--- trunk/nfsim-testsuite/test.sh	2004-12-17 05:03:37 UTC (rev 3426)
+++ trunk/nfsim-testsuite/test.sh	2004-12-17 06:16:35 UTC (rev 3427)
@@ -59,9 +59,20 @@
 {
     grep -q :$1 expected-failures || return 1
 
-    while IFS=":" read VERSION TEST; do
+    while IFS=":" read WHAT VERSION TEST; do
 	if [ "$TEST" = "$1" ]; then
-	    case $KVERSION in
+	    case "$WHAT" in
+		linux)
+		    WVERSION=$KVERSION;;
+		iptables)
+		    WVERSION=$IPTABLES_VERSION;;
+		\#*) : ;;
+		*)
+		    echo "Unknown test in expected-failures: $TEST" >&2
+		    exit 1;;
+	    esac
+
+	    case $WVERSION in
 		$VERSION) return 0;;
 	    esac
 	fi