diff options
| author | pgoyette <pgoyette@NetBSD.org> | 2012-11-29 04:57:42 +0000 |
|---|---|---|
| committer | pgoyette <pgoyette@NetBSD.org> | 2012-11-29 04:57:42 +0000 |
| commit | 4d19c45142eeaac2fc7eaaf7194613f4c4abcd27 (patch) | |
| tree | 6b911f0edef7bfc821f660f1c7e24ccc5686616a /tests/ipf | |
| parent | 2f28c1e2bb998eca8a4d1d5588439006fdecc8fb (diff) | |
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
Diffstat (limited to 'tests/ipf')
| -rw-r--r-- | tests/ipf/t_nat_exec.sh | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/tests/ipf/t_nat_exec.sh b/tests/ipf/t_nat_exec.sh index 68f88b8aa0f..93d5a6ea615 100644 --- a/tests/ipf/t_nat_exec.sh +++ b/tests/ipf/t_nat_exec.sh @@ -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; } <reg @@ -58,42 +58,42 @@ 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 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 n7 nattest text text -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 n1 nattest text text +test_case n2 nattest text text +test_case n3 nattest text text +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 +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 +test_case n13 nattest 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 -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 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 +test_case n100 nattest text text +test_case n101 nattest text text +test_case n102 nattest text text +test_case n103 nattest text text +test_case n104 nattest hex hex -T update_ipid=0 +test_case n105 nattest hex hex -T update_ipid=0 +test_case n106 nattest hex hex -T update_ipid=0 +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 +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 +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 atf_init_test_cases() |
