Module Name: src
Committed By: ozaki-r
Date: Mon Jul 24 02:07:43 UTC 2017
Modified Files:
src/tests/net: net_common.sh
src/tests/net/ipsec: t_ipsec_misc.sh
Log Message:
Skip ipsec_spi_*_*_preferred_new_timeout when running on qemu
Probably due to PR 43997
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/tests/net/net_common.sh
cvs rdiff -u -r1.15 -r1.16 src/tests/net/ipsec/t_ipsec_misc.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/net_common.sh
diff -u src/tests/net/net_common.sh:1.19 src/tests/net/net_common.sh:1.20
--- src/tests/net/net_common.sh:1.19 Mon Jun 19 09:20:29 2017
+++ src/tests/net/net_common.sh Mon Jul 24 02:07:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: net_common.sh,v 1.19 2017/06/19 09:20:29 ozaki-r Exp $
+# $NetBSD: net_common.sh,v 1.20 2017/07/24 02:07:43 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -404,3 +404,11 @@ dump()
rump_server_dump_servers
rump_server_dump_buses
}
+
+skip_if_qemu()
+{
+ if sysctl machdep.cpu_brand 2>/dev/null | grep QEMU >/dev/null 2>&1
+ then
+ atf_skip "unreliable under qemu, skip until PR kern/43997 fixed"
+ fi
+}
Index: src/tests/net/ipsec/t_ipsec_misc.sh
diff -u src/tests/net/ipsec/t_ipsec_misc.sh:1.15 src/tests/net/ipsec/t_ipsec_misc.sh:1.16
--- src/tests/net/ipsec/t_ipsec_misc.sh:1.15 Fri Jul 21 04:43:42 2017
+++ src/tests/net/ipsec/t_ipsec_misc.sh Mon Jul 24 02:07:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: t_ipsec_misc.sh,v 1.15 2017/07/21 04:43:42 ozaki-r Exp $
+# $NetBSD: t_ipsec_misc.sh,v 1.16 2017/07/24 02:07:43 ozaki-r Exp $
#
# Copyright (c) 2017 Internet Initiative Japan Inc.
# All rights reserved.
@@ -485,6 +485,10 @@ test_spi()
local spistr=
local longtime= shorttime=
+ if [ $method = timeout -a $preferred = new ]; then
+ skip_if_qemu
+ fi
+
if [ $method = delete ]; then
shorttime=100
longtime=100
