Module Name: src
Committed By: ozaki-r
Date: Sun Apr 16 10:34:49 UTC 2017
Modified Files:
src/tests/net/ipsec: t_ipsec_tunnel.sh
Log Message:
Revert "Mark tests of tunnel/AH/IPv6 as expected failure (PR kern/52161)"
The issue was fixed by christos@
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/net/ipsec/t_ipsec_tunnel.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/net/ipsec/t_ipsec_tunnel.sh
diff -u src/tests/net/ipsec/t_ipsec_tunnel.sh:1.2 src/tests/net/ipsec/t_ipsec_tunnel.sh:1.3
--- src/tests/net/ipsec/t_ipsec_tunnel.sh:1.2 Fri Apr 14 03:35:40 2017
+++ src/tests/net/ipsec/t_ipsec_tunnel.sh Sun Apr 16 10:34:49 2017
@@ -1,4 +1,4 @@
-# $NetBSD: t_ipsec_tunnel.sh,v 1.2 2017/04/14 03:35:40 ozaki-r Exp $
+# $NetBSD: t_ipsec_tunnel.sh,v 1.3 2017/04/16 10:34:49 ozaki-r Exp $
#
# Copyright (c) 2017 Internet Initiative Japan Inc.
# All rights reserved.
@@ -312,15 +312,11 @@ add_test_tunnel_mode()
local ipproto=$1
local proto=$2
local algo=$3
- local expected_failure=$4
local _algo=$(echo $algo | sed 's/-//g')
- local name= desc= expected_failure_code=
+ local name= desc=
name="ipsec_tunnel_${ipproto}_${proto}_${_algo}"
desc="Tests of IPsec ($ipproto) tunnel mode with $proto ($algo)"
- if [ "$expected_failure" = yes ]; then
- expected_failure_code="atf_expect_fail 'PR kern/52161';"
- fi
atf_test_case ${name} cleanup
eval " \
@@ -329,7 +325,6 @@ add_test_tunnel_mode()
atf_set \"require.progs\" \"rump_server\" \"setkey\"; \
}; \
${name}_body() { \
- $expected_failure_code \
test_tunnel_common $ipproto $proto $algo; \
rump_server_destroy_ifaces; \
}; \
@@ -352,10 +347,6 @@ atf_init_test_cases()
for algo in $AH_AUTHENTICATION_ALGORITHMS; do
add_test_tunnel_mode ipv4 ah $algo
- if [ $algo = null ]; then
- add_test_tunnel_mode ipv6 ah $algo
- else
- add_test_tunnel_mode ipv6 ah $algo yes
- fi
+ add_test_tunnel_mode ipv6 ah $algo
done
}
