Fri Aug 28 19:35:07 2020 UTC ()
Also skip the stress_short test - it just needs way too long to timeout
and fail.


(martin)
diff -r1.15 -r1.16 src/tests/rump/rumpkern/t_sp.sh
cvs diff -r1.15 -r1.16 src/tests/rump/rumpkern/t_sp.sh (switch to unified diff)

--- src/tests/rump/rumpkern/t_sp.sh 2020/08/28 19:14:17 1.15
+++ src/tests/rump/rumpkern/t_sp.sh 2020/08/28 19:35:07 1.16
@@ -1,142 +1,144 @@ @@ -1,142 +1,144 @@
1# $NetBSD: t_sp.sh,v 1.15 2020/08/28 19:14:17 martin Exp $ 1# $NetBSD: t_sp.sh,v 1.16 2020/08/28 19:35:07 martin Exp $
2# 2#
3# Copyright (c) 2010 The NetBSD Foundation, Inc. 3# Copyright (c) 2010 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# Redistribution and use in source and binary forms, with or without 6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions 7# modification, are permitted provided that the following conditions
8# are met: 8# are met:
9# 1. Redistributions of source code must retain the above copyright 9# 1. Redistributions of source code must retain the above copyright
10# notice, this list of conditions and the following disclaimer. 10# notice, this list of conditions and the following disclaimer.
11# 2. Redistributions in binary form must reproduce the above copyright 11# 2. Redistributions in binary form must reproduce the above copyright
12# notice, this list of conditions and the following disclaimer in the 12# notice, this list of conditions and the following disclaimer in the
13# documentation and/or other materials provided with the distribution. 13# documentation and/or other materials provided with the distribution.
14# 14#
15# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS 15# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
16# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 16# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
17# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 17# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
18# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 18# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
19# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 19# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
20# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 20# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
21# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 21# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
22# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 22# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
23# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 23# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
24# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 24# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
25# POSSIBILITY OF SUCH DAMAGE. 25# POSSIBILITY OF SUCH DAMAGE.
26# 26#
27 27
28test_case() 28test_case()
29{ 29{
30 local name="${1}"; shift 30 local name="${1}"; shift
31 local check_function="${1}"; shift 31 local check_function="${1}"; shift
32 32
33 atf_test_case "${name}" cleanup 33 atf_test_case "${name}" cleanup
34 eval "${name}_head() { }" 34 eval "${name}_head() { }"
35 eval "${name}_body() { \ 35 eval "${name}_body() { \
36 ${check_function} " "${@}" "; \ 36 ${check_function} " "${@}" "; \
37 }" 37 }"
38 eval "${name}_cleanup() { \ 38 eval "${name}_cleanup() { \
39 RUMP_SERVER=unix://commsock rump.halt 39 RUMP_SERVER=unix://commsock rump.halt
40 }" 40 }"
41} 41}
42 42
43test_case_skip() 43test_case_skip()
44{ 44{
45 local name="${1}"; shift 45 local name="${1}"; shift
46 local pr="${1}"; shift 46 local pr="${1}"; shift
 47 local msg="${1}"; shift
47 48
48 atf_test_case "${name}" 49 atf_test_case "${name}"
49 eval "${name}_head() { }" 50 eval "${name}_head() { }"
50 eval "${name}_body() { atf_skip "'"'"PR ${pr}: leftover rump_server"'"'"; }" 51 eval "${name}_body() { atf_skip "'"'"PR ${pr}: ${msg}"'"'"; }"
51} 52}
52 53
53test_case basic basic 54test_case basic basic
54test_case stress_short stress 1 55# test_case stress_short stress 1
 56test_case_skip stress_short 50350 "fails after insane long time"
55# test_case stress_long stress 2 57# test_case stress_long stress 2
56test_case_skip stress_long 50350 58test_case_skip stress_long 50350 "leftover rump_server"
57# test_case stress_killer stress 5 kill 59# test_case stress_killer stress 5 kill
58test_case_skip stress_killer 55356 60test_case_skip stress_killer 55356 "leftover rump_server"
59test_case fork_simple fork simple 61test_case fork_simple fork simple
60test_case fork_pipecomm fork pipecomm 62test_case fork_pipecomm fork pipecomm
61test_case fork_fakeauth fork fakeauth 63test_case fork_fakeauth fork fakeauth
62test_case sigsafe sigsafe sigsafe 64test_case sigsafe sigsafe sigsafe
63test_case signal signal 65test_case signal signal
64# test_case reconnect reconnect 66# test_case reconnect reconnect
65test_case_skip reconnect 55304 67test_case_skip reconnect 55304 "leftover rump_server"
66 68
67basic() 69basic()
68{ 70{
69 export RUMP_SERVER=unix://commsock 71 export RUMP_SERVER=unix://commsock
70 atf_check -s exit:0 rump_server ${RUMP_SERVER} 72 atf_check -s exit:0 rump_server ${RUMP_SERVER}
71 atf_check -s exit:0 $(atf_get_srcdir)/h_client/h_simplecli 73 atf_check -s exit:0 $(atf_get_srcdir)/h_client/h_simplecli
72} 74}
73 75
74stress_short_head() 76stress_short_head()
75{ 77{
76 atf_set "require.memory" "64M" 78 atf_set "require.memory" "64M"
77} 79}
78 80
79stress_long_head() 81stress_long_head()
80{ 82{
81 atf_set "require.memory" "64M" 83 atf_set "require.memory" "64M"
82} 84}
83 85
84stress() 86stress()
85{ 87{
86 88
87 export RUMP_SERVER=unix://commsock 89 export RUMP_SERVER=unix://commsock
88 atf_check -s exit:0 rump_server \ 90 atf_check -s exit:0 rump_server \
89 -lrumpvfs -lrumpnet -lrumpnet_net -lrumpnet_netinet \ 91 -lrumpvfs -lrumpnet -lrumpnet_net -lrumpnet_netinet \
90 ${RUMP_SERVER} 92 ${RUMP_SERVER}
91 atf_check -s exit:0 -e ignore $(atf_get_srcdir)/h_client/h_stresscli $@ 93 atf_check -s exit:0 -e ignore $(atf_get_srcdir)/h_client/h_stresscli $@
92} 94}
93 95
94fork() 96fork()
95{ 97{
96 98
97 export RUMP_SERVER=unix://commsock 99 export RUMP_SERVER=unix://commsock
98 atf_check -s exit:0 rump_server -lrumpvfs ${RUMP_SERVER} 100 atf_check -s exit:0 rump_server -lrumpvfs ${RUMP_SERVER}
99 atf_check -s exit:0 $(atf_get_srcdir)/h_client/h_forkcli ${1} 101 atf_check -s exit:0 $(atf_get_srcdir)/h_client/h_forkcli ${1}
100} 102}
101 103
102sigsafe() 104sigsafe()
103{ 105{
104 106
105 export RUMP_SERVER=unix://commsock 107 export RUMP_SERVER=unix://commsock
106 atf_check -s exit:0 rump_server ${RUMP_SERVER} 108 atf_check -s exit:0 rump_server ${RUMP_SERVER}
107 atf_check -s exit:0 $(atf_get_srcdir)/h_client/h_sigcli 109 atf_check -s exit:0 $(atf_get_srcdir)/h_client/h_sigcli
108 110
109} 111}
110 112
111signal() 113signal()
112{ 114{
113 115
114 export RUMP_SERVER=unix://commsock 116 export RUMP_SERVER=unix://commsock
115 atf_check -s exit:0 $(atf_get_srcdir)/h_server/h_simpleserver \ 117 atf_check -s exit:0 $(atf_get_srcdir)/h_server/h_simpleserver \
116 ${RUMP_SERVER} sendsig 27 118 ${RUMP_SERVER} sendsig 27
117 atf_check -s signal:27 $(atf_get_srcdir)/h_client/h_simplecli block 119 atf_check -s signal:27 $(atf_get_srcdir)/h_client/h_simplecli block
118} 120}
119 121
120reconnect() 122reconnect()
121{ 123{
122 124
123 125
124 export RUMP_SERVER=unix://commsock 126 export RUMP_SERVER=unix://commsock
125 atf_check -s exit:0 rump_server ${RUMP_SERVER} 127 atf_check -s exit:0 rump_server ${RUMP_SERVER}
126 atf_check -s exit:0 -e ignore $(atf_get_srcdir)/h_client/h_reconcli 2 128 atf_check -s exit:0 -e ignore $(atf_get_srcdir)/h_client/h_reconcli 2
127} 129}
128 130
129atf_init_test_cases() 131atf_init_test_cases()
130{ 132{
131 133
132 atf_add_test_case basic 134 atf_add_test_case basic
133 atf_add_test_case stress_short 135 atf_add_test_case stress_short
134 atf_add_test_case stress_long 136 atf_add_test_case stress_long
135 atf_add_test_case stress_killer 137 atf_add_test_case stress_killer
136 atf_add_test_case fork_simple 138 atf_add_test_case fork_simple
137 atf_add_test_case fork_pipecomm 139 atf_add_test_case fork_pipecomm
138 atf_add_test_case fork_fakeauth 140 atf_add_test_case fork_fakeauth
139 atf_add_test_case sigsafe 141 atf_add_test_case sigsafe
140 atf_add_test_case signal 142 atf_add_test_case signal
141 atf_add_test_case reconnect 143 atf_add_test_case reconnect
142} 144}