Sat Oct 8 13:23:53 2016 UTC ()
Incrase timeout for the benefit of the walk_list_user test case which
sometimes times out under qemu under Linux, where the timing is more
accurate than under qemu under NetBSD where the the 60 second timeout
typically takes more than 60 seconds to trigger.


(gson)
diff -r1.2 -r1.3 src/tests/fs/ffs/ffs_common.sh
cvs diff -r1.2 -r1.3 src/tests/fs/ffs/ffs_common.sh (expand / switch to unified diff)

--- src/tests/fs/ffs/ffs_common.sh 2013/07/29 13:15:24 1.2
+++ src/tests/fs/ffs/ffs_common.sh 2016/10/08 13:23:53 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: ffs_common.sh,v 1.2 2013/07/29 13:15:24 skrll Exp $  1# $NetBSD: ffs_common.sh,v 1.3 2016/10/08 13:23:53 gson Exp $
2 2
3create_ffs() 3create_ffs()
4{ 4{
5 local endian=$1; shift 5 local endian=$1; shift
6 local vers=$1; shift 6 local vers=$1; shift
7 local type=$1; shift 7 local type=$1; shift
8 local op; 8 local op;
9 if [ ${type} = "both" ]; then 9 if [ ${type} = "both" ]; then
10 op="-q user -q group" 10 op="-q user -q group"
11 else 11 else
12 op="-q ${type}" 12 op="-q ${type}"
13 fi 13 fi
14 atf_check -o ignore -e ignore newfs ${op} \ 14 atf_check -o ignore -e ignore newfs ${op} \
@@ -35,27 +35,27 @@ rump_shutdown() @@ -35,27 +35,27 @@ rump_shutdown()
35} 35}
36 36
37# from tests/ipf/h_common.sh via tests/sbin/resize_ffs 37# from tests/ipf/h_common.sh via tests/sbin/resize_ffs
38test_case() 38test_case()
39{ 39{
40 local name="${1}"; shift 40 local name="${1}"; shift
41 local check_function="${1}"; shift 41 local check_function="${1}"; shift
42 local descr="${1}"; shift 42 local descr="${1}"; shift
43  43
44 atf_test_case "${name}" cleanup 44 atf_test_case "${name}" cleanup
45 45
46 eval "${name}_head() { \ 46 eval "${name}_head() { \
47 atf_set "descr" "${descr}" 47 atf_set "descr" "${descr}"
48 atf_set "timeout" "60" 48 atf_set "timeout" "120"
49 }" 49 }"
50 eval "${name}_body() { \ 50 eval "${name}_body() { \
51 RUMP_SOCKETS_LIST=\${RUMP_SOCKET}; \ 51 RUMP_SOCKETS_LIST=\${RUMP_SOCKET}; \
52 export RUMP_SERVER=unix://\${RUMP_SOCKET}; \ 52 export RUMP_SERVER=unix://\${RUMP_SOCKET}; \
53 ${check_function} " "${@}" "; \ 53 ${check_function} " "${@}" "; \
54 }" 54 }"
55 eval "${name}_cleanup() { \ 55 eval "${name}_cleanup() { \
56 for s in \${RUMP_SOCKETS_LIST}; do \ 56 for s in \${RUMP_SOCKETS_LIST}; do \
57 export RUMP_SERVER=unix://\${s}; \ 57 export RUMP_SERVER=unix://\${s}; \
58 atf_check -s exit:1 -o ignore -e ignore rump.halt; \ 58 atf_check -s exit:1 -o ignore -e ignore rump.halt; \
59 done; \ 59 done; \
60 }" 60 }"
61 tests="${tests} ${name}" 61 tests="${tests} ${name}"