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; } <reg
@@ -52,40 +58,87 @@ nattest()
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
broken_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
broken_test_case n7 nattest text text
-broken_test_case n8 nattest hex hex -T fr_update_ipid=0
-broken_test_case n9 nattest hex hex -T fr_update_ipid=0
-broken_test_case n10 nattest hex hex -T fr_update_ipid=0
-#broken_test_case n11 nattest text text
-broken_test_case n12 nattest hex hex -T fr_update_ipid=0
+broken_test_case n8 nattest hex hex -T update_ipid=0
+broken_test_case n9 nattest hex hex -T update_ipid=0
+test_case n10 nattest hex hex -T update_ipid=0 -D
+broken_test_case n11 nattest text text
+broken_test_case n12 nattest hex hex -T update_ipid=0 -v
broken_test_case n13 nattest text text
broken_test_case n14 nattest text text
+broken_test_case n15 nattest text text -T update_ipid=0
test_case n16 nattest hex hex -D
test_case n17 nattest hex hex -D
+broken_test_case n100 nattest text text
+broken_test_case n101 nattest text text
+broken_test_case n102 nattest text text
+broken_test_case n103 nattest text text
+broken_test_case n104 nattest hex hex -T update_ipid=0
+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
+broken_test_case n5_6 nattest text text -6
+broken_test_case n6_6 nattest text text -6
+broken_test_case n7_6 nattest text text -6
+test_case n8_6 nattest hex hex -6D
+test_case n9_6 nattest hex hex -6D
+broken_test_case n11_6 nattest text text -6
+test_case n12_6 nattest hex hex -D6
+broken_test_case n15_6 nattest text text -6
+broken_test_case n17_6 nattest hex hex -6
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 n100
+ atf_add_test_case n101
+ atf_add_test_case n102
+ atf_add_test_case n103
+ atf_add_test_case n104
+ 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
+# atf_add_test_case n3_6
+ atf_add_test_case n4_6
+ atf_add_test_case n5_6
+ atf_add_test_case n6_6
+ atf_add_test_case n7_6
+ atf_add_test_case n8_6
+ atf_add_test_case n9_6
+ atf_add_test_case n11_6
+ atf_add_test_case n12_6
+ atf_add_test_case n15_6
+ atf_add_test_case n17_6
- #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
}
