Merge pull request argotorg#1697 from ethereum/test-script-kill

axic · web-flow · commit 6f1f0b392ac5 · 2017-02-14T14:11:05.000Z
Kill the right eth process in tests
diff --git 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
+pgrep "$ETH_PID" && pkill -9 "$ETH_PID" || true
+exit $ERROR_CODE
