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

rusty at netfilter.org rusty at netfilter.org
Mon Dec 13 07:34:21 CET 2004


Author: rusty at netfilter.org
Date: 2004-12-13 07:34:20 +0100 (Mon, 13 Dec 2004)
New Revision: 3344

Modified:
   trunk/nfsim-testsuite/expected-failures
   trunk/nfsim-testsuite/test.sh
Log:
Allow wildcards in expected failures.
Return correct exit code.


Modified: trunk/nfsim-testsuite/expected-failures
===================================================================
--- trunk/nfsim-testsuite/expected-failures	2004-12-13 06:31:58 UTC (rev 3343)
+++ trunk/nfsim-testsuite/expected-failures	2004-12-13 06:34:20 UTC (rev 3344)
@@ -1,6 +1,12 @@
-2.6.10-rc3-bk3:01iptables/20ipt_MARK.sim
-2.6.10-rc3-bk3:03NAT/03ip_dnat.sim
-2.6.10-rc3-bk3:03NAT/05dnat_reply.sim
-2.6.10-rc3-bk3:03NAT/13ip_nat_fill.sim
-2.6.10-rc3-bk3:03NAT/17masq.sim
-2.6.10-rc3-bk3:03NAT/21loopback.sim
+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.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

Modified: trunk/nfsim-testsuite/test.sh
===================================================================
--- trunk/nfsim-testsuite/test.sh	2004-12-13 06:31:58 UTC (rev 3343)
+++ trunk/nfsim-testsuite/test.sh	2004-12-13 06:34:20 UTC (rev 3344)
@@ -55,7 +55,14 @@
 
 expected_failure()
 {
-    grep -q ${KVERSION}:$1 expected-failures
+    grep -q :$1 expected-failures || return 1
+
+    while IFS=":" read VERSION TEST; do
+	case $KVERSION in
+	$VERSION) return 0;;
+	esac
+    done < expected-failures
+    return 1
 }
 
 failed()
@@ -163,4 +170,4 @@
     if [ -z "$VERBOSE" ]; then echo; fi
 done
 
-[ -n "$FAILED" ]
+[ -z "$FAILED" ]




More information about the netfilter-cvslog mailing list