diff options
| author | gson <gson@NetBSD.org> | 2020-08-20 07:23:20 +0000 |
|---|---|---|
| committer | gson <gson@NetBSD.org> | 2020-08-20 07:23:20 +0000 |
| commit | b4e20b1051564e982e457421bf3a2c56ebdbb23d (patch) | |
| tree | ed79d3458cb41cdcc43be1d5d983fee836c2fbc9 /tests/fs | |
| parent | 335b46e40ab6788c6fb6592ca23d31f05ab33a4e (diff) | |
Remove non-functional cleanup code from test_case() and test_case_root().
It had no effect because RUMP_SOCKETS_LIST is not set in the shell
running the cleanup phase. Even if RUMP_SOCKETS_LIST had been set,
the code would still not have worked correctly because it ran
rump.halt via "atf_check -s exit:1", which would cause the first
successful halting of a rump processes to be treated as a failure
and abort the cleanup without halting any other rump processes still
running.
Diffstat (limited to 'tests/fs')
| -rw-r--r-- | tests/fs/ffs/ffs_common.sh | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/tests/fs/ffs/ffs_common.sh b/tests/fs/ffs/ffs_common.sh index 31ba73a011b..4799c0ce555 100644 --- a/tests/fs/ffs/ffs_common.sh +++ b/tests/fs/ffs/ffs_common.sh @@ -1,4 +1,4 @@ -# $NetBSD: ffs_common.sh,v 1.4 2020/08/17 06:18:39 gson Exp $ +# $NetBSD: ffs_common.sh,v 1.5 2020/08/20 07:23:20 gson Exp $ create_ffs() { @@ -30,7 +30,7 @@ test_case() local check_function="${1}"; shift local descr="${1}"; shift - atf_test_case "${name}" cleanup + atf_test_case "${name}" eval "${name}_head() { \ atf_set "descr" "${descr}" @@ -41,12 +41,6 @@ test_case() export RUMP_SERVER=unix://\${RUMP_SOCKET}; \ ${check_function} " "${@}" "; \ }" - eval "${name}_cleanup() { \ - for s in \${RUMP_SOCKETS_LIST}; do \ - export RUMP_SERVER=unix://\${s}; \ - atf_check -s exit:1 -o ignore -e ignore rump.halt; \ - done; \ - }" tests="${tests} ${name}" } @@ -56,7 +50,7 @@ test_case_root() local check_function="${1}"; shift local descr="${1}"; shift - atf_test_case "${name}" cleanup + atf_test_case "${name}" eval "${name}_head() { \ atf_set "descr" "${descr}" @@ -68,12 +62,6 @@ test_case_root() export RUMP_SERVER=unix://\${RUMP_SOCKET}; \ ${check_function} " "${@}" "; \ }" - eval "${name}_cleanup() { \ - for s in \${RUMP_SOCKETS_LIST}; do \ - export RUMP_SERVER=unix://\${s}; \ - atf_check -s exit:1 -o ignore -e ignore rump.halt; \ - done; \ - }" tests="${tests} ${name}" } |
