X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=test%2Ftestlib.sh.in;h=224ab4f9f6847ef1e184041c8fb8e13799b8c857;hb=252b8f0c9f3851c59f8baec5df95bbb2bbf85e72;hp=185aec0b135531d3d94370ebcbc879bc78729adb;hpb=046a10d692d1ac22de4daf783ee4fe025c4eb6ec;p=tinc diff --git a/test/testlib.sh.in b/test/testlib.sh.in index 185aec0b..224ab4f9 100644 --- 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@") +# shellcheck disable=SC2034 SPTPS_TEST=$(realdir "../src/sptps_test@EXEEXT@") +# shellcheck disable=SC2034 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. @@ -60,8 +63,10 @@ is_busybox() { # busybox timeout returns 128 + signal number (which is TERM by default) if is_busybox; then + # shellcheck disable=SC2034 EXIT_TIMEOUT=$((128 + 15)) else + # shellcheck disable=SC2034 EXIT_TIMEOUT=124 fi @@ -327,6 +332,11 @@ cleanup() { ( 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.