From eeaa2bad955a86436a8bfcf8cf33ff9dc5495ca6 Mon Sep 17 00:00:00 2001 From: chriseth Date: Wed, 8 Feb 2017 13:56:23 +0100 Subject: Kill the right eth process in tests --- scripts/tests.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/tests.sh b/scripts/tests.sh index 88815f5f..d47edd28 100755 --- a/scripts/tests.sh +++ b/scripts/tests.sh @@ -52,6 +52,7 @@ fi # true and continue as normal, either processing further commands in a script # or returning the cursor focus back to the user in a Linux terminal. $ETH_PATH --test -d /tmp/test & +ETH_PID=$! # Wait until the IPC endpoint is available. That won't be available instantly. # The node needs to get a little way into its startup sequence before the IPC @@ -66,7 +67,7 @@ echo "--> Running tests without optimizer..." echo "--> Running tests WITH optimizer..." && \ "$REPO_ROOT"/build/test/soltest --show-progress -- --optimize --ipcpath /tmp/test/geth.ipc ERROR_CODE=$? -pkill eth || true +pkill "$ETH_PID" || true sleep 4 -pgrep eth && pkill -9 eth || true -exit $ERROR_CODE \ No newline at end of file +pgrep "$ETH_PID" && pkill -9 "$ETH_PID" || true +exit $ERROR_CODE -- cgit