Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tests/net Skip ipsec_spi_*_*_preferred_new_timeout when runn...



details:   https://anonhg.NetBSD.org/src/rev/a07861d46651
branches:  trunk
changeset: 355287:a07861d46651
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Mon Jul 24 02:07:43 2017 +0000

description:
Skip ipsec_spi_*_*_preferred_new_timeout when running on qemu

Probably due to PR 43997

diffstat:

 tests/net/ipsec/t_ipsec_misc.sh |   6 +++++-
 tests/net/net_common.sh         |  10 +++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diffs (41 lines):

diff -r 2db57980a718 -r a07861d46651 tests/net/ipsec/t_ipsec_misc.sh
--- a/tests/net/ipsec/t_ipsec_misc.sh   Sun Jul 23 20:59:00 2017 +0000
+++ b/tests/net/ipsec/t_ipsec_misc.sh   Mon Jul 24 02:07:43 2017 +0000
@@ -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 @@
        local spistr=
        local longtime= shorttime=
 
+       if [ $method = timeout -a $preferred = new ]; then
+               skip_if_qemu
+       fi
+
        if [ $method = delete ]; then
                shorttime=100
                longtime=100
diff -r 2db57980a718 -r a07861d46651 tests/net/net_common.sh
--- a/tests/net/net_common.sh   Sun Jul 23 20:59:00 2017 +0000
+++ b/tests/net/net_common.sh   Mon Jul 24 02:07:43 2017 +0000
@@ -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 @@
        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
+}



Home | Main Index | Thread Index | Old Index