summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtest/scripts/run_in_venv_with_cleanup.sh7
-rwxr-xr-xtest/scripts/setsid_wrapper.sh4
2 files changed, 6 insertions, 5 deletions
diff --git a/test/scripts/run_in_venv_with_cleanup.sh b/test/scripts/run_in_venv_with_cleanup.sh
index 541f584ac45..35b6737ecad 100755
--- a/test/scripts/run_in_venv_with_cleanup.sh
+++ b/test/scripts/run_in_venv_with_cleanup.sh
@@ -14,7 +14,7 @@ atexit() {
kill -9 $id
fi
done
- exit $rv
+ exit ${rv}
}
trap "atexit;" SIGINT SIGTERM
@@ -30,9 +30,10 @@ then
$*
else
$* &
- wait
+ pid=$!
+ wait ${pid}
fi
rv=$?
atexit
-exit $rv
+exit ${rv}
diff --git a/test/scripts/setsid_wrapper.sh b/test/scripts/setsid_wrapper.sh
index e18b6ad5947..6d63426becc 100755
--- a/test/scripts/setsid_wrapper.sh
+++ b/test/scripts/setsid_wrapper.sh
@@ -3,10 +3,10 @@
if [[ "$1" == "1" ]]
then
setsid scripts/run_in_venv_with_cleanup.sh $*
- pid=$!
else
setsid scripts/run_in_venv_with_cleanup.sh $* &
pid=$!
trap "echo setsid_wrapper.sh: got signal, killing child pid ${pid}; kill ${pid}; sleep .1;" SIGINT SIGTERM
- wait
+ wait ${pid}
+ exit $?
fi