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 (expand / 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,14 +1,14 @@ @@ -1,14 +1,14 @@
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#
@@ -34,45 +34,47 @@ test_case() @@ -34,45 +34,47 @@ test_case()
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