From 001f1552089fbd1e7fea540d2561c79bab2dfbac Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 8 Feb 2020 19:06:19 +0100 Subject: make script a bit nicer --- src/exchange/test_taler_exchange_httpd_restart.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/exchange/test_taler_exchange_httpd_restart.sh') diff --git a/src/exchange/test_taler_exchange_httpd_restart.sh b/src/exchange/test_taler_exchange_httpd_restart.sh index 81ac04550..f7d7a3050 100755 --- a/src/exchange/test_taler_exchange_httpd_restart.sh +++ b/src/exchange/test_taler_exchange_httpd_restart.sh @@ -49,7 +49,7 @@ unset XDG_CONFIG_HOME echo -n "Launching exchange ..." PREFIX= # Uncomment this line to run with valgrind... -# PREFIX="valgrind --leak-check=yes --track-fds=yes --error-exitcode=1 --log-file=valgrind.%p" +# PREFIX="valgrind --trace-children=yes --leak-check=yes --track-fds=yes --error-exitcode=1 --log-file=valgrind.%p" # Setup keys. taler-exchange-keyup -c test_taler_exchange_unix.conf || exit 1 @@ -73,11 +73,7 @@ do done if [ 1 != $OK ] then - echo "Failed to launch exchange" - kill -TERM $! - wait $! - echo Process status: $? - exit 77 + exit_fail "Failed to launch exchange" fi echo " DONE" @@ -110,6 +106,7 @@ kill -TERM $CPID while true do ps x | grep -v grep | grep taler-exchange-httpd > /dev/null || break + sleep 0.1 done echo " DONE" -- cgit v1.2.3