From db4e84cf2f8de0909c3483c8cadb25ac72fb3367 Mon Sep 17 00:00:00 2001 From: Klement Sekera Date: Fri, 11 Aug 2017 10:06:15 +0200 Subject: make test: properly handle ctrl-c Change-Id: Iab88886ebc1582626813777ea45ce97fc8e36443 Signed-off-by: Klement Sekera --- test/scripts/setsid_wrapper.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 test/scripts/setsid_wrapper.sh (limited to 'test/scripts/setsid_wrapper.sh') diff --git a/test/scripts/setsid_wrapper.sh b/test/scripts/setsid_wrapper.sh new file mode 100755 index 00000000..e18b6ad5 --- /dev/null +++ b/test/scripts/setsid_wrapper.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +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 +fi -- cgit 1.2.3-korg From 8712ada6c3a84b2f75a25457ec6d477f3683787c Mon Sep 17 00:00:00 2001 From: Klement Sekera Date: Wed, 16 Aug 2017 16:38:10 +0200 Subject: make test: fix broken passing of return value Change-Id: I2cb83caaf55ca9a29c06d71c6d20f8273ec062b3 Signed-off-by: Klement Sekera --- test/scripts/run_in_venv_with_cleanup.sh | 7 ++++--- test/scripts/setsid_wrapper.sh | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'test/scripts/setsid_wrapper.sh') diff --git a/test/scripts/run_in_venv_with_cleanup.sh b/test/scripts/run_in_venv_with_cleanup.sh index 541f584a..35b6737e 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 e18b6ad5..6d63426b 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 -- cgit 1.2.3-korg