Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tests/ipf Update to the tests from 5.1.1



details:   https://anonhg.NetBSD.org/src/rev/3d17e1601b80
branches:  trunk
changeset: 778381:3d17e1601b80
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Mar 23 23:08:00 2012 +0000

description:
Update to the tests from 5.1.1

diffstat:

 tests/ipf/expected/Makefile |  252 +++++++-----
 tests/ipf/expected/f11      |  128 ++++--
 tests/ipf/expected/f13      |   20 +
 tests/ipf/expected/f18      |   22 +
 tests/ipf/expected/f21      |    5 +
 tests/ipf/expected/f22      |    5 +
 tests/ipf/expected/f25      |   35 +
 tests/ipf/expected/f26      |   84 ++++
 tests/ipf/expected/f27      |   90 ++++
 tests/ipf/expected/f28      |   32 +
 tests/ipf/expected/f29      |   64 +++
 tests/ipf/expected/f30      |   68 +++
 tests/ipf/expected/i1       |    6 +-
 tests/ipf/expected/i10      |   10 +-
 tests/ipf/expected/i11      |   11 +-
 tests/ipf/expected/i12      |   68 +-
 tests/ipf/expected/i14      |   12 +-
 tests/ipf/expected/i17      |   19 +
 tests/ipf/expected/i19.dist |   44 +-
 tests/ipf/expected/i2       |    3 +-
 tests/ipf/expected/i20      |    8 +-
 tests/ipf/expected/i22      |    5 +
 tests/ipf/expected/i3       |   16 +-
 tests/ipf/expected/i4       |    2 +-
 tests/ipf/expected/i5       |    4 +-
 tests/ipf/expected/i6       |   12 +-
 tests/ipf/expected/i7       |    7 +-
 tests/ipf/expected/i8       |  101 +++-
 tests/ipf/expected/i9       |   12 +-
 tests/ipf/expected/in1      |   44 +-
 tests/ipf/expected/in100    |    3 +
 tests/ipf/expected/in101    |    4 +
 tests/ipf/expected/in102    |    5 +
 tests/ipf/expected/in2      |  106 ++--
 tests/ipf/expected/in3      |    4 +-
 tests/ipf/expected/in5      |   46 +-
 tests/ipf/expected/in6      |   16 +-
 tests/ipf/expected/ip1      |   92 ++--
 tests/ipf/expected/ip2      |    2 +-
 tests/ipf/expected/ip3      |   14 +
 tests/ipf/expected/ipv6.4   |   51 ++
 tests/ipf/expected/ipv6.6   |    7 +
 tests/ipf/expected/l1       |   11 +-
 tests/ipf/expected/l1.b     |   13 +-
 tests/ipf/expected/n1       |  296 ++++++++++-----
 tests/ipf/expected/n10      |   63 +++
 tests/ipf/expected/n100     |   33 +
 tests/ipf/expected/n101     |   29 +
 tests/ipf/expected/n102     |   29 +
 tests/ipf/expected/n103     |   33 +
 tests/ipf/expected/n104     |   50 ++
 tests/ipf/expected/n105     |   25 +
 tests/ipf/expected/n106     |   25 +
 tests/ipf/expected/n11      |  169 ++++++--
 tests/ipf/expected/n11_6    |  124 ++++++
 tests/ipf/expected/n12      |   21 +
 tests/ipf/expected/n12_6    |   28 +
 tests/ipf/expected/n13      |   35 +-
 tests/ipf/expected/n13_6    |   32 +
 tests/ipf/expected/n14      |   33 +-
 tests/ipf/expected/n14_6    |   30 +
 tests/ipf/expected/n15      |   47 ++
 tests/ipf/expected/n15_6    |   47 ++
 tests/ipf/expected/n16      |   10 +-
 tests/ipf/expected/n17      |   10 +-
 tests/ipf/expected/n18      |  111 +++++
 tests/ipf/expected/n1_6     |  197 ++++++++++
 tests/ipf/expected/n2       |  263 +++++++++---
 tests/ipf/expected/n200     |   25 +
 tests/ipf/expected/n201     |   28 +
 tests/ipf/expected/n202     |   23 +
 tests/ipf/expected/n2_6     |  191 +++++++++
 tests/ipf/expected/n3       |   74 +++-
 tests/ipf/expected/n4       |  244 +++++++++---
 tests/ipf/expected/n4_6     |  190 +++++++++
 tests/ipf/expected/n5       |  851 +++++++++++++++++++++++++++----------------
 tests/ipf/expected/n5_6     |  533 +++++++++++++++++++++++++++
 tests/ipf/expected/n6       |  233 ++++++++---
 tests/ipf/expected/n6_6     |  173 ++++++++
 tests/ipf/expected/n7       |  122 ++++-
 tests/ipf/expected/n7_6     |   98 +++++
 tests/ipf/expected/n8       |   21 +
 tests/ipf/expected/n8_6     |   30 +
 tests/ipf/expected/n9       |   20 +
 tests/ipf/expected/n9_6     |   29 +
 tests/ipf/expected/ni10     |    3 +-
 tests/ipf/expected/ni11     |    3 +-
 tests/ipf/expected/ni12     |    7 +-
 tests/ipf/expected/ni17     |    7 +
 tests/ipf/expected/ni18     |    5 +
 tests/ipf/expected/ni19     |   18 +-
 tests/ipf/expected/ni2      |    2 +-
 tests/ipf/expected/ni20     |   40 +-
 tests/ipf/expected/ni21     |    8 +-
 tests/ipf/expected/ni23     |   34 +-
 tests/ipf/expected/ni5      |   33 +-
 tests/ipf/expected/ni6      |   74 +++-
 tests/ipf/expected/p1       |   13 +-
 tests/ipf/expected/p10      |   40 ++
 tests/ipf/expected/p11      |   40 ++
 tests/ipf/expected/p12      |   40 ++
 tests/ipf/expected/p13      |   30 +
 tests/ipf/expected/p2       |   18 +-
 tests/ipf/expected/p3       |   18 +-
 tests/ipf/expected/p4       |   38 +
 tests/ipf/expected/p5       |    2 +-
 tests/ipf/expected/p6       |   24 +
 tests/ipf/expected/p7       |   40 ++
 tests/ipf/expected/p9       |   40 ++
 tests/ipf/input/Makefile    |  186 +++++---
 tests/ipf/input/f13         |    2 +-
 tests/ipf/input/f21         |   31 +
 tests/ipf/input/f22         |   31 +
 tests/ipf/input/f25         |   41 ++
 tests/ipf/input/f26         |   13 +
 tests/ipf/input/f27         |   84 ++++
 tests/ipf/input/f28         |    7 +
 tests/ipf/input/f29         |   11 +
 tests/ipf/input/f30         |   16 +
 tests/ipf/input/ipv6.1      |    4 +-
 tests/ipf/input/ipv6.4      |  522 ++++++++++++++++++++++++++
 tests/ipf/input/ipv6.6      |   14 +
 tests/ipf/input/n10         |    4 +-
 tests/ipf/input/n100        |    8 +
 tests/ipf/input/n101        |    8 +
 tests/ipf/input/n102        |    8 +
 tests/ipf/input/n103        |    8 +
 tests/ipf/input/n104        |   48 ++
 tests/ipf/input/n105        |    8 +
 tests/ipf/input/n106        |    8 +
 tests/ipf/input/n10_6       |    6 +
 tests/ipf/input/n11_6       |   16 +
 tests/ipf/input/n12         |   12 +-
 tests/ipf/input/n12_6       |   18 +
 tests/ipf/input/n13_6       |    4 +
 tests/ipf/input/n14_6       |    4 +
 tests/ipf/input/n15         |    2 +
 tests/ipf/input/n15_6       |    2 +
 tests/ipf/input/n16         |   26 +-
 tests/ipf/input/n17         |   28 +-
 tests/ipf/input/n17_6       |   24 +
 tests/ipf/input/n18         |    8 +
 tests/ipf/input/n1_6        |   34 +
 tests/ipf/input/n200        |    6 +
 tests/ipf/input/n201        |   24 +
 tests/ipf/input/n202        |    7 +
 tests/ipf/input/n2_6        |   19 +
 tests/ipf/input/n4_6        |   10 +
 tests/ipf/input/n5_6        |   54 ++
 tests/ipf/input/n6_6        |   13 +
 tests/ipf/input/n7_6        |    9 +
 tests/ipf/input/n8          |   12 +-
 tests/ipf/input/n8_6        |   34 +
 tests/ipf/input/n9          |   12 +-
 tests/ipf/input/n9_6        |   34 +
 tests/ipf/input/ni1         |   45 +-
 tests/ipf/input/ni10        |   10 +-
 tests/ipf/input/ni11        |    4 +-
 tests/ipf/input/ni12        |   14 +-
 tests/ipf/input/ni13        |  130 +++---
 tests/ipf/input/ni14        |  126 +++---
 tests/ipf/input/ni15        |    2 +-
 tests/ipf/input/ni16        |    2 +-
 tests/ipf/input/ni18        |    4 +
 tests/ipf/input/ni19        |   14 +-
 tests/ipf/input/ni2         |   42 +-
 tests/ipf/input/ni20        |   48 +-
 tests/ipf/input/ni3         |   16 +-
 tests/ipf/input/ni4         |   14 +-
 tests/ipf/input/ni5         |    2 +-
 tests/ipf/input/ni7         |   10 +-
 tests/ipf/input/ni8         |   11 +-
 tests/ipf/input/ni9         |    7 +-
 tests/ipf/input/p10         |   10 +
 tests/ipf/input/p11         |   10 +
 tests/ipf/input/p12         |   10 +
 tests/ipf/input/p13         |    8 +
 tests/ipf/input/p4          |   12 +
 tests/ipf/input/p6          |    2 +
 tests/ipf/input/p7          |   10 +
 tests/ipf/input/p9          |   10 +
 tests/ipf/regress/Makefile  |  313 +++++++++------
 tests/ipf/regress/f13       |    1 +
 tests/ipf/regress/f21       |    2 +
 tests/ipf/regress/f22       |    2 +
 tests/ipf/regress/f25       |    1 +
 tests/ipf/regress/f26       |    6 +
 tests/ipf/regress/f27       |    6 +
 tests/ipf/regress/f28.ipf   |    2 +
 tests/ipf/regress/f28.pool  |    2 +
 tests/ipf/regress/f29.ipf   |    2 +
 tests/ipf/regress/f29.pool  |    2 +
 tests/ipf/regress/f30       |    4 +
 tests/ipf/regress/i11       |    1 +
 tests/ipf/regress/i12       |   10 +-
 tests/ipf/regress/i14       |    2 +
 tests/ipf/regress/i17       |    4 +-
 tests/ipf/regress/i18       |    6 +-
 tests/ipf/regress/i2        |    1 +
 tests/ipf/regress/i21       |    6 +-
 tests/ipf/regress/i22       |    5 +
 tests/ipf/regress/i23       |    1 +
 tests/ipf/regress/i7        |    5 +
 tests/ipf/regress/i8        |   33 +-
 tests/ipf/regress/in100     |    3 +
 tests/ipf/regress/in101     |    4 +
 tests/ipf/regress/in102     |    5 +
 tests/ipf/regress/in2       |    4 +-
 tests/ipf/regress/in7       |    1 +
 tests/ipf/regress/ip3       |   14 +
 tests/ipf/regress/ipv6.4    |    3 +
 tests/ipf/regress/ipv6.5    |    4 +-
 tests/ipf/regress/ipv6.6    |    1 +
 tests/ipf/regress/n100      |    1 +
 tests/ipf/regress/n101      |    1 +
 tests/ipf/regress/n102      |    1 +
 tests/ipf/regress/n103      |    1 +
 tests/ipf/regress/n104      |    1 +
 tests/ipf/regress/n105      |    1 +
 tests/ipf/regress/n106      |    1 +
 tests/ipf/regress/n10_6     |    3 +
 tests/ipf/regress/n11_6     |    3 +
 tests/ipf/regress/n12_6     |    1 +
 tests/ipf/regress/n13_6     |    1 +
 tests/ipf/regress/n14_6     |    1 +
 tests/ipf/regress/n15       |    2 +
 tests/ipf/regress/n15_6     |    2 +
 tests/ipf/regress/n16_6     |    1 +
 tests/ipf/regress/n17_6     |    1 +
 tests/ipf/regress/n18       |    3 +
 tests/ipf/regress/n1_6      |    3 +
 tests/ipf/regress/n200      |    1 +
 tests/ipf/regress/n201      |    1 +
 tests/ipf/regress/n202      |    1 +
 tests/ipf/regress/n2_6      |    4 +
 tests/ipf/regress/n4_6      |    6 +
 tests/ipf/regress/n5_6      |    6 +
 tests/ipf/regress/n6_6      |    5 +
 tests/ipf/regress/n7_6      |    3 +
 tests/ipf/regress/n8_6      |    1 +
 tests/ipf/regress/n9_6      |    1 +
 tests/ipf/regress/ni13.nat  |    2 +-
 tests/ipf/regress/ni14.nat  |    2 +-
 tests/ipf/regress/ni18.nat  |    4 +
 tests/ipf/regress/p1.pool   |    2 +-
 tests/ipf/regress/p10.nat   |    1 +
 tests/ipf/regress/p10.pool  |    2 +
 tests/ipf/regress/p11.nat   |    1 +
 tests/ipf/regress/p11.pool  |    2 +
 tests/ipf/regress/p12.nat   |    1 +
 tests/ipf/regress/p12.pool  |    2 +
 tests/ipf/regress/p13.ipf   |    1 +
 tests/ipf/regress/p13.pool  |    2 +
 tests/ipf/regress/p3.ipf    |    4 +-
 tests/ipf/regress/p4.nat    |    1 +
 tests/ipf/regress/p4.pool   |    2 +
 tests/ipf/regress/p6.ipf    |    1 +
 tests/ipf/regress/p6.pool   |    1 +
 tests/ipf/regress/p6.whois  |  241 ++++++++++++
 tests/ipf/regress/p7.nat    |    1 +
 tests/ipf/regress/p7.pool   |    2 +
 tests/ipf/regress/p9.nat    |    1 +
 tests/ipf/regress/p9.pool   |    2 +
 263 files changed, 7851 insertions(+), 1758 deletions(-)

diffs (truncated from 11893 to 300 lines):

diff -r c04b32786f66 -r 3d17e1601b80 tests/ipf/expected/Makefile
--- a/tests/ipf/expected/Makefile       Fri Mar 23 21:34:17 2012 +0000
+++ b/tests/ipf/expected/Makefile       Fri Mar 23 23:08:00 2012 +0000
@@ -1,108 +1,160 @@
-# $NetBSD: Makefile,v 1.4 2012/02/15 17:55:24 riz Exp $
+# $NetBSD: Makefile,v 1.5 2012/03/23 23:08:00 christos Exp $
 
 TESTSDIR=      ${TESTSBASE}/ipf
 ATFFILE=       no
 
 FILESDIR=      ${TESTSDIR}/expected
-FILES=         bpf-f1
-FILES+=                bpf1
-FILES+=                f1
-FILES+=                f10
-FILES+=                f11
-FILES+=                f12
-FILES+=                f13
-FILES+=                f14
-FILES+=                f15
-FILES+=                f16
-FILES+=                f17
-FILES+=                f18
-FILES+=                f19
-FILES+=                f2
-FILES+=                f20
-FILES+=                f24
-FILES+=                f3
-FILES+=                f4
-FILES+=                f5
-FILES+=                f6
-FILES+=                f7
-FILES+=                f8
-FILES+=                f9
-FILES+=                i1
-FILES+=                i10
-FILES+=                i11
-FILES+=                i12
-FILES+=                i13
-FILES+=                i14
-FILES+=                i15
-FILES+=                i16
-FILES+=                i17
-FILES+=                i18
-FILES+=                i19.dist
-FILES+=                i2
-FILES+=                i20
-FILES+=                i21
-FILES+=                i3
-FILES+=                i4
-FILES+=                i5
-FILES+=                i6
-FILES+=                i7
-FILES+=                i8
-FILES+=                i9
-FILES+=                in1
-FILES+=                in2
-FILES+=                in3
-FILES+=                in4
-FILES+=                in5
-FILES+=                in6
-FILES+=                ip1
-FILES+=                ip2
-FILES+=                ipv6.1
-FILES+=                ipv6.2
-FILES+=                ipv6.3
-FILES+=                ipv6.5
-FILES+=                ipv6.6
-FILES+=                l1
-FILES+=                l1.b
-FILES+=                n1
-FILES+=                n10
-FILES+=                n11
-FILES+=                n12
-FILES+=                n13
-FILES+=                n14
-FILES+=                n16
-FILES+=                n17
-FILES+=                n2
-FILES+=                n3
-FILES+=                n4
-FILES+=                n5
-FILES+=                n6
-FILES+=                n7
-FILES+=                n8
-FILES+=                n9
-FILES+=                ni1
-FILES+=                ni10
-FILES+=                ni11
-FILES+=                ni12
-FILES+=                ni13
-FILES+=                ni14
-FILES+=                ni15
-FILES+=                ni16
-FILES+=                ni19
-FILES+=                ni2
-FILES+=                ni20
-FILES+=                ni21
-FILES+=                ni23
-FILES+=                ni3
-FILES+=                ni4
-FILES+=                ni5
-FILES+=                ni6
-FILES+=                ni7
-FILES+=                ni8
-FILES+=                ni9
-FILES+=                p1
-FILES+=                p2
-FILES+=                p3
-FILES+=                p5
+FILES=\
+bpf-f1 \
+bpf1 \
+f1 \
+f10 \
+f11 \
+f12 \
+f13 \
+f14 \
+f15 \
+f16 \
+f17 \
+f18 \
+f19 \
+f2 \
+f20 \
+f21 \
+f22 \
+f24 \
+f25 \
+f26 \
+f27 \
+f28 \
+f29 \
+f3 \
+f30 \
+f4 \
+f5 \
+f6 \
+f7 \
+f8 \
+f9 \
+i1 \
+i10 \
+i11 \
+i12 \
+i13 \
+i14 \
+i15 \
+i16 \
+i17 \
+i18 \
+i19.dist \
+i2 \
+i20 \
+i21 \
+i22 \
+i23 \
+i3 \
+i4 \
+i5 \
+i6 \
+i7 \
+i8 \
+i9 \
+in1 \
+in100 \
+in101 \
+in102 \
+in2 \
+in3 \
+in4 \
+in5 \
+in6 \
+in7 \
+ip1 \
+ip2 \
+ip3 \
+ipv6.1 \
+ipv6.2 \
+ipv6.3 \
+ipv6.4 \
+ipv6.5 \
+ipv6.6 \
+l1 \
+l1.b \
+n1 \
+n10 \
+n100 \
+n101 \
+n102 \
+n103 \
+n104 \
+n105 \
+n106 \
+n11 \
+n11_6 \
+n12 \
+n12_6 \
+n13 \
+n13_6 \
+n14 \
+n14_6 \
+n15 \
+n15_6 \
+n16 \
+n17 \
+n18 \
+n1_6 \
+n2 \
+n200 \
+n201 \
+n202 \
+n2_6 \
+n3 \
+n4 \
+n4_6 \
+n5 \
+n5_6 \
+n6 \
+n6_6 \
+n7 \
+n7_6 \
+n8 \
+n8_6 \
+n9 \
+n9_6 \
+ni1 \
+ni10 \
+ni11 \
+ni12 \
+ni13 \
+ni14 \
+ni15 \
+ni16 \
+ni17 \
+ni18 \
+ni19 \
+ni2 \
+ni20 \
+ni21 \
+ni23 \
+ni3 \
+ni4 \
+ni5 \
+ni6 \
+ni7 \
+ni8 \
+ni9 \
+p1 \
+p10 \
+p11 \
+p12 \
+p13 \
+p2 \
+p3 \
+p4 \
+p5 \
+p6 \
+p7 \
+p9
 
 .include <bsd.test.mk>
 .include <bsd.files.mk>
diff -r c04b32786f66 -r 3d17e1601b80 tests/ipf/expected/f11
--- a/tests/ipf/expected/f11    Fri Mar 23 21:34:17 2012 +0000
+++ b/tests/ipf/expected/f11    Fri Mar 23 23:08:00 2012 +0000
@@ -24,6 +24,15 @@
 List of configured hash tables
 List of groups configured (set 0)
 List of groups configured (set 1)
+Rules configured (set 0, in)
+1 pass in proto tcp from any to any port = 23 flags S/SA keep state
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
 --------
 block
 nomatch
@@ -51,6 +60,15 @@
 List of configured hash tables
 List of groups configured (set 0)
 List of groups configured (set 1)
+Rules configured (set 0, in)
+1 block in proto tcp from any to any port = 23 flags S/SA keep state
+Rules configured (set 0, out)
+Rules configured (set 1, in)
+Rules configured (set 1, out)
+Accounting rules configured (set 0, in)
+Accounting rules configured (set 0, out)
+Accounting rules configured (set 1, in)
+Accounting rules configured (set 1, out)
 --------
 nomatch
 nomatch
@@ -78,6 +96,15 @@



Home | Main Index | Thread Index | Old Index