projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a few memory leaks at exit time.
[tinc]
/
test
/
testlib.sh.in
diff --git
a/test/testlib.sh.in
b/test/testlib.sh.in
index
185aec0
..
224ab4f
100644
(file)
--- a/
test/testlib.sh.in
+++ b/
test/testlib.sh.in
@@
-19,10
+19,13
@@
realdir() {
tincd_path=$(realdir "../src/tincd@EXEEXT@")
tinc_path=$(realdir "../src/tinc@EXEEXT@")
tincd_path=$(realdir "../src/tincd@EXEEXT@")
tinc_path=$(realdir "../src/tinc@EXEEXT@")
+# shellcheck disable=SC2034
SPTPS_TEST=$(realdir "../src/sptps_test@EXEEXT@")
SPTPS_TEST=$(realdir "../src/sptps_test@EXEEXT@")
+# shellcheck disable=SC2034
SPTPS_KEYPAIR=$(realdir "../src/sptps_keypair@EXEEXT@")
# Exit status list
SPTPS_KEYPAIR=$(realdir "../src/sptps_keypair@EXEEXT@")
# Exit status list
+# shellcheck disable=SC2034
EXIT_SKIP_TEST=77
# The list of the environment variables that tinc injects into the scripts it calls.
EXIT_SKIP_TEST=77
# The list of the environment variables that tinc injects into the scripts it calls.
@@
-60,8
+63,10
@@
is_busybox() {
# busybox timeout returns 128 + signal number (which is TERM by default)
if is_busybox; then
# busybox timeout returns 128 + signal number (which is TERM by default)
if is_busybox; then
+ # shellcheck disable=SC2034
EXIT_TIMEOUT=$((128 + 15))
else
EXIT_TIMEOUT=$((128 + 15))
else
+ # shellcheck disable=SC2034
EXIT_TIMEOUT=124
fi
EXIT_TIMEOUT=124
fi
@@
-327,6
+332,11
@@
cleanup() {
(
set +ex
(
set +ex
+ if command -v cleanup_hook 2>/dev/null; then
+ echo >&2 "Cleanup hook found, calling..."
+ cleanup_hook
+ fi
+
stop_all_tincs
# Ask nicely, then kill anything that's left.
stop_all_tincs
# Ask nicely, then kill anything that's left.