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 <bsd.own.mk>
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
-broken_test_case ni5 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 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 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 ni19 natipftest single hex hex -T fr_update_ipid=0
-broken_test_case ni20 natipftest single hex hex -T fr_update_ipid=0
+#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
test_case ni23 natipftest multi text text -D
@@ -88,20 +88,21 @@
atf_add_test_case ni2
atf_add_test_case ni3
atf_add_test_case ni4
- atf_add_test_case ni5
atf_add_test_case ni6
atf_add_test_case ni7
atf_add_test_case ni8
atf_add_test_case ni9
- atf_add_test_case ni10
- atf_add_test_case ni11
- atf_add_test_case ni12
atf_add_test_case ni13
atf_add_test_case ni14
atf_add_test_case ni15
atf_add_test_case ni16
- atf_add_test_case ni19
- atf_add_test_case ni20
atf_add_test_case ni21
atf_add_test_case ni23
+
+ #atf_add_test_case ni5
+ #atf_add_test_case ni10
+ #atf_add_test_case ni11
+ #atf_add_test_case ni12
+ #atf_add_test_case ni19
+ #atf_add_test_case ni20
}
Index: src/tests/ipf/t_nat_parse.sh
diff -u src/tests/ipf/t_nat_parse.sh:1.2 src/tests/ipf/t_nat_parse.sh:1.3
--- src/tests/ipf/t_nat_parse.sh:1.2 Tue Oct 19 16:36:36 2010
+++ src/tests/ipf/t_nat_parse.sh Sat Dec 18 13:06:51 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_nat_parse.sh,v 1.2 2010/10/19 16:36:36 jmmv Exp $
+# $NetBSD: t_nat_parse.sh,v 1.3 2010/12/18 13:06:51 pooka Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -38,7 +38,7 @@
}
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
@@ -47,9 +47,10 @@
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
}
Added files:
Index: src/tests/ipf/Atffile
diff -u /dev/null src/tests/ipf/Atffile:1.4
--- /dev/null Sat Dec 18 13:06:51 2010
+++ src/tests/ipf/Atffile Sat Dec 18 13:06:51 2010
@@ -0,0 +1,14 @@
+Content-Type: application/X-atf-atffile; version="1"
+
+# Automatically generated by bsd.test.mk.
+
+prop: test-suite = "NetBSD"
+
+#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
