CVS commit: src/tests/ipf
Module Name:src Committed By: pgoyette Date: Sat Dec 26 08:01:58 UTC 2015 Modified Files: src/tests/ipf: t_nat_exec.sh Log Message: Remove the "expected failure" from test n12, and change it not to use the "-v" command line option to ipf_test. The -v option causes it to display additional information, some of which is not fixed (looks like an internal data structure address). One fewer on the expected-failures list. :) To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/tests/ipf/t_nat_exec.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/t_nat_exec.sh diff -u src/tests/ipf/t_nat_exec.sh:1.21 src/tests/ipf/t_nat_exec.sh:1.22 --- src/tests/ipf/t_nat_exec.sh:1.21 Mon Dec 1 19:46:29 2014 +++ src/tests/ipf/t_nat_exec.sh Sat Dec 26 08:01:58 2015 @@ -1,4 +1,4 @@ -# $NetBSD: t_nat_exec.sh,v 1.21 2014/12/01 19:46:29 martin Exp $ +# $NetBSD: t_nat_exec.sh,v 1.22 2015/12/26 08:01:58 pgoyette Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -71,7 +71,7 @@ test_case n8 nattest hex hex -T update_i test_case n9 nattest hex hex -T update_ipid=0 test_case n10 nattest hex hex -T update_ipid=0 test_case n11 nattest text text -failing_test_case n12 nattest "Known to be broken" hex hex -T update_ipid=0 -v +test_case n12 nattest hex hex -T update_ipid=0 test_case n13 nattest text text test_case n14 nattest text text test_case n15 nattest text text -T update_ipid=0
CVS commit: src/tests/ipf/expected
Module Name:src Committed By: martin Date: Thu Nov 5 10:43:42 UTC 2015 Modified Files: src/tests/ipf/expected: in2 in2_6 Log Message: Ooops, pilot error - revert last To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/ipf/expected/in2 cvs rdiff -u -r1.3 -r1.4 src/tests/ipf/expected/in2_6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/expected/in2 diff -u src/tests/ipf/expected/in2:1.6 src/tests/ipf/expected/in2:1.7 --- src/tests/ipf/expected/in2:1.6 Thu Nov 5 10:35:58 2015 +++ src/tests/ipf/expected/in2 Thu Nov 5 10:43:42 2015 @@ -1,5 +1,5 @@ rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1/32 port 0 tcp -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 255 +rdr le0 9.8.7.6/32 -> 1.1.1.1/32 reserved rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip rdr le0 9.0.0.0/8 -> 1.1.1.1/32 ip Index: src/tests/ipf/expected/in2_6 diff -u src/tests/ipf/expected/in2_6:1.3 src/tests/ipf/expected/in2_6:1.4 --- src/tests/ipf/expected/in2_6:1.3 Thu Nov 5 10:35:58 2015 +++ src/tests/ipf/expected/in2_6 Thu Nov 5 10:43:42 2015 @@ -1,5 +1,5 @@ rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1/128 port 0 tcp -rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 255 +rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 reserved rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip rdr le0 inet6 9:8::/32 -> 1:1:1::1/128 ip
CVS commit: src/tests/ipf/expected
Module Name:src Committed By: martin Date: Thu Nov 5 10:35:58 UTC 2015 Modified Files: src/tests/ipf/expected: in2 in2_6 Log Message: Fix expected output to match -current NetBSD reality (port "255" is not mapped to "reserved") To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/ipf/expected/in2 cvs rdiff -u -r1.2 -r1.3 src/tests/ipf/expected/in2_6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/expected/in2 diff -u src/tests/ipf/expected/in2:1.5 src/tests/ipf/expected/in2:1.6 --- src/tests/ipf/expected/in2:1.5 Mon Jun 30 16:14:35 2014 +++ src/tests/ipf/expected/in2 Thu Nov 5 10:35:58 2015 @@ -1,5 +1,5 @@ rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1/32 port 0 tcp -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 reserved +rdr le0 9.8.7.6/32 -> 1.1.1.1/32 255 rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip rdr le0 9.0.0.0/8 -> 1.1.1.1/32 ip Index: src/tests/ipf/expected/in2_6 diff -u src/tests/ipf/expected/in2_6:1.2 src/tests/ipf/expected/in2_6:1.3 --- src/tests/ipf/expected/in2_6:1.2 Tue Jul 15 19:51:36 2014 +++ src/tests/ipf/expected/in2_6 Thu Nov 5 10:35:58 2015 @@ -1,5 +1,5 @@ rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1/128 port 0 tcp -rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 reserved +rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 255 rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip rdr le0 inet6 9:8::/32 -> 1:1:1::1/128 ip
CVS commit: src/tests/ipf
Module Name:src Committed By: dholland Date: Sat Dec 6 19:31:25 UTC 2014 Modified Files: src/tests/ipf: t_filter_parse.sh Log Message: Null commit, to note that the previous commit by darrenr (which said just "PR kern/47462") didn't even have the right PR number. The correct number, as far as I can tell, was PR 47262. /brick To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/tests/ipf/t_filter_parse.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/t_filter_parse.sh diff -u src/tests/ipf/t_filter_parse.sh:1.11 src/tests/ipf/t_filter_parse.sh:1.12 --- src/tests/ipf/t_filter_parse.sh:1.11 Sun Jun 29 09:27:58 2014 +++ src/tests/ipf/t_filter_parse.sh Sat Dec 6 19:31:25 2014 @@ -1,4 +1,4 @@ -# $NetBSD: t_filter_parse.sh,v 1.11 2014/06/29 09:27:58 darrenr Exp $ +# $NetBSD: t_filter_parse.sh,v 1.12 2014/12/06 19:31:25 dholland Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -133,3 +133,4 @@ atf_init_test_cases() atf_add_test_case i22 atf_add_test_case i23 } +
CVS commit: src/tests/ipf
Module Name:src Committed By: martin Date: Mon Dec 1 19:46:29 UTC 2014 Modified Files: src/tests/ipf: t_nat_exec.sh Log Message: Remove the "broken on BE" mark from the N14 testcase - ozaki-r fixed it recently. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/tests/ipf/t_nat_exec.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/t_nat_exec.sh diff -u src/tests/ipf/t_nat_exec.sh:1.20 src/tests/ipf/t_nat_exec.sh:1.21 --- src/tests/ipf/t_nat_exec.sh:1.20 Tue Jul 15 20:00:23 2014 +++ src/tests/ipf/t_nat_exec.sh Mon Dec 1 19:46:29 2014 @@ -1,4 +1,4 @@ -# $NetBSD: t_nat_exec.sh,v 1.20 2014/07/15 20:00:23 martin Exp $ +# $NetBSD: t_nat_exec.sh,v 1.21 2014/12/01 19:46:29 martin Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -73,7 +73,7 @@ test_case n10 nattest hex hex -T update_ test_case n11 nattest text text failing_test_case n12 nattest "Known to be broken" hex hex -T update_ipid=0 -v test_case n13 nattest text text -failing_test_case_be n14 nattest "See PR kern/47665" text text +test_case n14 nattest text text test_case n15 nattest text text -T update_ipid=0 test_case n16 nattest hex hex -D test_case n17 nattest hex hex -D
CVS commit: src/tests/ipf/expected
Module Name:src Committed By: ozaki-r Date: Tue Nov 25 08:25:46 UTC 2014 Modified Files: src/tests/ipf/expected: n14 n14_6 Log Message: Fix wrong expected outputs IP addresses in the expected outputs looks reversed (in byte order). It seems the expected outputs had been generated based on source code with a bug and the bug was fixed by a commit titled "#534 destination list hashing not endian neutral" by darrenr@. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/ipf/expected/n14 cvs rdiff -u -r1.4 -r1.5 src/tests/ipf/expected/n14_6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/expected/n14 diff -u src/tests/ipf/expected/n14:1.5 src/tests/ipf/expected/n14:1.6 --- src/tests/ipf/expected/n14:1.5 Sun Jul 22 14:33:28 2012 +++ src/tests/ipf/expected/n14 Tue Nov 25 08:25:46 2014 @@ -11,9 +11,9 @@ RDR 10.1.1.253 80<- -> 203.1.1. RDR 10.1.1.254 80<- -> 203.1.1.1 80[10.2.2.5 2000] Hostmap table: -10.2.2.7,203.1.1.1 -> 254.1.1.10,0.0.0.0 (use = 1) -10.2.2.6,203.1.1.1 -> 253.1.1.10,0.0.0.0 (use = 1) -10.2.2.5,203.1.1.1 -> 254.1.1.10,0.0.0.0 (use = 1) +10.2.2.7,203.1.1.1 -> 10.1.1.254,0.0.0.0 (use = 1) +10.2.2.6,203.1.1.1 -> 10.1.1.253,0.0.0.0 (use = 1) +10.2.2.5,203.1.1.1 -> 10.1.1.254,0.0.0.0 (use = 1) List of active state sessions: List of configured pools List of configured hash tables Index: src/tests/ipf/expected/n14_6 diff -u src/tests/ipf/expected/n14_6:1.4 src/tests/ipf/expected/n14_6:1.5 --- src/tests/ipf/expected/n14_6:1.4 Sun Jul 22 14:33:28 2012 +++ src/tests/ipf/expected/n14_6 Tue Nov 25 08:25:46 2014 @@ -11,9 +11,9 @@ RDR 10:1:1::253 80<- -> 203:0:1::1:1 RDR 10:1:1::254 80<- -> 203:0:1::1:1 80[10::2:2:5 2000] Hostmap table: -10::2:2:7,203:0:1:0:0:0:1:1 -> 254:1:1::10,any (use = 1) -10::2:2:6,203:0:1:0:0:0:1:1 -> 253:0:1:0:0:0:1:10,any (use = 1) -10::2:2:5,203:0:1:0:0:0:1:1 -> 254:1:1::10,any (use = 3) +10::2:2:7,203:0:1:0:0:0:1:1 -> 10:1:1::254,any (use = 1) +10::2:2:6,203:0:1:0:0:0:1:1 -> 10:0:1:0:0:0:1:253,any (use = 1) +10::2:2:5,203:0:1:0:0:0:1:1 -> 10:1:1::254,any (use = 3) List of active state sessions: List of configured pools List of configured hash tables
CVS commit: src/tests/ipf
Module Name:src Committed By: martin Date: Tue Jul 15 20:00:23 UTC 2014 Modified Files: src/tests/ipf: t_nat_exec.sh Log Message: Darren fixed n8 and n9 recently To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/tests/ipf/t_nat_exec.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/t_nat_exec.sh diff -u src/tests/ipf/t_nat_exec.sh:1.19 src/tests/ipf/t_nat_exec.sh:1.20 --- src/tests/ipf/t_nat_exec.sh:1.19 Sat Jul 12 14:37:12 2014 +++ src/tests/ipf/t_nat_exec.sh Tue Jul 15 20:00:23 2014 @@ -1,4 +1,4 @@ -# $NetBSD: t_nat_exec.sh,v 1.19 2014/07/12 14:37:12 darrenr Exp $ +# $NetBSD: t_nat_exec.sh,v 1.20 2014/07/15 20:00:23 martin Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -67,8 +67,8 @@ test_case n4 nattest text text test_case n5 nattest text text test_case n6 nattest text text test_case n7 nattest text text -failing_test_case_be n8 nattest "See PR kern/47665" hex hex -T update_ipid=0 -failing_test_case_be n9 nattest "See PR kern/47665" hex hex -T update_ipid=0 +test_case n8 nattest hex hex -T update_ipid=0 +test_case n9 nattest hex hex -T update_ipid=0 test_case n10 nattest hex hex -T update_ipid=0 test_case n11 nattest text text failing_test_case n12 nattest "Known to be broken" hex hex -T update_ipid=0 -v
CVS commit: src/tests/ipf/expected
Module Name:src Committed By: martin Date: Tue Jul 15 19:51:36 UTC 2014 Modified Files: src/tests/ipf/expected: in2_6 Log Message: NetBSD has an entry for protocol #255 in /etc/protocols labeled "reserved" so expect that in the parsing output instead of 255. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/ipf/expected/in2_6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/expected/in2_6 diff -u src/tests/ipf/expected/in2_6:1.1 src/tests/ipf/expected/in2_6:1.2 --- src/tests/ipf/expected/in2_6:1.1 Sun Jun 29 09:25:31 2014 +++ src/tests/ipf/expected/in2_6 Tue Jul 15 19:51:36 2014 @@ -1,5 +1,5 @@ rdr le0 inet6 9:8:7::6/128 port 0 -> 1:1:1::1/128 port 0 tcp -rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 255 +rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 reserved rdr le0 inet6 9:8:7::6/128 port 80 -> 1:1:1::1/128 port 80 tcp rdr le0 inet6 9:8:7::6/128 -> 1:1:1::1/128 ip rdr le0 inet6 9:8::/32 -> 1:1:1::1/128 ip
CVS commit: src/tests/ipf
Module Name:src
Committed By: darrenr
Date: Sat Jul 12 14:37:12 UTC 2014
Modified Files:
src/tests/ipf: t_nat_exec.sh
Removed Files:
src/tests/ipf/input: n17_6
src/tests/ipf/regress: n17_6
Log Message:
Test n17_6 does not yet exist so remove unrequired files and test case
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/tests/ipf/t_nat_exec.sh
cvs rdiff -u -r1.3 -r0 src/tests/ipf/input/n17_6
cvs rdiff -u -r1.3 -r0 src/tests/ipf/regress/n17_6
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/t_nat_exec.sh
diff -u src/tests/ipf/t_nat_exec.sh:1.18 src/tests/ipf/t_nat_exec.sh:1.19
--- src/tests/ipf/t_nat_exec.sh:1.18 Thu May 16 07:43:02 2013
+++ src/tests/ipf/t_nat_exec.sh Sat Jul 12 14:37:12 2014
@@ -1,4 +1,4 @@
-# $NetBSD: t_nat_exec.sh,v 1.18 2013/05/16 07:43:02 martin Exp $
+# $NetBSD: t_nat_exec.sh,v 1.19 2014/07/12 14:37:12 darrenr Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -97,7 +97,6 @@ failing_test_case_be n9_6 nattest "See P
test_case n11_6 nattest text text -6
test_case n12_6 nattest hex hex -6
test_case n15_6 nattest text text -6
-failing_test_case n17_6 nattest "Test golden output file missing" hex hex -6
atf_init_test_cases()
{
@@ -138,6 +137,4 @@ atf_init_test_cases()
atf_add_test_case n11_6
atf_add_test_case n12_6
atf_add_test_case n15_6
- atf_add_test_case n17_6
-
}
CVS commit: src/tests/ipf
Module Name:src
Committed By: darrenr
Date: Sat Jul 12 14:37:49 UTC 2014
Modified Files:
src/tests/ipf/input: Makefile
src/tests/ipf/regress: Makefile
Log Message:
Test n17_6 does not yet exist so remove unrequired files and test case
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/ipf/input/Makefile
cvs rdiff -u -r1.7 -r1.8 src/tests/ipf/regress/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/input/Makefile
diff -u src/tests/ipf/input/Makefile:1.6 src/tests/ipf/input/Makefile:1.7
--- src/tests/ipf/input/Makefile:1.6 Sun Jul 22 16:22:41 2012
+++ src/tests/ipf/input/Makefile Sat Jul 12 14:37:49 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/07/22 16:22:41 darrenr Exp $
+# $NetBSD: Makefile,v 1.7 2014/07/12 14:37:49 darrenr Exp $
TESTSDIR= ${TESTSBASE}/ipf
ATFFILE= no
@@ -64,7 +64,6 @@ n15 \
n15_6 \
n16 \
n17 \
-n17_6 \
n18 \
n1_6 \
n2 \
Index: src/tests/ipf/regress/Makefile
diff -u src/tests/ipf/regress/Makefile:1.7 src/tests/ipf/regress/Makefile:1.8
--- src/tests/ipf/regress/Makefile:1.7 Mon Jun 30 17:02:55 2014
+++ src/tests/ipf/regress/Makefile Sat Jul 12 14:37:49 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/06/30 17:02:55 darrenr Exp $
+# $NetBSD: Makefile,v 1.8 2014/07/12 14:37:49 darrenr Exp $
TESTSDIR= ${TESTSBASE}/ipf
ATFFILE= no
@@ -114,7 +114,6 @@ n15_6 \
n16 \
n16_6 \
n17 \
-n17_6 \
n18 \
n1_6 \
n2 \
CVS commit: src/tests/ipf
Module Name:src
Committed By: darrenr
Date: Mon Jun 30 17:02:55 UTC 2014
Modified Files:
src/tests/ipf/expected: Makefile
src/tests/ipf/regress: Makefile
Log Message:
New IPv6 tests for ipnat parsing need to be built by make so that they can
be executed.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/ipf/expected/Makefile
cvs rdiff -u -r1.6 -r1.7 src/tests/ipf/regress/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/expected/Makefile
diff -u src/tests/ipf/expected/Makefile:1.6 src/tests/ipf/expected/Makefile:1.7
--- src/tests/ipf/expected/Makefile:1.6 Sun Jul 22 16:22:41 2012
+++ src/tests/ipf/expected/Makefile Mon Jun 30 17:02:55 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/07/22 16:22:41 darrenr Exp $
+# $NetBSD: Makefile,v 1.7 2014/06/30 17:02:55 darrenr Exp $
TESTSDIR= ${TESTSBASE}/ipf
ATFFILE= no
@@ -60,15 +60,25 @@ i7 \
i8 \
i9 \
in1 \
+in1_6 \
in100 \
+in100_6 \
in101 \
+in101_6 \
in102 \
+in102_6 \
in2 \
+in2_6 \
in3 \
+in3_6 \
in4 \
+in4_6 \
in5 \
+in5_6 \
in6 \
+in6_6 \
in7 \
+in8_6 \
ip1 \
ip2 \
ip3 \
Index: src/tests/ipf/regress/Makefile
diff -u src/tests/ipf/regress/Makefile:1.6 src/tests/ipf/regress/Makefile:1.7
--- src/tests/ipf/regress/Makefile:1.6 Sun Jul 22 16:22:41 2012
+++ src/tests/ipf/regress/Makefile Mon Jun 30 17:02:55 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/07/22 16:22:41 darrenr Exp $
+# $NetBSD: Makefile,v 1.7 2014/06/30 17:02:55 darrenr Exp $
TESTSDIR= ${TESTSBASE}/ipf
ATFFILE= no
@@ -62,15 +62,25 @@ i7 \
i8 \
i9 \
in1 \
+in1_6 \
in100 \
+in100_6 \
in101 \
+in101_6 \
in102 \
+in102_6 \
in2 \
+in2_6 \
in3 \
+in3_6 \
in4 \
+in4_6 \
in5 \
+in5_6 \
in6 \
+in6_6 \
in7 \
+in8_6 \
ip1 \
ip2 \
ip3 \
CVS commit: src/tests/ipf/expected
Module Name:src Committed By: darrenr Date: Mon Jun 30 16:14:35 UTC 2014 Modified Files: src/tests/ipf/expected: in2 Log Message: NetBSD has an entry for protocol #255 in /etc/protocols labeled "reserved" so expect that in the parsing output instead of 255. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/ipf/expected/in2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/expected/in2 diff -u src/tests/ipf/expected/in2:1.4 src/tests/ipf/expected/in2:1.5 --- src/tests/ipf/expected/in2:1.4 Fri Mar 23 23:08:00 2012 +++ src/tests/ipf/expected/in2 Mon Jun 30 16:14:35 2014 @@ -1,5 +1,5 @@ rdr le0 9.8.7.6/32 port 0 -> 1.1.1.1/32 port 0 tcp -rdr le0 9.8.7.6/32 -> 1.1.1.1/32 255 +rdr le0 9.8.7.6/32 -> 1.1.1.1/32 reserved rdr le0 9.8.7.6/32 port 80 -> 1.1.1.1/32 port 80 tcp rdr le0 9.8.7.6/32 -> 1.1.1.1/32 ip rdr le0 9.0.0.0/8 -> 1.1.1.1/32 ip
CVS commit: src/tests/ipf
Module Name:src Committed By: darrenr Date: Sun Jun 29 09:27:58 UTC 2014 Modified Files: src/tests/ipf: t_filter_parse.sh Log Message: PR kern/47462 To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/tests/ipf/t_filter_parse.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/t_filter_parse.sh diff -u src/tests/ipf/t_filter_parse.sh:1.10 src/tests/ipf/t_filter_parse.sh:1.11 --- src/tests/ipf/t_filter_parse.sh:1.10 Sun Mar 17 03:00:05 2013 +++ src/tests/ipf/t_filter_parse.sh Sun Jun 29 09:27:58 2014 @@ -1,4 +1,4 @@ -# $NetBSD: t_filter_parse.sh,v 1.10 2013/03/17 03:00:05 jmmv Exp $ +# $NetBSD: t_filter_parse.sh,v 1.11 2014/06/29 09:27:58 darrenr Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -101,7 +101,7 @@ test_case i15 itest text ipf test_case i16 itest text ipf failing_test_case i17 itest "Known to be broken" text ipftest test_case i18 itest text ipf -test_case i19 itest_i19 "PR kern/47262 Proto-family missing from logs" text ipf +test_case i19 itest_i19 text ipf test_case i20 itest text ipf test_case i21 itest text ipf test_case i22 itest text ipf
CVS commit: src/tests/ipf
Module Name:src
Committed By: darrenr
Date: Sun Jun 29 09:26:32 UTC 2014
Modified Files:
src/tests/ipf: t_nat_parse.sh
Log Message:
Add in test cases for testing ipnat's parsing of IPv6 NAT rules
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/ipf/t_nat_parse.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/t_nat_parse.sh
diff -u src/tests/ipf/t_nat_parse.sh:1.7 src/tests/ipf/t_nat_parse.sh:1.8
--- src/tests/ipf/t_nat_parse.sh:1.7 Sun Jun 29 04:00:59 2014
+++ src/tests/ipf/t_nat_parse.sh Sun Jun 29 09:26:32 2014
@@ -1,4 +1,4 @@
-# $NetBSD: t_nat_parse.sh,v 1.7 2014/06/29 04:00:59 darrenr Exp $
+# $NetBSD: t_nat_parse.sh,v 1.8 2014/06/29 09:26:32 darrenr Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -47,6 +47,16 @@ test_case in7 intest text text
test_case in100 intest text text
test_case in101 intest text text
test_case in102 intest text text
+test_case in1_6 intest text text
+test_case in2_6 intest text text
+test_case in3_6 intest text text
+test_case in4_6 intest text text
+test_case in5_6 intest text text
+test_case in6_6 intest text text
+test_case in8_6 intest text text
+test_case in100_6 intest text text
+test_case in101_6 intest text text
+test_case in102_6 intest text text
atf_init_test_cases()
{
@@ -60,4 +70,14 @@ atf_init_test_cases()
atf_add_test_case in100
atf_add_test_case in101
atf_add_test_case in102
+ atf_add_test_case in1_6
+ atf_add_test_case in2_6
+ atf_add_test_case in3_6
+ atf_add_test_case in4_6
+ atf_add_test_case in5_6
+ atf_add_test_case in6_6
+ atf_add_test_case in8_6
+ atf_add_test_case in100_6
+ atf_add_test_case in101_6
+ atf_add_test_case in102_6
}
CVS commit: src/tests/ipf
Module Name:src Committed By: darrenr Date: Sun Jun 29 09:25:31 UTC 2014 Added Files: src/tests/ipf/expected: in100_6 in101_6 in102_6 in1_6 in2_6 in3_6 in4_6 in5_6 in6_6 in8_6 src/tests/ipf/regress: in100_6 in101_6 in102_6 in1_6 in2_6 in3_6 in4_6 in5_6 in6_6 in8_6 Log Message: Add in test cases for testing ipnat's parsing of IPv6 NAT rules To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/tests/ipf/expected/in100_6 \ src/tests/ipf/expected/in101_6 src/tests/ipf/expected/in102_6 \ src/tests/ipf/expected/in1_6 src/tests/ipf/expected/in2_6 \ src/tests/ipf/expected/in3_6 src/tests/ipf/expected/in4_6 \ src/tests/ipf/expected/in5_6 src/tests/ipf/expected/in6_6 \ src/tests/ipf/expected/in8_6 cvs rdiff -u -r0 -r1.1 src/tests/ipf/regress/in100_6 \ src/tests/ipf/regress/in101_6 src/tests/ipf/regress/in102_6 \ src/tests/ipf/regress/in1_6 src/tests/ipf/regress/in2_6 \ src/tests/ipf/regress/in3_6 src/tests/ipf/regress/in4_6 \ src/tests/ipf/regress/in5_6 src/tests/ipf/regress/in6_6 \ src/tests/ipf/regress/in8_6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/tests/ipf/expected/in100_6 diff -u /dev/null src/tests/ipf/expected/in100_6:1.1 --- /dev/null Sun Jun 29 09:25:31 2014 +++ src/tests/ipf/expected/in100_6 Sun Jun 29 09:25:31 2014 @@ -0,0 +1,3 @@ +rewrite in on bge0 inet6 from 1:1:1::1/128 to 2:2::2:2/128 -> src 3:3:3::3/128 dst 4::4:4:4/128; +rewrite out on bge0 inet6 from 1:1:1::1/128 to 2:2::2:2/128 -> src 3:3:3::/96 dst 4::4:4:4/128; +rewrite in on bge0 inet6 from 1:1:1::1/128 to 2:2::2:2/128 -> src 3:3:3::/96 dst 4::4:0:0/96; Index: src/tests/ipf/expected/in101_6 diff -u /dev/null src/tests/ipf/expected/in101_6:1.1 --- /dev/null Sun Jun 29 09:25:31 2014 +++ src/tests/ipf/expected/in101_6 Sun Jun 29 09:25:31 2014 @@ -0,0 +1,4 @@ +rewrite in on bge0 inet6 proto icmp from 1:1:1::1/128 to 2:2::2:2/128 -> src 3:3:3::3/128 dst 4::4:4:4/128; +rewrite in on bge0 inet6 proto udp from 1:1:1::1/128 to 2:2::2:2/128 -> src 3:3:3::3/128 dst 4::4:4:4/128; +rewrite out on bge0 inet6 proto tcp from 1:1:1::1/128 to 2:2::2:2/128 -> src 3::/24 dst 4::4:4:4/128; +rewrite in on bge0 inet6 proto tcp/udp from 1:1:1::1/128 to 2:2::/32 -> src 3::/24,20202 dst 4::/24,10101; Index: src/tests/ipf/expected/in102_6 diff -u /dev/null src/tests/ipf/expected/in102_6:1.1 --- /dev/null Sun Jun 29 09:25:31 2014 +++ src/tests/ipf/expected/in102_6 Sun Jun 29 09:25:31 2014 @@ -0,0 +1,5 @@ +rewrite in on bge0 inet6 proto tcp from any to any -> src any dst dstlist/a; +rewrite in on bge0 inet6 proto tcp from 1:1:1::1/128 to any -> src any dst dstlist/bee; +rewrite in on bge0 inet6 proto tcp from 1:1:1::1/128 to 2:2::2:2/128 -> src any dst dstlist/cat; +rewrite in on bge0 inet6 proto tcp from pool/a to 2:2::2:2/128 -> src any dst dstlist/bat; +rewrite in on bge0 inet6 proto tcp from pool/a to pool/1 -> src any dst dstlist/ant; Index: src/tests/ipf/expected/in1_6 diff -u /dev/null src/tests/ipf/expected/in1_6:1.1 --- /dev/null Sun Jun 29 09:25:31 2014 +++ src/tests/ipf/expected/in1_6 Sun Jun 29 09:25:31 2014 @@ -0,0 +1,29 @@ +map le0 inet6 any -> ::/128 +map le0 inet6 any -> any +map le0 inet6 ::/1 -> any +map le0 inet6 10::/16 -> 1:2:3::/96 +map le0 inet6 10::/16 -> 1:2:3::/96 +map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45 +map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp 1:1 +map ppp0 inet6 192:168::/32 -> ::/128 portmap udp 2:2 +map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp/udp 3:3 +map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp auto +map ppp0 inet6 192:168::/32 -> ::/128 portmap udp auto +map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp/udp auto +map ppp0 inet6 192:168::/32 -> ::/128 proxy port 21 ftp/tcp +map ppp0 inet6 192:168::/32 -> ::/128 proxy port 1010 ftp/tcp +map le0 inet6 any -> ::/128 frag +map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45 frag +map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp 1:1 frag +map ppp0 inet6 192:168::/32 -> ::/128 proxy port 21 ftp/tcp frag +map le0 inet6 any -> ::/128 age 10/10 +map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45 age 10/20 +map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp 1:1 age 30/30 +map le0 inet6 any -> ::/128 frag age 10/10 +map le0 inet6 192:168::/32 -> range 203:1:1::23-203:1:3::45 frag age 10/20 +map ppp0 inet6 192:168::/32 -> ::/128 portmap tcp 1:1 frag age 30/30 +map fxp0 inet6 from 192::/18 to any port = 21 -> 1:2:3::4/128 proxy port 21 ftp/tcp +map thisisalonginte inet6 any -> ::/128 mssclamp 1452 tag freddyliveshere +map bar0 inet6 any -> ::/128 icmpidmap icmp 1000:2000 +map ppp0,adsl0 inet6 any -> ::/128 +map ppp0 inet6 from 192:168::/32 to any port = 123 -> ::/128 age 30/1 udp Index: src/tests/ipf/expected/in2_6 diff -u /dev/null src/tests/ipf/expected/in2_6:1.1 --- /dev/null Sun Jun 29 09:25:31
CVS commit: src/tests/ipf
Module Name:src Committed By: darrenr Date: Sun Jun 29 04:00:59 UTC 2014 Modified Files: src/tests/ipf: t_nat_parse.sh Log Message: in2 is no longer a broken test case To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/ipf/t_nat_parse.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/t_nat_parse.sh diff -u src/tests/ipf/t_nat_parse.sh:1.6 src/tests/ipf/t_nat_parse.sh:1.7 --- src/tests/ipf/t_nat_parse.sh:1.6 Sun Jul 8 00:48:29 2012 +++ src/tests/ipf/t_nat_parse.sh Sun Jun 29 04:00:59 2014 @@ -1,4 +1,4 @@ -# $NetBSD: t_nat_parse.sh,v 1.6 2012/07/08 00:48:29 pgoyette Exp $ +# $NetBSD: t_nat_parse.sh,v 1.7 2014/06/29 04:00:59 darrenr Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -38,7 +38,7 @@ intest() } test_case in1 intest text text -broken_test_case in2 intest text text +test_case in2 intest text text test_case in3 intest text text test_case in4 intest text text test_case in5 intest text text
CVS commit: src/tests/ipf
Module Name:src Committed By: martin Date: Thu May 16 07:43:02 UTC 2013 Modified Files: src/tests/ipf: t_nat_exec.sh Log Message: Mark two more test case as only failing for BE To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/tests/ipf/t_nat_exec.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/t_nat_exec.sh diff -u src/tests/ipf/t_nat_exec.sh:1.17 src/tests/ipf/t_nat_exec.sh:1.18 --- src/tests/ipf/t_nat_exec.sh:1.17 Thu May 16 07:20:29 2013 +++ src/tests/ipf/t_nat_exec.sh Thu May 16 07:43:02 2013 @@ -1,4 +1,4 @@ -# $NetBSD: t_nat_exec.sh,v 1.17 2013/05/16 07:20:29 martin Exp $ +# $NetBSD: t_nat_exec.sh,v 1.18 2013/05/16 07:43:02 martin Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -92,8 +92,8 @@ test_case n4_6 nattest text text -6 test_case n5_6 nattest text text -6 test_case n6_6 nattest text text -6 test_case n7_6 nattest text text -6 -failing_test_case n8_6 nattest "See PR kern/47665" hex hex -6 -failing_test_case n9_6 nattest "See PR kern/47665" hex hex -6 +failing_test_case_be n8_6 nattest "See PR kern/47665" hex hex -6 +failing_test_case_be n9_6 nattest "See PR kern/47665" hex hex -6 test_case n11_6 nattest text text -6 test_case n12_6 nattest hex hex -6 test_case n15_6 nattest text text -6
CVS commit: src/tests/ipf
Module Name:src
Committed By: martin
Date: Thu May 16 07:20:29 UTC 2013
Modified Files:
src/tests/ipf: h_common.sh t_nat_exec.sh
Log Message:
Assume that the NAT failures that happen on some architectures are endianess
bugs, so do not expect failure on LE archs for now.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/ipf/h_common.sh
cvs rdiff -u -r1.16 -r1.17 src/tests/ipf/t_nat_exec.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/h_common.sh
diff -u src/tests/ipf/h_common.sh:1.7 src/tests/ipf/h_common.sh:1.8
--- src/tests/ipf/h_common.sh:1.7 Sat Dec 1 04:43:44 2012
+++ src/tests/ipf/h_common.sh Thu May 16 07:20:29 2013
@@ -1,4 +1,4 @@
-# $NetBSD: h_common.sh,v 1.7 2012/12/01 04:43:44 pgoyette Exp $
+# $NetBSD: h_common.sh,v 1.8 2013/05/16 07:20:29 martin Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -75,3 +75,26 @@ failing_test_case()
${check_function} '${name}' " "${@}" "; \
}"
}
+
+failing_test_case_be()
+{
+ # this test fails on some architectures - not fully analyzed, assume
+ # an endianess bug
+ local name="${1}"; shift
+ local check_function="${1}"; shift
+ local reason="${1}"; shift
+
+ atf_test_case "${name}"
+
+ if [ `sysctl -n hw.byteorder` = 4321 ]; then
+ eval "${name}_body() { \
+ atf_expect_fail '${reason}'; \
+ ${check_function} '${name}' " "${@}" "; \
+ }"
+ else
+ eval "${name}_body() { \
+ ${check_function} '${name}' " "${@}" "; \
+ }"
+ fi
+}
+
Index: src/tests/ipf/t_nat_exec.sh
diff -u src/tests/ipf/t_nat_exec.sh:1.16 src/tests/ipf/t_nat_exec.sh:1.17
--- src/tests/ipf/t_nat_exec.sh:1.16 Tue Mar 19 13:23:58 2013
+++ src/tests/ipf/t_nat_exec.sh Thu May 16 07:20:29 2013
@@ -1,4 +1,4 @@
-# $NetBSD: t_nat_exec.sh,v 1.16 2013/03/19 13:23:58 martin Exp $
+# $NetBSD: t_nat_exec.sh,v 1.17 2013/05/16 07:20:29 martin Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -67,13 +67,13 @@ test_case n4 nattest text text
test_case n5 nattest text text
test_case n6 nattest text text
test_case n7 nattest text text
-failing_test_case n8 nattest "See PR kern/47665" hex hex -T update_ipid=0
-failing_test_case n9 nattest "See PR kern/47665" hex hex -T update_ipid=0
+failing_test_case_be n8 nattest "See PR kern/47665" hex hex -T update_ipid=0
+failing_test_case_be n9 nattest "See PR kern/47665" hex hex -T update_ipid=0
test_case n10 nattest hex hex -T update_ipid=0
test_case n11 nattest text text
failing_test_case n12 nattest "Known to be broken" hex hex -T update_ipid=0 -v
test_case n13 nattest text text
-failing_test_case n14 nattest "See PR kern/47665" text text
+failing_test_case_be n14 nattest "See PR kern/47665" text text
test_case n15 nattest text text -T update_ipid=0
test_case n16 nattest hex hex -D
test_case n17 nattest hex hex -D
CVS commit: src/tests/ipf
Module Name:src Committed By: martin Date: Tue Mar 19 13:23:58 UTC 2013 Modified Files: src/tests/ipf: t_nat_exec.sh Log Message: Fix argument order for "n14" To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/tests/ipf/t_nat_exec.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/t_nat_exec.sh diff -u src/tests/ipf/t_nat_exec.sh:1.15 src/tests/ipf/t_nat_exec.sh:1.16 --- src/tests/ipf/t_nat_exec.sh:1.15 Mon Mar 18 20:03:56 2013 +++ src/tests/ipf/t_nat_exec.sh Tue Mar 19 13:23:58 2013 @@ -1,4 +1,4 @@ -# $NetBSD: t_nat_exec.sh,v 1.15 2013/03/18 20:03:56 martin Exp $ +# $NetBSD: t_nat_exec.sh,v 1.16 2013/03/19 13:23:58 martin Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -73,7 +73,7 @@ test_case n10 nattest hex hex -T update_ test_case n11 nattest text text failing_test_case n12 nattest "Known to be broken" hex hex -T update_ipid=0 -v test_case n13 nattest text text -failing_test_case n14 "See PR kern/47665" nattest text text +failing_test_case n14 nattest "See PR kern/47665" text text test_case n15 nattest text text -T update_ipid=0 test_case n16 nattest hex hex -D test_case n17 nattest hex hex -D
CVS commit: src/tests/ipf
Module Name:src Committed By: martin Date: Mon Mar 18 20:03:56 UTC 2013 Modified Files: src/tests/ipf: t_nat_exec.sh Log Message: Mark a few more test cases known to only work by chance as failing and point to PR 47665. Julio: how do we make such cases not fail when they actually happen to work (by pure luck)? To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/tests/ipf/t_nat_exec.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/t_nat_exec.sh diff -u src/tests/ipf/t_nat_exec.sh:1.14 src/tests/ipf/t_nat_exec.sh:1.15 --- src/tests/ipf/t_nat_exec.sh:1.14 Sun Mar 17 03:00:05 2013 +++ src/tests/ipf/t_nat_exec.sh Mon Mar 18 20:03:56 2013 @@ -1,4 +1,4 @@ -# $NetBSD: t_nat_exec.sh,v 1.14 2013/03/17 03:00:05 jmmv Exp $ +# $NetBSD: t_nat_exec.sh,v 1.15 2013/03/18 20:03:56 martin Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -67,13 +67,13 @@ test_case n4 nattest text text test_case n5 nattest text text test_case n6 nattest text text test_case n7 nattest text text -test_case n8 nattest hex hex -T update_ipid=0 -test_case n9 nattest hex hex -T update_ipid=0 +failing_test_case n8 nattest "See PR kern/47665" hex hex -T update_ipid=0 +failing_test_case n9 nattest "See PR kern/47665" hex hex -T update_ipid=0 test_case n10 nattest hex hex -T update_ipid=0 test_case n11 nattest text text failing_test_case n12 nattest "Known to be broken" hex hex -T update_ipid=0 -v test_case n13 nattest text text -test_case n14 nattest text text +failing_test_case n14 "See PR kern/47665" nattest text text test_case n15 nattest text text -T update_ipid=0 test_case n16 nattest hex hex -D test_case n17 nattest hex hex -D @@ -92,8 +92,8 @@ test_case n4_6 nattest text text -6 test_case n5_6 nattest text text -6 test_case n6_6 nattest text text -6 test_case n7_6 nattest text text -6 -test_case n8_6 nattest hex hex -6 -test_case n9_6 nattest hex hex -6 +failing_test_case n8_6 nattest "See PR kern/47665" hex hex -6 +failing_test_case n9_6 nattest "See PR kern/47665" hex hex -6 test_case n11_6 nattest text text -6 test_case n12_6 nattest hex hex -6 test_case n15_6 nattest text text -6
CVS commit: src/tests/ipf
Module Name:src Committed By: jmmv Date: Sun Mar 17 03:00:05 UTC 2013 Modified Files: src/tests/ipf: t_filter_exec.sh t_filter_parse.sh t_nat_exec.sh Log Message: Mark some long-standing failures as known failures. The offending tests are these: - t_filter_exec: f26, f27. - t_filter_parse: i17. - t_nat_exec: n12. These tests are confirmed to fail in NetBSD/current under amd64, i386 and sparc as reported by the continuous testing systems. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/tests/ipf/t_filter_exec.sh cvs rdiff -u -r1.9 -r1.10 src/tests/ipf/t_filter_parse.sh cvs rdiff -u -r1.13 -r1.14 src/tests/ipf/t_nat_exec.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/t_filter_exec.sh diff -u src/tests/ipf/t_filter_exec.sh:1.7 src/tests/ipf/t_filter_exec.sh:1.8 --- src/tests/ipf/t_filter_exec.sh:1.7 Sat Jul 7 23:29:44 2012 +++ src/tests/ipf/t_filter_exec.sh Sun Mar 17 03:00:05 2013 @@ -1,4 +1,4 @@ -# $NetBSD: t_filter_exec.sh,v 1.7 2012/07/07 23:29:44 pgoyette Exp $ +# $NetBSD: t_filter_exec.sh,v 1.8 2013/03/17 03:00:05 jmmv Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -130,8 +130,8 @@ test_case f19 dotest text text -T state_ test_case f20 mtest text text test_case f24 mtest hex text test_case f25 mtest hex text -D -test_case f26 dotest text text -test_case f27 dotest hex text +failing_test_case f26 dotest "Known to be broken" text text +failing_test_case f27 dotest "Known to be broken" hex text test_case f30 dotest text text test_case ipv6_1 dotest6 hex hex test_case ipv6_2 dotest6 hex hex Index: src/tests/ipf/t_filter_parse.sh diff -u src/tests/ipf/t_filter_parse.sh:1.9 src/tests/ipf/t_filter_parse.sh:1.10 --- src/tests/ipf/t_filter_parse.sh:1.9 Mon Dec 3 19:43:36 2012 +++ src/tests/ipf/t_filter_parse.sh Sun Mar 17 03:00:05 2013 @@ -1,4 +1,4 @@ -# $NetBSD: t_filter_parse.sh,v 1.9 2012/12/03 19:43:36 pgoyette Exp $ +# $NetBSD: t_filter_parse.sh,v 1.10 2013/03/17 03:00:05 jmmv Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -99,7 +99,7 @@ test_case i13 itest text ipf test_case i14 itest text ipf test_case i15 itest text ipf test_case i16 itest text ipf -test_case i17 itest text ipftest +failing_test_case i17 itest "Known to be broken" text ipftest test_case i18 itest text ipf test_case i19 itest_i19 "PR kern/47262 Proto-family missing from logs" text ipf test_case i20 itest text ipf Index: src/tests/ipf/t_nat_exec.sh diff -u src/tests/ipf/t_nat_exec.sh:1.13 src/tests/ipf/t_nat_exec.sh:1.14 --- src/tests/ipf/t_nat_exec.sh:1.13 Sun Dec 2 08:52:06 2012 +++ src/tests/ipf/t_nat_exec.sh Sun Mar 17 03:00:05 2013 @@ -1,4 +1,4 @@ -# $NetBSD: t_nat_exec.sh,v 1.13 2012/12/02 08:52:06 pgoyette Exp $ +# $NetBSD: t_nat_exec.sh,v 1.14 2013/03/17 03:00:05 jmmv Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -71,7 +71,7 @@ test_case n8 nattest hex hex -T update_i test_case n9 nattest hex hex -T update_ipid=0 test_case n10 nattest hex hex -T update_ipid=0 test_case n11 nattest text text -test_case n12 nattest hex hex -T update_ipid=0 -v +failing_test_case n12 nattest "Known to be broken" hex hex -T update_ipid=0 -v test_case n13 nattest text text test_case n14 nattest text text test_case n15 nattest text text -T update_ipid=0
CVS commit: src/tests/ipf
Module Name:src Committed By: pgoyette Date: Mon Dec 3 23:39:30 UTC 2012 Modified Files: src/tests/ipf: t_pools.sh Log Message: Christos fixed the crash in ipftest, so re-enable the failing tests. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/tests/ipf/t_pools.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/t_pools.sh diff -u src/tests/ipf/t_pools.sh:1.7 src/tests/ipf/t_pools.sh:1.8 --- src/tests/ipf/t_pools.sh:1.7 Sat Dec 1 21:25:51 2012 +++ src/tests/ipf/t_pools.sh Mon Dec 3 23:39:30 2012 @@ -1,4 +1,4 @@ -# $NetBSD: t_pools.sh,v 1.7 2012/12/01 21:25:51 pgoyette Exp $ +# $NetBSD: t_pools.sh,v 1.8 2012/12/03 23:39:30 pgoyette Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -73,9 +73,9 @@ test_case p5 ptest text text test_case p6 ptest text text test_case p7 ptest text text test_case p9 ptest text text -failing_test_case p10 ptest "PR kern/47270 - ipftest -P -N is broken" text text -failing_test_case p11 ptest "PR kern/47270 - ipftest -P -N is broken" text text -failing_test_case p12 ptest "PR kern/47270 - ipftest -P -N is broken" text text +test_case p10 ptest text text +test_case p11 ptest text text +test_case p12 ptest text text test_case p13 ptest text text test_case ip1 iptest text text test_case ip2 iptest text text
CVS commit: src/tests/ipf
Module Name:src Committed By: pgoyette Date: Mon Dec 3 21:29:16 UTC 2012 Modified Files: src/tests/ipf/expected: i14 src/tests/ipf/regress: i14 Log Message: Add a couple more inet6 tests to verify correct rule parsing To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/ipf/expected/i14 cvs rdiff -u -r1.5 -r1.6 src/tests/ipf/regress/i14 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/expected/i14 diff -u src/tests/ipf/expected/i14:1.6 src/tests/ipf/expected/i14:1.7 --- src/tests/ipf/expected/i14:1.6 Mon Dec 3 20:43:59 2012 +++ src/tests/ipf/expected/i14 Mon Dec 3 21:29:16 2012 @@ -11,3 +11,5 @@ pass in inet proto tcp/udp from 1.1.1.1/ block in on vm0(!) proto tcp/udp from any to any head vm0-group pass in inet proto tcp/udp from 1.1.1.1/32 to 2.2.2.2/32 group vm0-group pass in inet6 from 8f::/128 to f8::/128 +block in inet6 proto udp from any to any +block in inet6 all Index: src/tests/ipf/regress/i14 diff -u src/tests/ipf/regress/i14:1.5 src/tests/ipf/regress/i14:1.6 --- src/tests/ipf/regress/i14:1.5 Mon Dec 3 20:43:59 2012 +++ src/tests/ipf/regress/i14 Mon Dec 3 21:29:15 2012 @@ -11,3 +11,5 @@ pass in from 1.1.1.1 to 2.2.2.2 group vm block in on vm0 proto tcp/udp all head vm0-group pass in from 1.1.1.1 to 2.2.2.2 group vm0-group pass in from 8f:: to f8:: +block in inet6 proto udp +block in inet6
CVS commit: src/tests/ipf
Module Name:src Committed By: pgoyette Date: Mon Dec 3 20:43:59 UTC 2012 Modified Files: src/tests/ipf/expected: i14 src/tests/ipf/regress: i14 Log Message: Include an explicit test for correctly inferring family inet6 when there is an IPv6 address in the rule To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/ipf/expected/i14 cvs rdiff -u -r1.4 -r1.5 src/tests/ipf/regress/i14 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/expected/i14 diff -u src/tests/ipf/expected/i14:1.5 src/tests/ipf/expected/i14:1.6 --- src/tests/ipf/expected/i14:1.5 Mon Dec 3 19:35:33 2012 +++ src/tests/ipf/expected/i14 Mon Dec 3 20:43:59 2012 @@ -10,3 +10,4 @@ block in on vm0(!) proto tcp/udp from an pass in inet proto tcp/udp from 1.1.1.1/32 to 2.2.2.2/32 group vm0-group block in on vm0(!) proto tcp/udp from any to any head vm0-group pass in inet proto tcp/udp from 1.1.1.1/32 to 2.2.2.2/32 group vm0-group +pass in inet6 from 8f::/128 to f8::/128 Index: src/tests/ipf/regress/i14 diff -u src/tests/ipf/regress/i14:1.4 src/tests/ipf/regress/i14:1.5 --- src/tests/ipf/regress/i14:1.4 Fri Mar 23 23:08:03 2012 +++ src/tests/ipf/regress/i14 Mon Dec 3 20:43:59 2012 @@ -10,3 +10,4 @@ block in on vm0 proto tcp/udp all head v pass in from 1.1.1.1 to 2.2.2.2 group vm0-group block in on vm0 proto tcp/udp all head vm0-group pass in from 1.1.1.1 to 2.2.2.2 group vm0-group +pass in from 8f:: to f8::
CVS commit: src/tests/ipf
Module Name:src Committed By: pgoyette Date: Mon Dec 3 19:43:36 UTC 2012 Modified Files: src/tests/ipf: t_filter_parse.sh Log Message: Now that expected output files have been adjusted, we can remove the expectation that tests i14 and i19 will fail. Should address kern/47262 which will be closed. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/tests/ipf/t_filter_parse.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/t_filter_parse.sh diff -u src/tests/ipf/t_filter_parse.sh:1.8 src/tests/ipf/t_filter_parse.sh:1.9 --- src/tests/ipf/t_filter_parse.sh:1.8 Sat Dec 1 04:19:24 2012 +++ src/tests/ipf/t_filter_parse.sh Mon Dec 3 19:43:36 2012 @@ -1,4 +1,4 @@ -# $NetBSD: t_filter_parse.sh,v 1.8 2012/12/01 04:19:24 pgoyette Exp $ +# $NetBSD: t_filter_parse.sh,v 1.9 2012/12/03 19:43:36 pgoyette Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -96,12 +96,12 @@ test_case i10 itest text ipf test_case i11 itest text ipf test_case i12 itest text ipf test_case i13 itest text ipf -failing_test_case i14 itest "PR kern/47262 Proto-family missing from logs" text ipf +test_case i14 itest text ipf test_case i15 itest text ipf test_case i16 itest text ipf test_case i17 itest text ipftest test_case i18 itest text ipf -failing_test_case i19 itest_i19 "PR kern/47262 Proto-family missing from logs" text ipf +test_case i19 itest_i19 "PR kern/47262 Proto-family missing from logs" text ipf test_case i20 itest text ipf test_case i21 itest text ipf test_case i22 itest text ipf
CVS commit: src/tests/ipf/expected
Module Name:src Committed By: pgoyette Date: Mon Dec 3 19:42:00 UTC 2012 Modified Files: src/tests/ipf/expected: i19.dist Log Message: Without explicit address, the address family is not inferred and not displayed in the output. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/ipf/expected/i19.dist Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/expected/i19.dist diff -u src/tests/ipf/expected/i19.dist:1.4 src/tests/ipf/expected/i19.dist:1.5 --- src/tests/ipf/expected/i19.dist:1.4 Fri Mar 23 23:08:00 2012 +++ src/tests/ipf/expected/i19.dist Mon Dec 3 19:42:00 2012 @@ -1,22 +1,22 @@ -block in log level user.debug quick inet proto icmp from any to any -block in log level mail.info quick inet proto icmp from any to any -block in log level daemon.notice quick inet proto icmp from any to any -block in log level auth.warn quick inet proto icmp from any to any -block in log level syslog.err quick inet proto icmp from any to any -block in log level lpr.crit quick inet proto icmp from any to any -block in log level news.alert quick inet proto icmp from any to any -block in log level uucp.emerg quick inet proto icmp from any to any -block in log level cron.debug quick inet proto icmp from any to any -block in log level ftp.info quick inet proto icmp from any to any -block in log level authpriv.notice quick inet proto icmp from any to any -block in log level logalert.warn quick inet proto icmp from any to any -block in log level local0.err quick inet proto icmp from any to any -block in log level local1.crit quick inet proto icmp from any to any -block in log level local2.alert quick inet proto icmp from any to any -block in log level local3.emerg quick inet proto icmp from any to any -block in log level local4.debug quick inet proto icmp from any to any -block in log level local5.info quick inet proto icmp from any to any -block in log level local6.notice quick inet proto icmp from any to any -block in log level local7.warn quick inet proto icmp from any to any -block in log level kern.err quick inet proto icmp from any to any -block in log level security.emerg quick inet proto icmp from any to any +block in log level user.debug quick proto icmp from any to any +block in log level mail.info quick proto icmp from any to any +block in log level daemon.notice quick proto icmp from any to any +block in log level auth.warn quick proto icmp from any to any +block in log level syslog.err quick proto icmp from any to any +block in log level lpr.crit quick proto icmp from any to any +block in log level news.alert quick proto icmp from any to any +block in log level uucp.emerg quick proto icmp from any to any +block in log level cron.debug quick proto icmp from any to any +block in log level ftp.info quick proto icmp from any to any +block in log level authpriv.notice quick proto icmp from any to any +block in log level logalert.warn quick proto icmp from any to any +block in log level local0.err quick proto icmp from any to any +block in log level local1.crit quick proto icmp from any to any +block in log level local2.alert quick proto icmp from any to any +block in log level local3.emerg quick proto icmp from any to any +block in log level local4.debug quick proto icmp from any to any +block in log level local5.info quick proto icmp from any to any +block in log level local6.notice quick proto icmp from any to any +block in log level local7.warn quick proto icmp from any to any +block in log level kern.err quick proto icmp from any to any +block in log level security.emerg quick proto icmp from any to any
CVS commit: src/tests/ipf/expected
Module Name:src Committed By: pgoyette Date: Mon Dec 3 19:35:33 UTC 2012 Modified Files: src/tests/ipf/expected: i14 Log Message: For rules without any address, don't infer an address family. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/ipf/expected/i14 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/expected/i14 diff -u src/tests/ipf/expected/i14:1.4 src/tests/ipf/expected/i14:1.5 --- src/tests/ipf/expected/i14:1.4 Fri Mar 23 23:08:00 2012 +++ src/tests/ipf/expected/i14 Mon Dec 3 19:35:33 2012 @@ -1,5 +1,5 @@ block in on eri0(!) all head 1 -pass in on eri0(!) inet proto icmp from any to any group 1 +pass in on eri0(!) proto icmp from any to any group 1 pass out on ed0(!) all head 100 block out on ed0(!) proto udp from any to any group 100 block in on vm0(!) proto tcp/udp from any to any head 101
CVS commit: src/tests/ipf
Module Name:src Committed By: pgoyette Date: Sun Dec 2 08:52:07 UTC 2012 Modified Files: src/tests/ipf: t_nat_exec.sh Log Message: Test-case n3_6 is not applicable to NetBSD (according to Darren R.) To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/tests/ipf/t_nat_exec.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/t_nat_exec.sh diff -u src/tests/ipf/t_nat_exec.sh:1.12 src/tests/ipf/t_nat_exec.sh:1.13 --- src/tests/ipf/t_nat_exec.sh:1.12 Sat Dec 1 21:37:41 2012 +++ src/tests/ipf/t_nat_exec.sh Sun Dec 2 08:52:06 2012 @@ -1,4 +1,4 @@ -# $NetBSD: t_nat_exec.sh,v 1.12 2012/12/01 21:37:41 pgoyette Exp $ +# $NetBSD: t_nat_exec.sh,v 1.13 2012/12/02 08:52:06 pgoyette Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -87,7 +87,7 @@ test_case n106 nattest hex hex -T update test_case n200 nattest hex hex -T update_ipid=0 test_case n1_6 nattest text text -6 test_case n2_6 nattest text text -6 -failing_test_case n3_6 nattest "Test input file missing" text text -6 +#test_case n3_6 nattest text text -6 test_case n4_6 nattest text text -6 test_case n5_6 nattest text text -6 test_case n6_6 nattest text text -6 @@ -128,7 +128,7 @@ atf_init_test_cases() atf_add_test_case n1_6 atf_add_test_case n2_6 - atf_add_test_case n3_6 +# atf_add_test_case n3_6 atf_add_test_case n4_6 atf_add_test_case n5_6 atf_add_test_case n6_6
CVS commit: src/tests/ipf
Module Name:src
Committed By: pgoyette
Date: Sat Dec 1 21:37:41 UTC 2012
Modified Files:
src/tests/ipf: t_nat_exec.sh
Log Message:
More test clean-up
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/tests/ipf/t_nat_exec.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/t_nat_exec.sh
diff -u src/tests/ipf/t_nat_exec.sh:1.11 src/tests/ipf/t_nat_exec.sh:1.12
--- src/tests/ipf/t_nat_exec.sh:1.11 Thu Nov 29 17:22:17 2012
+++ src/tests/ipf/t_nat_exec.sh Sat Dec 1 21:37:41 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_nat_exec.sh,v 1.11 2012/11/29 17:22:17 pgoyette Exp $
+# $NetBSD: t_nat_exec.sh,v 1.12 2012/12/01 21:37:41 pgoyette Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -48,6 +48,8 @@ nattest()
format="$format"
+ test -f in && test -f reg || atf_fail "Test input file missing"
+
{ while read rule; do
atf_check -o save:save -x \
"echo \"$rule\" | ipftest $format -RDbN - -i in $args"
@@ -95,7 +97,7 @@ test_case n9_6 nattest hex hex -6
test_case n11_6 nattest text text -6
test_case n12_6 nattest hex hex -6
test_case n15_6 nattest text text -6
-failing_test_case n17_6 nattest "Test input file missing" hex hex -6
+failing_test_case n17_6 nattest "Test golden output file missing" hex hex -6
atf_init_test_cases()
{
CVS commit: src/tests/ipf
Module Name:src Committed By: pgoyette Date: Sat Dec 1 21:25:51 UTC 2012 Modified Files: src/tests/ipf: t_pools.sh Log Message: Put the reason for expected failure in the correct position To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/ipf/t_pools.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/t_pools.sh diff -u src/tests/ipf/t_pools.sh:1.6 src/tests/ipf/t_pools.sh:1.7 --- src/tests/ipf/t_pools.sh:1.6 Sat Dec 1 04:40:00 2012 +++ src/tests/ipf/t_pools.sh Sat Dec 1 21:25:51 2012 @@ -1,4 +1,4 @@ -# $NetBSD: t_pools.sh,v 1.6 2012/12/01 04:40:00 pgoyette Exp $ +# $NetBSD: t_pools.sh,v 1.7 2012/12/01 21:25:51 pgoyette Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -73,9 +73,9 @@ test_case p5 ptest text text test_case p6 ptest text text test_case p7 ptest text text test_case p9 ptest text text -failing_test_case p10 "PR kern/47270 - ipftest -P -N is broken" ptest text text -failing_test_case p11 "PR kern/47270 - ipftest -P -N is broken" ptest text text -failing_test_case p12 "PR kern/47270 - ipftest -P -N is broken" ptest text text +failing_test_case p10 ptest "PR kern/47270 - ipftest -P -N is broken" text text +failing_test_case p11 ptest "PR kern/47270 - ipftest -P -N is broken" text text +failing_test_case p12 ptest "PR kern/47270 - ipftest -P -N is broken" text text test_case p13 ptest text text test_case ip1 iptest text text test_case ip2 iptest text text
CVS commit: src/tests/ipf
Module Name:src
Committed By: pgoyette
Date: Sat Dec 1 04:43:44 UTC 2012
Modified Files:
src/tests/ipf: h_common.sh
Log Message:
Use proper quoting for the expected-failure reason
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/ipf/h_common.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/h_common.sh
diff -u src/tests/ipf/h_common.sh:1.6 src/tests/ipf/h_common.sh:1.7
--- src/tests/ipf/h_common.sh:1.6 Fri Nov 30 14:46:48 2012
+++ src/tests/ipf/h_common.sh Sat Dec 1 04:43:44 2012
@@ -1,4 +1,4 @@
-# $NetBSD: h_common.sh,v 1.6 2012/11/30 14:46:48 pgoyette Exp $
+# $NetBSD: h_common.sh,v 1.7 2012/12/01 04:43:44 pgoyette Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -71,7 +71,7 @@ failing_test_case()
atf_test_case "${name}"
eval "${name}_body() { \
- atf_expect_fail "${reason}"; \
+ atf_expect_fail '${reason}'; \
${check_function} '${name}' " "${@}" "; \
}"
}
CVS commit: src/tests/ipf
Module Name:src Committed By: pgoyette Date: Sat Dec 1 04:40:00 UTC 2012 Modified Files: src/tests/ipf: t_pools.sh Log Message: Now that we have a PR for the brokenness in "ipftest -P -N", mark the related tests as Expected Failure rather than just skipping the tests. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/ipf/t_pools.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/t_pools.sh diff -u src/tests/ipf/t_pools.sh:1.5 src/tests/ipf/t_pools.sh:1.6 --- src/tests/ipf/t_pools.sh:1.5 Sun Jul 8 00:36:46 2012 +++ src/tests/ipf/t_pools.sh Sat Dec 1 04:40:00 2012 @@ -1,4 +1,4 @@ -# $NetBSD: t_pools.sh,v 1.5 2012/07/08 00:36:46 pgoyette Exp $ +# $NetBSD: t_pools.sh,v 1.6 2012/12/01 04:40:00 pgoyette Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -73,9 +73,9 @@ test_case p5 ptest text text test_case p6 ptest text text test_case p7 ptest text text test_case p9 ptest text text -broken_test_case p10 ptest text text -broken_test_case p11 ptest text text -broken_test_case p12 ptest text text +failing_test_case p10 "PR kern/47270 - ipftest -P -N is broken" ptest text text +failing_test_case p11 "PR kern/47270 - ipftest -P -N is broken" ptest text text +failing_test_case p12 "PR kern/47270 - ipftest -P -N is broken" ptest text text test_case p13 ptest text text test_case ip1 iptest text text test_case ip2 iptest text text
CVS commit: src/tests/ipf
Module Name:src Committed By: pgoyette Date: Sat Dec 1 04:19:24 UTC 2012 Modified Files: src/tests/ipf: t_filter_parse.sh Log Message: Based on the error messages, the test is not broken, but ipftest probably in broken. Once we can analyze the error further, we can open a PR in Gnats and then move this to Expected-Failure. But we shouldn't skip it because we'll never come back to fix it. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/tests/ipf/t_filter_parse.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/t_filter_parse.sh diff -u src/tests/ipf/t_filter_parse.sh:1.7 src/tests/ipf/t_filter_parse.sh:1.8 --- src/tests/ipf/t_filter_parse.sh:1.7 Thu Nov 29 17:11:19 2012 +++ src/tests/ipf/t_filter_parse.sh Sat Dec 1 04:19:24 2012 @@ -1,4 +1,4 @@ -# $NetBSD: t_filter_parse.sh,v 1.7 2012/11/29 17:11:19 pgoyette Exp $ +# $NetBSD: t_filter_parse.sh,v 1.8 2012/12/01 04:19:24 pgoyette Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -99,7 +99,7 @@ test_case i13 itest text ipf failing_test_case i14 itest "PR kern/47262 Proto-family missing from logs" text ipf test_case i15 itest text ipf test_case i16 itest text ipf -broken_test_case i17 itest text ipftest +test_case i17 itest text ipftest test_case i18 itest text ipf failing_test_case i19 itest_i19 "PR kern/47262 Proto-family missing from logs" text ipf test_case i20 itest text ipf
CVS commit: src/tests/ipf
Module Name:src
Committed By: pgoyette
Date: Fri Nov 30 14:46:48 UTC 2012
Modified Files:
src/tests/ipf: h_common.sh
Log Message:
If we're going to expect a failure, we need to use the correct shell
function! "atf_expect_fail()" does not have a "_tc" in its name!
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/ipf/h_common.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/h_common.sh
diff -u src/tests/ipf/h_common.sh:1.5 src/tests/ipf/h_common.sh:1.6
--- src/tests/ipf/h_common.sh:1.5 Thu Nov 29 18:54:43 2012
+++ src/tests/ipf/h_common.sh Fri Nov 30 14:46:48 2012
@@ -1,4 +1,4 @@
-# $NetBSD: h_common.sh,v 1.5 2012/11/29 18:54:43 pgoyette Exp $
+# $NetBSD: h_common.sh,v 1.6 2012/11/30 14:46:48 pgoyette Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -71,7 +71,7 @@ failing_test_case()
atf_test_case "${name}"
eval "${name}_body() { \
- atf_tc_expect_fail "${reason}"; \
+ atf_expect_fail "${reason}"; \
${check_function} '${name}' " "${@}" "; \
}"
}
CVS commit: src/tests/ipf
Module Name:src
Committed By: pgoyette
Date: Fri Nov 30 01:41:50 UTC 2012
Modified Files:
src/tests/ipf: Makefile
Removed Files:
src/tests/ipf: Atffile
Log Message:
Rather than providing a custom Atffile that requires separate
maintenance, just don't build or install the t_bpf.sh test.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r0 src/tests/ipf/Atffile
cvs rdiff -u -r1.4 -r1.5 src/tests/ipf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/Makefile
diff -u src/tests/ipf/Makefile:1.4 src/tests/ipf/Makefile:1.5
--- src/tests/ipf/Makefile:1.4 Sat Dec 18 13:06:51 2010
+++ src/tests/ipf/Makefile Fri Nov 30 01:41:50 2012
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2010/12/18 13:06:51 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2012/11/30 01:41:50 pgoyette Exp $
NOMAN= # defined
.include
TESTSDIR= ${TESTSBASE}/ipf
-ATFFILE= yes
-.for name in t_bpf t_filter_exec t_filter_parse t_logging t_nat_exec \
+# t_bpf is omitted from the test list since we don't support it on NetBSD
+
+.for name in t_filter_exec t_filter_parse t_logging t_nat_exec \
t_nat_ipf_exec t_nat_parse t_pools
TESTS_SH+= ${name}
TESTS_SH_SRC_${name}= h_common.sh ${name}.sh
CVS commit: src/tests/ipf
Module Name:src
Committed By: pgoyette
Date: Thu Nov 29 18:54:43 UTC 2012
Modified Files:
src/tests/ipf: h_common.sh
Log Message:
fix typo in previous - missing quote
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/ipf/h_common.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/h_common.sh
diff -u src/tests/ipf/h_common.sh:1.4 src/tests/ipf/h_common.sh:1.5
--- src/tests/ipf/h_common.sh:1.4 Thu Nov 29 17:10:21 2012
+++ src/tests/ipf/h_common.sh Thu Nov 29 18:54:43 2012
@@ -1,4 +1,4 @@
-# $NetBSD: h_common.sh,v 1.4 2012/11/29 17:10:21 pgoyette Exp $
+# $NetBSD: h_common.sh,v 1.5 2012/11/29 18:54:43 pgoyette Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -67,7 +67,7 @@ failing_test_case()
{
local name="${1}"; shift
local check_function="${1}"; shift
- local reason="${1}; shift
+ local reason="${1}"; shift
atf_test_case "${name}"
eval "${name}_body() { \
CVS commit: src/tests/ipf
Module Name:src
Committed By: pgoyette
Date: Thu Nov 29 17:22:17 UTC 2012
Modified Files:
src/tests/ipf: t_nat_exec.sh
Log Message:
Update a couple of tests to indicate that they are broken/failing because
of missing input/expected data files
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/tests/ipf/t_nat_exec.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/t_nat_exec.sh
diff -u src/tests/ipf/t_nat_exec.sh:1.10 src/tests/ipf/t_nat_exec.sh:1.11
--- src/tests/ipf/t_nat_exec.sh:1.10 Thu Nov 29 04:57:42 2012
+++ src/tests/ipf/t_nat_exec.sh Thu Nov 29 17:22:17 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_nat_exec.sh,v 1.10 2012/11/29 04:57:42 pgoyette Exp $
+# $NetBSD: t_nat_exec.sh,v 1.11 2012/11/29 17:22:17 pgoyette Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -85,6 +85,7 @@ test_case n106 nattest hex hex -T update
test_case n200 nattest hex hex -T update_ipid=0
test_case n1_6 nattest text text -6
test_case n2_6 nattest text text -6
+failing_test_case n3_6 nattest "Test input file missing" text text -6
test_case n4_6 nattest text text -6
test_case n5_6 nattest text text -6
test_case n6_6 nattest text text -6
@@ -94,7 +95,7 @@ test_case n9_6 nattest hex hex -6
test_case n11_6 nattest text text -6
test_case n12_6 nattest hex hex -6
test_case n15_6 nattest text text -6
-broken_test_case n17_6 nattest hex hex -6
+failing_test_case n17_6 nattest "Test input file missing" hex hex -6
atf_init_test_cases()
{
@@ -125,7 +126,7 @@ atf_init_test_cases()
atf_add_test_case n1_6
atf_add_test_case n2_6
-# atf_add_test_case n3_6
+ atf_add_test_case n3_6
atf_add_test_case n4_6
atf_add_test_case n5_6
atf_add_test_case n6_6
CVS commit: src/tests/ipf
Module Name:src Committed By: pgoyette Date: Thu Nov 29 17:11:19 UTC 2012 Modified Files: src/tests/ipf: t_filter_parse.sh Log Message: Now that I've created PR/47262, reference it in the tests that fail because of the PR To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/ipf/t_filter_parse.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/t_filter_parse.sh diff -u src/tests/ipf/t_filter_parse.sh:1.6 src/tests/ipf/t_filter_parse.sh:1.7 --- src/tests/ipf/t_filter_parse.sh:1.6 Sun Jul 8 00:53:01 2012 +++ src/tests/ipf/t_filter_parse.sh Thu Nov 29 17:11:19 2012 @@ -1,4 +1,4 @@ -# $NetBSD: t_filter_parse.sh,v 1.6 2012/07/08 00:53:01 pgoyette Exp $ +# $NetBSD: t_filter_parse.sh,v 1.7 2012/11/29 17:11:19 pgoyette Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -96,12 +96,12 @@ test_case i10 itest text ipf test_case i11 itest text ipf test_case i12 itest text ipf test_case i13 itest text ipf -test_case i14 itest text ipf +failing_test_case i14 itest "PR kern/47262 Proto-family missing from logs" text ipf test_case i15 itest text ipf test_case i16 itest text ipf broken_test_case i17 itest text ipftest test_case i18 itest text ipf -test_case i19 itest_i19 text ipf +failing_test_case i19 itest_i19 "PR kern/47262 Proto-family missing from logs" text ipf test_case i20 itest text ipf test_case i21 itest text ipf test_case i22 itest text ipf
CVS commit: src/tests/ipf
Module Name:src
Committed By: pgoyette
Date: Thu Nov 29 17:10:21 UTC 2012
Modified Files:
src/tests/ipf: h_common.sh
Log Message:
Add another test option for expected failures, rather than simply
skipping tests
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/ipf/h_common.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/h_common.sh
diff -u src/tests/ipf/h_common.sh:1.3 src/tests/ipf/h_common.sh:1.4
--- src/tests/ipf/h_common.sh:1.3 Sun Nov 7 17:51:19 2010
+++ src/tests/ipf/h_common.sh Thu Nov 29 17:10:21 2012
@@ -1,4 +1,4 @@
-# $NetBSD: h_common.sh,v 1.3 2010/11/07 17:51:19 jmmv Exp $
+# $NetBSD: h_common.sh,v 1.4 2012/11/29 17:10:21 pgoyette Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -62,3 +62,16 @@ broken_test_case()
${check_function} '${name}' " "${@}" "; \
}"
}
+
+failing_test_case()
+{
+ local name="${1}"; shift
+ local check_function="${1}"; shift
+ local reason="${1}; shift
+
+ atf_test_case "${name}"
+ eval "${name}_body() { \
+ atf_tc_expect_fail "${reason}"; \
+ ${check_function} '${name}' " "${@}" "; \
+ }"
+}
CVS commit: src/tests/ipf
Module Name:src
Committed By: pgoyette
Date: Thu Nov 29 16:05:34 UTC 2012
Modified Files:
src/tests/ipf: t_bpf.sh
Log Message:
Even though this test is currently disabled, fix it so it looks for the
correct input and expected-output files for test case bpf_f1
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/ipf/t_bpf.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/t_bpf.sh
diff -u src/tests/ipf/t_bpf.sh:1.2 src/tests/ipf/t_bpf.sh:1.3
--- src/tests/ipf/t_bpf.sh:1.2 Tue Oct 19 16:36:36 2010
+++ src/tests/ipf/t_bpf.sh Thu Nov 29 16:05:34 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_bpf.sh,v 1.2 2010/10/19 16:36:36 jmmv Exp $
+# $NetBSD: t_bpf.sh,v 1.3 2012/11/29 16:05:34 pgoyette Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -46,7 +46,7 @@ itest()
bpftest()
{
- h_copydata $(echo ${1} | tr _ .)
+ h_copydata $(echo ${1} | tr _ -)
cp "$(atf_get_srcdir)/input/$(echo ${1} | sed s,bpf_,,)" in
{ while read rule; do
CVS commit: src/tests/ipf
Module Name:src
Committed By: pgoyette
Date: Thu Nov 29 04:57:42 UTC 2012
Modified Files:
src/tests/ipf: t_nat_exec.sh
Log Message:
Since all of the expected-results files provided from upstream include
the "-D" output (Dump additional internal tables), update the tests to
actually generate the data!
This lets us re-enable 28 of the 30 "skipped" tests.
XXX Still need to work on tests n12 and n17_6
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/ipf/t_nat_exec.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/t_nat_exec.sh
diff -u src/tests/ipf/t_nat_exec.sh:1.9 src/tests/ipf/t_nat_exec.sh:1.10
--- src/tests/ipf/t_nat_exec.sh:1.9 Sun Jul 22 16:22:41 2012
+++ src/tests/ipf/t_nat_exec.sh Thu Nov 29 04:57:42 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_nat_exec.sh,v 1.9 2012/07/22 16:22:41 darrenr Exp $
+# $NetBSD: t_nat_exec.sh,v 1.10 2012/11/29 04:57:42 pgoyette Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -50,7 +50,7 @@ nattest()
{ while read rule; do
atf_check -o save:save -x \
- "echo \"$rule\" | ipftest $format -RbN - -i in $args"
+ "echo \"$rule\" | ipftest $format -RDbN - -i in $args"
cat save >>out
echo "---" >>out
done; }
CVS commit: src/tests/ipf
Module Name:src
Committed By: darrenr
Date: Sun Jul 22 16:22:41 UTC 2012
Modified Files:
src/tests/ipf: t_nat_exec.sh
src/tests/ipf/expected: Makefile
src/tests/ipf/input: Makefile
src/tests/ipf/regress: Makefile
Log Message:
test cases n201 and n202 were removed on import of 5.1.2
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/ipf/t_nat_exec.sh
cvs rdiff -u -r1.5 -r1.6 src/tests/ipf/expected/Makefile
cvs rdiff -u -r1.5 -r1.6 src/tests/ipf/input/Makefile
cvs rdiff -u -r1.5 -r1.6 src/tests/ipf/regress/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/t_nat_exec.sh
diff -u src/tests/ipf/t_nat_exec.sh:1.8 src/tests/ipf/t_nat_exec.sh:1.9
--- src/tests/ipf/t_nat_exec.sh:1.8 Sun Jul 8 14:45:05 2012
+++ src/tests/ipf/t_nat_exec.sh Sun Jul 22 16:22:41 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_nat_exec.sh,v 1.8 2012/07/08 14:45:05 pgoyette Exp $
+# $NetBSD: t_nat_exec.sh,v 1.9 2012/07/22 16:22:41 darrenr Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -83,8 +83,6 @@ broken_test_case n104 nattest hex hex -T
broken_test_case n105 nattest hex hex -T update_ipid=0
broken_test_case n106 nattest hex hex -T update_ipid=0
broken_test_case n200 nattest hex hex -T update_ipid=0
-broken_test_case n201 nattest hex hex -T update_ipid=0
-broken_test_case n202 nattest hex hex -T update_ipid=0
broken_test_case n1_6 nattest text text -6
broken_test_case n2_6 nattest text text -6
broken_test_case n4_6 nattest text text -6
@@ -124,8 +122,6 @@ atf_init_test_cases()
atf_add_test_case n105
atf_add_test_case n106
atf_add_test_case n200
- atf_add_test_case n201
- atf_add_test_case n202
atf_add_test_case n1_6
atf_add_test_case n2_6
Index: src/tests/ipf/expected/Makefile
diff -u src/tests/ipf/expected/Makefile:1.5 src/tests/ipf/expected/Makefile:1.6
--- src/tests/ipf/expected/Makefile:1.5 Fri Mar 23 23:08:00 2012
+++ src/tests/ipf/expected/Makefile Sun Jul 22 16:22:41 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/03/23 23:08:00 christos Exp $
+# $NetBSD: Makefile,v 1.6 2012/07/22 16:22:41 darrenr Exp $
TESTSDIR= ${TESTSBASE}/ipf
ATFFILE= no
@@ -105,8 +105,6 @@ n18 \
n1_6 \
n2 \
n200 \
-n201 \
-n202 \
n2_6 \
n3 \
n4 \
Index: src/tests/ipf/input/Makefile
diff -u src/tests/ipf/input/Makefile:1.5 src/tests/ipf/input/Makefile:1.6
--- src/tests/ipf/input/Makefile:1.5 Fri Mar 23 23:08:02 2012
+++ src/tests/ipf/input/Makefile Sun Jul 22 16:22:41 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/03/23 23:08:02 christos Exp $
+# $NetBSD: Makefile,v 1.6 2012/07/22 16:22:41 darrenr Exp $
TESTSDIR= ${TESTSBASE}/ipf
ATFFILE= no
@@ -69,8 +69,6 @@ n18 \
n1_6 \
n2 \
n200 \
-n201 \
-n202 \
n2_6 \
n3 \
n4 \
Index: src/tests/ipf/regress/Makefile
diff -u src/tests/ipf/regress/Makefile:1.5 src/tests/ipf/regress/Makefile:1.6
--- src/tests/ipf/regress/Makefile:1.5 Fri Mar 23 23:08:03 2012
+++ src/tests/ipf/regress/Makefile Sun Jul 22 16:22:41 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/03/23 23:08:03 christos Exp $
+# $NetBSD: Makefile,v 1.6 2012/07/22 16:22:41 darrenr Exp $
TESTSDIR= ${TESTSBASE}/ipf
ATFFILE= no
@@ -109,8 +109,6 @@ n18 \
n1_6 \
n2 \
n200 \
-n201 \
-n202 \
n2_6 \
n3 \
n4 \
CVS commit: src/tests/ipf
Module Name:src
Committed By: pgoyette
Date: Sun Jul 8 14:45:05 UTC 2012
Modified Files:
src/tests/ipf: t_nat_exec.sh
Log Message:
Restore the rest of the ipfilter test framework, even if most of these
tests are broken. The "golden output" files for these tests need to be
updated.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/ipf/t_nat_exec.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/t_nat_exec.sh
diff -u src/tests/ipf/t_nat_exec.sh:1.7 src/tests/ipf/t_nat_exec.sh:1.8
--- src/tests/ipf/t_nat_exec.sh:1.7 Tue Mar 27 09:27:33 2012
+++ src/tests/ipf/t_nat_exec.sh Sun Jul 8 14:45:05 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_nat_exec.sh,v 1.7 2012/03/27 09:27:33 jruoho Exp $
+# $NetBSD: t_nat_exec.sh,v 1.8 2012/07/08 14:45:05 pgoyette Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -33,18 +33,24 @@
nattest()
{
h_copydata $1
+ infmt=$2
+ outfmt=$3
+ shift
+ shift
+ shift
+ args=$@
- if [ $3 = hex ] ; then
- format="-xF $2"
+ if [ $outfmt = hex ] ; then
+ format="-xF $infmt"
else
- format="-F $2"
+ format="-F $infmt"
fi
- format="$4 $5 $format"
+ format="$format"
{ while read rule; do
atf_check -o save:save -x \
- "echo \"$rule\" | ipftest $format -RbN - -i in"
+ "echo \"$rule\" | ipftest $format -RbN - -i in $args"
cat save >>out
echo "---" >>out
done; }
CVS commit: src/tests/ipf
Module Name:src
Committed By: pgoyette
Date: Sun Jul 8 00:53:01 UTC 2012
Modified Files:
src/tests/ipf: t_filter_parse.sh
Log Message:
Restore one more group of tests.
XXX Test i17 was broken previously, and remains broken.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/ipf/t_filter_parse.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/t_filter_parse.sh
diff -u src/tests/ipf/t_filter_parse.sh:1.5 src/tests/ipf/t_filter_parse.sh:1.6
--- src/tests/ipf/t_filter_parse.sh:1.5 Tue Mar 27 09:27:33 2012
+++ src/tests/ipf/t_filter_parse.sh Sun Jul 8 00:53:01 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_filter_parse.sh,v 1.5 2012/03/27 09:27:33 jruoho Exp $
+# $NetBSD: t_filter_parse.sh,v 1.6 2012/07/08 00:53:01 pgoyette Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -104,6 +104,8 @@ test_case i18 itest text ipf
test_case i19 itest_i19 text ipf
test_case i20 itest text ipf
test_case i21 itest text ipf
+test_case i22 itest text ipf
+test_case i23 itest text ipf
atf_init_test_cases()
{
@@ -128,4 +130,6 @@ atf_init_test_cases()
atf_add_test_case i19
atf_add_test_case i20
atf_add_test_case i21
+ atf_add_test_case i22
+ atf_add_test_case i23
}
CVS commit: src/tests/ipf
Module Name:src
Committed By: pgoyette
Date: Sun Jul 8 00:48:29 UTC 2012
Modified Files:
src/tests/ipf: t_nat_parse.sh
Log Message:
Restore some more tests from ipfilter 5.1.1
XXX Test in2 was broken before the ipfilter 5.1.1 import, and is still
XXX broken.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/ipf/t_nat_parse.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/t_nat_parse.sh
diff -u src/tests/ipf/t_nat_parse.sh:1.5 src/tests/ipf/t_nat_parse.sh:1.6
--- src/tests/ipf/t_nat_parse.sh:1.5 Wed Feb 15 17:55:24 2012
+++ src/tests/ipf/t_nat_parse.sh Sun Jul 8 00:48:29 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_nat_parse.sh,v 1.5 2012/02/15 17:55:24 riz Exp $
+# $NetBSD: t_nat_parse.sh,v 1.6 2012/07/08 00:48:29 pgoyette Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -38,19 +38,26 @@ intest()
}
test_case in1 intest text text
-#broken_test_case in2 intest text text
+broken_test_case in2 intest text text
test_case in3 intest text text
test_case in4 intest text text
test_case in5 intest text text
test_case in6 intest text text
+test_case in7 intest text text
+test_case in100 intest text text
+test_case in101 intest text text
+test_case in102 intest text text
atf_init_test_cases()
{
atf_add_test_case in1
+ atf_add_test_case in2
atf_add_test_case in3
atf_add_test_case in4
atf_add_test_case in5
atf_add_test_case in6
-
- #atf_add_test_case in2
+ atf_add_test_case in7
+ atf_add_test_case in100
+ atf_add_test_case in101
+ atf_add_test_case in102
}
CVS commit: src/tests/ipf
Module Name:src
Committed By: pgoyette
Date: Sun Jul 8 00:36:46 UTC 2012
Modified Files:
src/tests/ipf: t_pools.sh
Log Message:
Restore some more of the ipfilter 5.1.1 tests.
XXX It appears that ipftest is not handling the policy {,src-,dst-}hash
XXX correctly, so these tests are still marked broken/skipped.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/ipf/t_pools.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/t_pools.sh
diff -u src/tests/ipf/t_pools.sh:1.4 src/tests/ipf/t_pools.sh:1.5
--- src/tests/ipf/t_pools.sh:1.4 Wed Feb 15 17:55:24 2012
+++ src/tests/ipf/t_pools.sh Sun Jul 8 00:36:46 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_pools.sh,v 1.4 2012/02/15 17:55:24 riz Exp $
+# $NetBSD: t_pools.sh,v 1.5 2012/07/08 00:36:46 pgoyette Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -43,10 +43,18 @@ ptest()
{
h_copydata $1
cp $(atf_get_srcdir)/regress/$1.pool pool 2>/dev/null
- cp $(atf_get_srcdir)/regress/$1.ipf ipf
+ if [ -f $(atf_get_srcdir)/regress/$1.nat ] ; then
+ cp $(atf_get_srcdir)/regress/$1.nat nat
+ else
+ cp $(atf_get_srcdir)/regress/$1.ipf ipf
+ fi
if [ -f pool ] ; then
- atf_check -o save:out ipftest -RD -b -P pool -r ipf -i in
+ if [ -f nat ] ; then
+ atf_check -o save:out ipftest -RD -b -P pool -N nat -i in
+ else
+ atf_check -o save:out ipftest -RD -b -P pool -r ipf -i in
+ fi
else
atf_check -o save:out ipftest -RD -b -r ipf -i in
fi
@@ -55,19 +63,41 @@ ptest()
}
+test_case f28 ptest text text
+test_case f29 ptest text text
test_case p1 ptest text text
test_case p2 ptest text text
test_case p3 ptest text text
+test_case p4 ptest text text
test_case p5 ptest text text
+test_case p6 ptest text text
+test_case p7 ptest text text
+test_case p9 ptest text text
+broken_test_case p10 ptest text text
+broken_test_case p11 ptest text text
+broken_test_case p12 ptest text text
+test_case p13 ptest text text
test_case ip1 iptest text text
test_case ip2 iptest text text
+test_case ip3 iptest text text
atf_init_test_cases()
{
+ atf_add_test_case f28
+ atf_add_test_case f29
atf_add_test_case p1
atf_add_test_case p2
atf_add_test_case p3
+ atf_add_test_case p4
atf_add_test_case p5
+ atf_add_test_case p6
+ atf_add_test_case p7
+ atf_add_test_case p9
+ atf_add_test_case p10
+ atf_add_test_case p11
+ atf_add_test_case p12
+ atf_add_test_case p13
atf_add_test_case ip1
atf_add_test_case ip2
+ atf_add_test_case ip3
}
CVS commit: src/tests/ipf
Module Name:src
Committed By: pgoyette
Date: Sat Jul 7 23:29:44 UTC 2012
Modified Files:
src/tests/ipf: t_filter_exec.sh t_nat_ipf_exec.sh
Log Message:
Re-enable some of the ipf tests. The only thing wrong with these tests
is that the tests were not re-imported with the rest of ipfilter 5.1.1
XXX There are still some more ipf test failures that need to get resolved,
XXX but at least we'll get some of them back just in case we have a
XXX regression.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/ipf/t_filter_exec.sh \
src/tests/ipf/t_nat_ipf_exec.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/t_filter_exec.sh
diff -u src/tests/ipf/t_filter_exec.sh:1.6 src/tests/ipf/t_filter_exec.sh:1.7
--- src/tests/ipf/t_filter_exec.sh:1.6 Tue Mar 27 09:27:33 2012
+++ src/tests/ipf/t_filter_exec.sh Sat Jul 7 23:29:44 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_filter_exec.sh,v 1.6 2012/03/27 09:27:33 jruoho Exp $
+# $NetBSD: t_filter_exec.sh,v 1.7 2012/07/07 23:29:44 pgoyette Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -33,10 +33,22 @@
dotest()
{
h_copydata $1
+ infmt=$2
+ outfmt=$3
+ shift
+ shift
+ shift
+ args=$@
+
+ if [ $outfmt = hex ] ; then
+ output=-x
+ else
+ output=
+ fi
{ while read rule; do
atf_check -x "echo \"$rule\" | ipftest -F \
-$2 -Rbr - -i in $4 $5 >>out"
+$infmt $output -Rbr - -i in $args >>out"
echo "" >>out
done; } >out"
mtest()
{
h_copydata $1
+ infmt=$2
+ outfmt=$3
+ shift
+ shift
+ shift
+ args=$@
+
+ if [ $outfmt = hex ] ; then
+ output=-x
+ else
+ output=
+ fi
- atf_check -o save:out ipftest -F $2 -Rbr reg -i in
+
+ atf_check -o save:out ipftest -F $infmt $output -Rbr reg -i in $args
echo "" >>out
diff -u exp out || atf_fail "results differ"
@@ -56,13 +81,26 @@ mtest()
dotest6()
{
h_copydata $(echo ${1} | tr _ .)
+ infmt=$2
+ outfmt=$3
+ shift
+ shift
+ shift
+ args=$@
+
+ if [ $outfmt = hex ] ; then
+ output=-x
+ else
+ output=
+ fi
+
ipftest -6 -r /dev/null -i /dev/null >/dev/null 2>&1 \
|| atf_skip "skipping IPv6 tests"
{ while read rule; do
atf_check -o save:save -x "echo \"$rule\" | \
-ipftest -F $2 -6br - -i in"
+ipftest -F $infmt $output -6br - -i in $args"
cat save >>out
echo "" >>out
done; } >out
echo "---" >>out
done; } >out
;;
@@ -61,24 +69,26 @@ ipftest -R $5 $6 $format -b -r ipf -N -
diff -u exp out || atf_fail "results differ"
}
-broken_test_case ni1 natipftest multi hex hex -T fr_update_ipid=1
-broken_test_case ni2 natipftest single hex hex -T fr_update_ipid=1
-broken_test_case ni3 natipftest single hex hex -T fr_update_ipid=1
-broken_test_case ni4 natipftest single hex hex -T fr_update_ipid=1
-#broken_test_case ni5 natipftest single hex hex -T fr_update_ipid=1
-broken_test_case ni6 natipftest multi hex hex -T fr_update_ipid=1
-broken_test_case ni7 natipftest single hex hex -T fr_update_ipid=1
-broken_test_case ni8 natipftest single hex hex -T fr_update_ipid=1
-broken_test_case ni9 natipftest single hex hex -T fr_update_ipid=1
-#broken_test_case ni10 natipftest single hex hex -T fr_update_ipid=1
-#broken_test_case ni11 natipftest single hex hex -T fr_update_ipid=1
-#broken_test_case ni12 natipftest single hex hex -T fr_update_ipid=1
-broken_test_case ni13 natipftest single hex hex -T fr_update_ipid=1
-broken_test_case ni14 natipftest single hex hex -T fr_update_ipid=1
-broken_test_case ni15 natipftest single hex hex -T fr_update_ipid=1
-broken_test_case ni16 natipftest single hex hex -T fr_update_ipid=1
-#broken_test_case ni19 natipftest single hex hex -T fr_update_ipid=0
-#broken_test_case ni20 natipftest single hex hex -T fr_update_ipid=0
+test_case ni1 natipftest multi hex hex -T update_ipid=1
+test_case ni2 natipftest single hex hex -T update_ipid=1
+test_case ni3 natipftest single hex hex -T update_ipid=1
+test_case ni4 natipftest single hex hex -T update_ipid=1
+test_case ni5 natipftest single hex hex -T update_ipid=1
+test_case ni6 natipftest multi hex text -T update_ipid=1 -D
+test_case ni7 natipftest single hex hex -T update_ipid=1
+test_case ni8 natipftest single hex hex -T update_ipid=1
+test_case ni9 natipftest single hex hex -T update_ipid=1
+test_case ni10 natipftest single hex hex -T update_ipid=1
+test_case ni11 natipftest single hex hex -T update_ipid=1
+test_case ni12 natipftest single hex hex -T update_ipid=1
+test_case ni13 natipftest single hex hex -T update_ipid=1
+test_case ni14 natipftest single hex hex -T update_ipid=1
+test_case ni15 natipftest single hex hex -T update_ipid=1
+test_case ni16 natipftest single hex hex -T update_ipid=1
+test_case ni17 natipftest multi text text
+test_case ni18 natipftest multi text text
+test_case ni19 natipftest single hex hex -T update_ipid=0
+test_case ni20 natipftest single hex hex -T updat
CVS commit: src/tests/ipf
Module Name:src Committed By: jruoho Date: Tue Mar 27 09:27:34 UTC 2012 Modified Files: src/tests/ipf: t_filter_exec.sh t_filter_parse.sh t_nat_exec.sh t_nat_ipf_exec.sh Log Message: Mark the failing tests as broken. XXX: If no one is willing to maintain the ipf tests, these should be removed. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/ipf/t_filter_exec.sh \ src/tests/ipf/t_nat_ipf_exec.sh cvs rdiff -u -r1.4 -r1.5 src/tests/ipf/t_filter_parse.sh cvs rdiff -u -r1.6 -r1.7 src/tests/ipf/t_nat_exec.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/t_filter_exec.sh diff -u src/tests/ipf/t_filter_exec.sh:1.5 src/tests/ipf/t_filter_exec.sh:1.6 --- src/tests/ipf/t_filter_exec.sh:1.5 Wed Feb 15 17:55:24 2012 +++ src/tests/ipf/t_filter_exec.sh Tue Mar 27 09:27:33 2012 @@ -1,4 +1,4 @@ -# $NetBSD: t_filter_exec.sh,v 1.5 2012/02/15 17:55:24 riz Exp $ +# $NetBSD: t_filter_exec.sh,v 1.6 2012/03/27 09:27:33 jruoho Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -87,7 +87,7 @@ test_case f14 dotest text text test_case f15 mtest text text test_case f16 mtest text text test_case f17 mtest hex hex -test_case f18 mtest text text +broken_test_case f18 mtest text text #broken_test_case f19 dotest text text -T fr_statemax=3 test_case f20 mtest text text test_case f24 mtest hex text Index: src/tests/ipf/t_nat_ipf_exec.sh diff -u src/tests/ipf/t_nat_ipf_exec.sh:1.5 src/tests/ipf/t_nat_ipf_exec.sh:1.6 --- src/tests/ipf/t_nat_ipf_exec.sh:1.5 Wed Feb 15 17:55:24 2012 +++ src/tests/ipf/t_nat_ipf_exec.sh Tue Mar 27 09:27:33 2012 @@ -1,4 +1,4 @@ -# $NetBSD: t_nat_ipf_exec.sh,v 1.5 2012/02/15 17:55:24 riz Exp $ +# $NetBSD: t_nat_ipf_exec.sh,v 1.6 2012/03/27 09:27:33 jruoho Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -61,22 +61,22 @@ ipftest -R $5 $6 $format -b -r ipf -N - diff -u exp out || atf_fail "results differ" } -test_case ni1 natipftest multi hex hex -T fr_update_ipid=1 -test_case ni2 natipftest single hex hex -T fr_update_ipid=1 -test_case ni3 natipftest single hex hex -T fr_update_ipid=1 -test_case ni4 natipftest single hex hex -T fr_update_ipid=1 +broken_test_case ni1 natipftest multi hex hex -T fr_update_ipid=1 +broken_test_case ni2 natipftest single hex hex -T fr_update_ipid=1 +broken_test_case ni3 natipftest single hex hex -T fr_update_ipid=1 +broken_test_case ni4 natipftest single hex hex -T fr_update_ipid=1 #broken_test_case ni5 natipftest single hex hex -T fr_update_ipid=1 -test_case ni6 natipftest multi hex hex -T fr_update_ipid=1 -test_case ni7 natipftest single hex hex -T fr_update_ipid=1 -test_case ni8 natipftest single hex hex -T fr_update_ipid=1 -test_case ni9 natipftest single hex hex -T fr_update_ipid=1 +broken_test_case ni6 natipftest multi hex hex -T fr_update_ipid=1 +broken_test_case ni7 natipftest single hex hex -T fr_update_ipid=1 +broken_test_case ni8 natipftest single hex hex -T fr_update_ipid=1 +broken_test_case ni9 natipftest single hex hex -T fr_update_ipid=1 #broken_test_case ni10 natipftest single hex hex -T fr_update_ipid=1 #broken_test_case ni11 natipftest single hex hex -T fr_update_ipid=1 #broken_test_case ni12 natipftest single hex hex -T fr_update_ipid=1 -test_case ni13 natipftest single hex hex -T fr_update_ipid=1 -test_case ni14 natipftest single hex hex -T fr_update_ipid=1 -test_case ni15 natipftest single hex hex -T fr_update_ipid=1 -test_case ni16 natipftest single hex hex -T fr_update_ipid=1 +broken_test_case ni13 natipftest single hex hex -T fr_update_ipid=1 +broken_test_case ni14 natipftest single hex hex -T fr_update_ipid=1 +broken_test_case ni15 natipftest single hex hex -T fr_update_ipid=1 +broken_test_case ni16 natipftest single hex hex -T fr_update_ipid=1 #broken_test_case ni19 natipftest single hex hex -T fr_update_ipid=0 #broken_test_case ni20 natipftest single hex hex -T fr_update_ipid=0 test_case ni21 natipftest multi text text Index: src/tests/ipf/t_filter_parse.sh diff -u src/tests/ipf/t_filter_parse.sh:1.4 src/tests/ipf/t_filter_parse.sh:1.5 --- src/tests/ipf/t_filter_parse.sh:1.4 Wed Feb 15 17:55:24 2012 +++ src/tests/ipf/t_filter_parse.sh Tue Mar 27 09:27:33 2012 @@ -1,4 +1,4 @@ -# $NetBSD: t_filter_parse.sh,v 1.4 2012/02/15 17:55:24 riz Exp $ +# $NetBSD: t_filter_parse.sh,v 1.5 2012/03/27 09:27:33 jruoho Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -99,7 +99,7 @@ test_case i13 itest text ipf test_case i14 itest text ipf test_case i15 itest text ipf test_case i16 itest text ipf -test_case i17 itest text ipftest +broken_test_case i17 itest text ipftest test_case i18 itest text ipf test_case i19 itest_i19 text ipf test_case i20 itest text ipf Index: src/tests/ipf/t_nat_exec.sh diff -u src/tests/ipf/t_nat_exec.sh:1.6 src/tests/ipf/t_nat_exec.sh:
CVS commit: src/tests/ipf
Module Name:src Committed By: martin Date: Tue Feb 14 09:17:22 UTC 2012 Modified Files: src/tests/ipf: t_nat_exec.sh Log Message: Comment out test n3_6 - the data files are missing To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/ipf/t_nat_exec.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/t_nat_exec.sh diff -u src/tests/ipf/t_nat_exec.sh:1.4 src/tests/ipf/t_nat_exec.sh:1.5 --- src/tests/ipf/t_nat_exec.sh:1.4 Mon Feb 13 18:52:53 2012 +++ src/tests/ipf/t_nat_exec.sh Tue Feb 14 09:17:22 2012 @@ -1,4 +1,4 @@ -# $NetBSD: t_nat_exec.sh,v 1.4 2012/02/13 18:52:53 darrenr Exp $ +# $NetBSD: t_nat_exec.sh,v 1.5 2012/02/14 09:17:22 martin Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -129,7 +129,7 @@ atf_init_test_cases() atf_add_test_case n1_6 atf_add_test_case n2_6 - atf_add_test_case n3_6 +# atf_add_test_case n3_6 atf_add_test_case n4_6 atf_add_test_case n5_6 atf_add_test_case n6_6
CVS commit: src/tests/ipf
Module Name:src
Committed By: pooka
Date: Sat Dec 18 13:06:51 UTC 2010
Modified Files:
src/tests/ipf: Makefile t_filter_exec.sh t_nat_exec.sh
t_nat_ipf_exec.sh t_nat_parse.sh
Added Files:
src/tests/ipf: Atffile
Log Message:
Disable test cases which have not worked in ages instead of skipping them.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.4 src/tests/ipf/Atffile
cvs rdiff -u -r1.3 -r1.4 src/tests/ipf/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tests/ipf/t_filter_exec.sh \
src/tests/ipf/t_nat_exec.sh src/tests/ipf/t_nat_ipf_exec.sh \
src/tests/ipf/t_nat_parse.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/Makefile
diff -u src/tests/ipf/Makefile:1.3 src/tests/ipf/Makefile:1.4
--- src/tests/ipf/Makefile:1.3 Tue Jul 13 21:13:25 2010
+++ src/tests/ipf/Makefile Sat Dec 18 13:06:51 2010
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2010/07/13 21:13:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2010/12/18 13:06:51 pooka Exp $
NOMAN= # defined
.include
TESTSDIR= ${TESTSBASE}/ipf
+ATFFILE= yes
.for name in t_bpf t_filter_exec t_filter_parse t_logging t_nat_exec \
t_nat_ipf_exec t_nat_parse t_pools
Index: src/tests/ipf/t_filter_exec.sh
diff -u src/tests/ipf/t_filter_exec.sh:1.2 src/tests/ipf/t_filter_exec.sh:1.3
--- src/tests/ipf/t_filter_exec.sh:1.2 Tue Oct 19 16:36:36 2010
+++ src/tests/ipf/t_filter_exec.sh Sat Dec 18 13:06:51 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_filter_exec.sh,v 1.2 2010/10/19 16:36:36 jmmv Exp $
+# $NetBSD: t_filter_exec.sh,v 1.3 2010/12/18 13:06:51 pooka Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -88,7 +88,7 @@
test_case f16 mtest text text
test_case f17 mtest hex hex
test_case f18 mtest text text
-broken_test_case f19 dotest text text -T fr_statemax=3
+#broken_test_case f19 dotest text text -T fr_statemax=3
test_case f20 mtest text text
test_case f24 mtest hex text
test_case ipv6_1 dotest6 hex hex
@@ -117,7 +117,6 @@
atf_add_test_case f16
atf_add_test_case f17
atf_add_test_case f18
- atf_add_test_case f19
atf_add_test_case f20
atf_add_test_case f24
atf_add_test_case ipv6_1
@@ -125,4 +124,6 @@
atf_add_test_case ipv6_3
atf_add_test_case ipv6_5
atf_add_test_case ipv6_6
+
+ #atf_add_test_case f19
}
Index: src/tests/ipf/t_nat_exec.sh
diff -u src/tests/ipf/t_nat_exec.sh:1.2 src/tests/ipf/t_nat_exec.sh:1.3
--- src/tests/ipf/t_nat_exec.sh:1.2 Tue Oct 19 16:36:36 2010
+++ src/tests/ipf/t_nat_exec.sh Sat Dec 18 13:06:51 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_nat_exec.sh,v 1.2 2010/10/19 16:36:36 jmmv Exp $
+# $NetBSD: t_nat_exec.sh,v 1.3 2010/12/18 13:06:51 pooka Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -52,17 +52,17 @@
diff -u exp out || atf_fail "results differ"
}
-broken_test_case n1 nattest text text
-broken_test_case n2 nattest text text
+#broken_test_case n1 nattest text text
+#broken_test_case n2 nattest text text
test_case n3 nattest text text
-broken_test_case n4 nattest text text
-broken_test_case n5 nattest text text
-broken_test_case n6 nattest text text
+#broken_test_case n4 nattest text text
+#broken_test_case n5 nattest text text
+#broken_test_case n6 nattest text text
test_case n7 nattest text text
test_case n8 nattest hex hex -T fr_update_ipid=0
test_case n9 nattest hex hex -T fr_update_ipid=0
test_case n10 nattest hex hex -T fr_update_ipid=0
-broken_test_case n11 nattest text text
+#broken_test_case n11 nattest text text
test_case n12 nattest hex hex -T fr_update_ipid=0
test_case n13 nattest text text
test_case n14 nattest text text
@@ -71,20 +71,21 @@
atf_init_test_cases()
{
- atf_add_test_case n1
- atf_add_test_case n2
atf_add_test_case n3
- atf_add_test_case n4
- atf_add_test_case n5
- atf_add_test_case n6
atf_add_test_case n7
atf_add_test_case n8
atf_add_test_case n9
atf_add_test_case n10
- atf_add_test_case n11
atf_add_test_case n12
atf_add_test_case n13
atf_add_test_case n14
atf_add_test_case n16
atf_add_test_case n17
+
+ #atf_add_test_case n1
+ #atf_add_test_case n2
+ #atf_add_test_case n4
+ #atf_add_test_case n5
+ #atf_add_test_case n6
+ #atf_add_test_case n11
}
Index: src/tests/ipf/t_nat_ipf_exec.sh
diff -u src/tests/ipf/t_nat_ipf_exec.sh:1.2 src/tests/ipf/t_nat_ipf_exec.sh:1.3
--- src/tests/ipf/t_nat_ipf_exec.sh:1.2 Tue Oct 19 16:36:36 2010
+++ src/tests/ipf/t_nat_ipf_exec.sh Sat Dec 18 13:06:51 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_nat_ipf_exec.sh,v 1.2 2010/10/19 16:36:36 jmmv Exp $
+# $NetBSD: t_nat_ipf_exec.sh,v 1.3 2010/12/18 13:06:51 pooka Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -65,20 +65,20 @@
test_case ni2 natipftest single hex hex -T fr_update_ipid=1
test_case ni3 natipftest single hex hex -T fr_update_ipid=1
test_case ni4 natipftest single hex hex -T fr_update_ipid=1
-br
CVS commit: src/tests/ipf
Module Name:src
Committed By: jmmv
Date: Tue Oct 19 16:36:37 UTC 2010
Modified Files:
src/tests/ipf: h_common.sh t_bpf.sh t_filter_exec.sh t_filter_parse.sh
t_logging.sh t_nat_exec.sh t_nat_ipf_exec.sh t_nat_parse.sh
t_pools.sh
Log Message:
Oh, wow. Loads of broken ipf test cases that went unnoticed because they
were unchecked errors. Fix them.
These have been caught by the upcoming version of atf, which explicitly
does 'set -e' in shell test programs.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/ipf/h_common.sh src/tests/ipf/t_bpf.sh \
src/tests/ipf/t_filter_exec.sh src/tests/ipf/t_filter_parse.sh \
src/tests/ipf/t_logging.sh src/tests/ipf/t_nat_exec.sh \
src/tests/ipf/t_nat_ipf_exec.sh src/tests/ipf/t_nat_parse.sh \
src/tests/ipf/t_pools.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/h_common.sh
diff -u src/tests/ipf/h_common.sh:1.1 src/tests/ipf/h_common.sh:1.2
--- src/tests/ipf/h_common.sh:1.1 Sat Jul 10 17:28:36 2010
+++ src/tests/ipf/h_common.sh Tue Oct 19 16:36:36 2010
@@ -1,4 +1,4 @@
-# $NetBSD: h_common.sh,v 1.1 2010/07/10 17:28:36 jmmv Exp $
+# $NetBSD: h_common.sh,v 1.2 2010/10/19 16:36:36 jmmv Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -50,7 +50,7 @@
atf_set use.fs true; \
}"
eval "${name}_body() { \
- ${check_function} '${name}' \"\...@}\"; \
+ ${check_function} '${name}' " "$...@}" "; \
}"
}
@@ -65,6 +65,6 @@
}"
eval "${name}_body() { \
atf_skip 'This test case is probably broken'; \
- ${check_function} '${name}' \"\...@}\"; \
+ ${check_function} '${name}' " "$...@}" "; \
}"
}
Index: src/tests/ipf/t_bpf.sh
diff -u src/tests/ipf/t_bpf.sh:1.1 src/tests/ipf/t_bpf.sh:1.2
--- src/tests/ipf/t_bpf.sh:1.1 Sat Jul 10 17:28:36 2010
+++ src/tests/ipf/t_bpf.sh Tue Oct 19 16:36:36 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_bpf.sh,v 1.1 2010/07/10 17:28:36 jmmv Exp $
+# $NetBSD: t_bpf.sh,v 1.2 2010/10/19 16:36:36 jmmv Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -30,7 +30,7 @@
# See the IPFILTER.LICENCE file for details on licencing.
#
-h_itest()
+itest()
{
h_copydata $1
@@ -44,7 +44,7 @@
esac
}
-h_bpftest()
+bpftest()
{
h_copydata $(echo ${1} | tr _ .)
cp "$(atf_get_srcdir)/input/$(echo ${1} | sed s,bpf_,,)" in
Index: src/tests/ipf/t_filter_exec.sh
diff -u src/tests/ipf/t_filter_exec.sh:1.1 src/tests/ipf/t_filter_exec.sh:1.2
--- src/tests/ipf/t_filter_exec.sh:1.1 Sat Jul 10 17:28:36 2010
+++ src/tests/ipf/t_filter_exec.sh Tue Oct 19 16:36:36 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_filter_exec.sh,v 1.1 2010/07/10 17:28:36 jmmv Exp $
+# $NetBSD: t_filter_exec.sh,v 1.2 2010/10/19 16:36:36 jmmv Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -30,20 +30,20 @@
# See the IPFILTER.LICENCE file for details on licencing.
#
-h_dotest()
+dotest()
{
h_copydata $1
{ while read rule; do
atf_check -x "echo \"$rule\" | ipftest -F \
-$2 -Rbr - -i in $4 >>out"
+$2 -Rbr - -i in $4 $5 >>out"
echo "" >>out
done; } >out
echo "---" >>out
done; } >out
;;
Index: src/tests/ipf/t_nat_parse.sh
diff -u src/tests/ipf/t_nat_parse.sh:1.1 src/tests/ipf/t_nat_parse.sh:1.2
--- src/tests/ipf/t_nat_parse.sh:1.1 Sat Jul 10 17:28:36 2010
+++ src/tests/ipf/t_nat_parse.sh Tue Oct 19 16:36:36 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_nat_parse.sh,v 1.1 2010/07/10 17:28:36 jmmv Exp $
+# $NetBSD: t_nat_parse.sh,v 1.2 2010/10/19 16:36:36 jmmv Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -30,7 +30,7 @@
# See the IPFILTER.LICENCE file for details on licencing.
#
-h_intest()
+intest()
{
h_copydata $1
@@ -38,7 +38,7 @@
}
test_case in1 intest text text
-test_case in2 intest text text
+broken_test_case in2 intest text text
test_case in3 intest text text
test_case in4 intest text text
test_case in5 intest text text
Index: src/tests/ipf/t_pools.sh
diff -u src/tests/ipf/t_pools.sh:1.1 src/tests/ipf/t_pools.sh:1.2
--- src/tests/ipf/t_pools.sh:1.1 Sat Jul 10 17:28:36 2010
+++ src/tests/ipf/t_pools.sh Tue Oct 19 16:36:36 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_pools.sh,v 1.1 2010/07/10 17:28:36 jmmv Exp $
+# $NetBSD: t_pools.sh,v 1.2 2010/10/19 16:36:36 jmmv Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -30,7 +30,7 @@
# See the IPFILTER.LICENCE file for details on licencing.
#
-h_iptest()
+iptest()
{
h_copydata $1
mkdir input
@@ -39,7 +39,7 @@
atf_check -o file:exp -e ignore ippool -f reg -nRv
}
-h_ptest()
+ptest()
{
h_copydata $1
cp $(atf_get_srcdir)/regress/$1.pool pool 2>/dev/null
CVS commit: src/tests/ipf
Module Name:src
Committed By: jmmv
Date: Sat Jul 10 17:28:36 UTC 2010
Modified Files:
src/tests/ipf: Atffile Makefile
Added Files:
src/tests/ipf: h_common.sh t_bpf.sh t_filter_exec.sh t_filter_parse.sh
t_logging.sh t_nat_exec.sh t_nat_ipf_exec.sh t_nat_parse.sh
t_pools.sh
Removed Files:
src/tests/ipf: t_ipf.awk t_ipf.in
Log Message:
Do not use awk to generate the test program. Use some eval magic to generate
the tests on the fly alongside with easier-to-read functions.
While doing this, split the big monolithic test program into more granular
but cohesive test programs.
Phew, this one was tough. And it's horrible to see that many these tests
(yes, the tests themselves probably) are broken.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/ipf/Atffile src/tests/ipf/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/ipf/h_common.sh src/tests/ipf/t_bpf.sh \
src/tests/ipf/t_filter_exec.sh src/tests/ipf/t_filter_parse.sh \
src/tests/ipf/t_logging.sh src/tests/ipf/t_nat_exec.sh \
src/tests/ipf/t_nat_ipf_exec.sh src/tests/ipf/t_nat_parse.sh \
src/tests/ipf/t_pools.sh
cvs rdiff -u -r1.3 -r0 src/tests/ipf/t_ipf.awk
cvs rdiff -u -r1.2 -r0 src/tests/ipf/t_ipf.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/Atffile
diff -u src/tests/ipf/Atffile:1.1 src/tests/ipf/Atffile:1.2
--- src/tests/ipf/Atffile:1.1 Fri Feb 20 21:42:59 2009
+++ src/tests/ipf/Atffile Sat Jul 10 17:28:36 2010
@@ -1,6 +1,13 @@
Content-Type: application/X-atf-atffile; version="1"
-X-NetBSD-Id: "$NetBSD: Atffile,v 1.1 2009/02/20 21:42:59 jmmv Exp $"
+X-NetBSD-Id: "$NetBSD: Atffile,v 1.2 2010/07/10 17:28:36 jmmv Exp $"
prop: test-suite = "NetBSD"
-tp: t_ipf
+tp: t_bpf
+tp: t_filter_exec
+tp: t_filter_parse
+tp: t_logging
+tp: t_nat_exec
+tp: t_nat_ipf_exec
+tp: t_nat_parse
+tp: t_pools
Index: src/tests/ipf/Makefile
diff -u src/tests/ipf/Makefile:1.1 src/tests/ipf/Makefile:1.2
--- src/tests/ipf/Makefile:1.1 Fri Feb 20 21:42:59 2009
+++ src/tests/ipf/Makefile Sat Jul 10 17:28:36 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/02/20 21:42:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/07/10 17:28:36 jmmv Exp $
NOMAN= # defined
@@ -6,11 +6,11 @@
TESTSDIR= ${TESTSBASE}/ipf
-TESTS_SH= t_ipf
-
-CLEANFILES+= t_ipf.sh
-t_ipf.sh: t_ipf.awk t_ipf.in
- ${TOOL_AWK} -f ${.CURDIR}/t_ipf.awk ${.CURDIR}/t_ipf.in >t_ipf.sh
+.for name in t_bpf t_filter_exec t_filter_parse t_logging t_nat_exec \
+ t_nat_ipf_exec t_nat_parse t_pools
+TESTS_SH+= ${name}
+TESTS_SH_SRC_${name}= h_common.sh ${name}.sh
+.endfor
SUBDIR= regress input expected
Added files:
Index: src/tests/ipf/h_common.sh
diff -u /dev/null src/tests/ipf/h_common.sh:1.1
--- /dev/null Sat Jul 10 17:28:36 2010
+++ src/tests/ipf/h_common.sh Sat Jul 10 17:28:36 2010
@@ -0,0 +1,70 @@
+# $NetBSD: h_common.sh,v 1.1 2010/07/10 17:28:36 jmmv Exp $
+#
+# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+#
+# (C)opyright 1993-1996 by Darren Reed.
+#
+# See the IPFILTER.LICENCE file for details on licencing.
+#
+
+h_copydata()
+{
+ test -f $(atf_get_srcdir)/input/$1 && \
+ cp $(atf_get_srcdir)/input/$1 in
+ test -f $(atf_get_srcdir)/regress/$1 && \
+ cp $(atf_get_srcdir)/regress/$1 reg
+ test -f $(atf_get_srcdir)/expected/$1 && \
+ cp $(atf_get_srcdir)/expected/$1 exp
+}
+
+test_case()
+{
+ local name="${1}"; shift
+ local check_function="${1}"; shift
+
+ atf_test_case "${name}"
+ eval "${name}_head() { \
+ atf_set use.fs true; \
+ }"
+ eval "${name}_body() {
CVS commit: src/tests/ipf
Module Name:src
Committed By: pooka
Date: Sat Jun 12 14:07:19 UTC 2010
Modified Files:
src/tests/ipf: t_ipf.awk t_ipf.in
Log Message:
Skip failing tests. When someone figures out where the problem is,
these can be reenabled.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/ipf/t_ipf.awk
cvs rdiff -u -r1.1 -r1.2 src/tests/ipf/t_ipf.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/t_ipf.awk
diff -u src/tests/ipf/t_ipf.awk:1.2 src/tests/ipf/t_ipf.awk:1.3
--- src/tests/ipf/t_ipf.awk:1.2 Fri Jun 4 08:39:40 2010
+++ src/tests/ipf/t_ipf.awk Sat Jun 12 14:07:18 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_ipf.awk,v 1.2 2010/06/04 08:39:40 jmmv Exp $
+# $NetBSD: t_ipf.awk,v 1.3 2010/06/12 14:07:18 pooka Exp $
#
# Copyright (c) 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -29,28 +29,48 @@
FS = ":";
};
-/^tc:/ {
-
- desc = ($4 in descs) ? descs[$4] : $4;
+function maketc(name, type, desc, rest, skip)
+{
- printf "atf_test_case %s\n", $2;
- printf "%s_head()\n", $2;
+ printf "atf_test_case %s\n", name;
+ printf "%s_head()\n", name;
print "{"
printf " atf_set \"descr\" \"%s\"\n", desc;
printf " atf_set \"use.fs\" \"true\"\n", desc;
print "}"
- printf "%s_body()\n", $2;
+ printf "%s_body()\n", name;
print "{"
- printf " h_%s %s", $3, $2;
- for (i = 5; i <= NF; ++i)
- printf " \"%s\"", $i;
+ if (skip) {
+ printf " atf_skip \"test suspected to be broken\"\n\n"
+ }
+ printf " h_%s %s %s", type, name, rest;
printf "\n";
print "}"
print ""
tcs[count++] = $2;
+}
+
+/^tc:/ {
+ desc = ($4 in descs) ? descs[$4] : $4;
+ rest = "\"" $5 "\""
+ for (i = 6; i <= NF; ++i)
+ rest = rest " \"" $i "\""
+
+ maketc($2, $3, desc, rest, 0)
+
+ next
+}
+
+/^tc_skip:/ {
+ desc = ($4 in descs) ? descs[$4] : $4;
+ rest = "\"" $5 "\""
+ for (i = 6; i <= NF; ++i)
+ rest = rest " \"" $i "\""
+
+ maketc($2, $3, desc, rest, 1)
next
}
Index: src/tests/ipf/t_ipf.in
diff -u src/tests/ipf/t_ipf.in:1.1 src/tests/ipf/t_ipf.in:1.2
--- src/tests/ipf/t_ipf.in:1.1 Fri Feb 20 21:42:59 2009
+++ src/tests/ipf/t_ipf.in Sat Jun 12 14:07:18 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_ipf.in,v 1.1 2009/02/20 21:42:59 jmmv Exp $
+# $NetBSD: t_ipf.in,v 1.2 2010/06/12 14:07:18 pooka Exp $
#
# Copyright (c) 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -321,17 +321,17 @@
tc:i21:itest:desc_i:text:ipf
tc_desc:desc_n:Checks NAT
-tc:n1:nattest:desc_n:text:text
-tc:n2:nattest:desc_n:text:text
+tc_skip:n1:nattest:desc_n:text:text
+tc_skip:n2:nattest:desc_n:text:text
tc:n3:nattest:desc_n:text:text
-tc:n4:nattest:desc_n:text:text
-tc:n5:nattest:desc_n:text:text
-tc:n6:nattest:desc_n:text:text
+tc_skip:n4:nattest:desc_n:text:text
+tc_skip:n5:nattest:desc_n:text:text
+tc_skip:n6:nattest:desc_n:text:text
tc:n7:nattest:desc_n:text:text
tc:n8:nattest:desc_n:hex:hex:-T fr_update_ipid=0
tc:n9:nattest:desc_n:hex:hex:-T fr_update_ipid=0
tc:n10:nattest:desc_n:hex:hex:-T fr_update_ipid=0
-tc:n11:nattest:desc_n:text:text
+tc_skip:n11:nattest:desc_n:text:text
tc:n12:nattest:desc_n:hex:hex:-T fr_update_ipid=0
tc:n13:nattest:desc_n:text:text
tc:n14:nattest:desc_n:text:text
@@ -343,20 +343,20 @@
tc:ni2:natipftest:desc_ni:single:hex:hex:-T fr_update_ipid=1
tc:ni3:natipftest:desc_ni:single:hex:hex:-T fr_update_ipid=1
tc:ni4:natipftest:desc_ni:single:hex:hex:-T fr_update_ipid=1
-tc:ni5:natipftest:desc_ni:single:hex:hex:-T fr_update_ipid=1
+tc_skip:ni5:natipftest:desc_ni:single:hex:hex:-T fr_update_ipid=1
tc:ni6:natipftest:desc_ni:multi:hex:hex:-T fr_update_ipid=1
tc:ni7:natipftest:desc_ni:single:hex:hex:-T fr_update_ipid=1
tc:ni8:natipftest:desc_ni:single:hex:hex:-T fr_update_ipid=1
tc:ni9:natipftest:desc_ni:single:hex:hex:-T fr_update_ipid=1
-tc:ni10:natipftest:desc_ni:single:hex:hex:-T fr_update_ipid=1
-tc:ni11:natipftest:desc_ni:single:hex:hex:-T fr_update_ipid=1
-tc:ni12:natipftest:desc_ni:single:hex:hex:-T fr_update_ipid=1
+tc_skip:ni10:natipftest:desc_ni:single:hex:hex:-T fr_update_ipid=1
+tc_skip:ni11:natipftest:desc_ni:single:hex:hex:-T fr_update_ipid=1
+tc_skip:ni12:natipftest:desc_ni:single:hex:hex:-T fr_update_ipid=1
tc:ni13:natipftest:desc_ni:single:hex:hex:-T fr_update_ipid=1
tc:ni14:natipftest:desc_ni:single:hex:hex:-T fr_update_ipid=1
tc:ni15:natipftest:desc_ni:single:hex:hex:-T fr_update_ipid=1
tc:ni16:natipftest:desc_ni:single:hex:hex:-T fr_update_ipid=1
-tc:ni19:natipftest:desc_ni:single:hex:hex:-T fr_update_ipid=0
-tc:ni20:natipftest:desc_ni:single:hex:hex:-T fr_update_ipid=0
+tc_skip:ni19:natipftest:desc_ni:single:hex:hex:-T fr_update_ipid=0
+tc_skip:ni20:natipftest:desc_ni:single:hex:hex:-T fr_update_ipid=0
tc:ni21:natipftest:desc_ni:multi:text:text
tc:ni23:natipftest:desc_ni:multi:text:text:-D
@@ -389,8 +389,8 @@
tc:ipv6_6:dotest6:desc_ipv6:hex:text
tc_desc:desc_bpf:Checks BPF
-tc:bpf1:itest:desc_bpf:text:ipf
-tc:bpf_f1:bpftest:desc_
