Browse Source

Merge pull request #329 from frangio/fix-test-script-cleanup

Fix test script cleanup and portability
Francisco Giordano 8 years ago
parent
commit
2303fd51a3
1 changed files with 3 additions and 3 deletions
  1. 3 3
      scripts/test.sh

+ 3 - 3
scripts/test.sh

@@ -1,11 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Executes cleanup function at script exit.
 trap cleanup EXIT
 
 cleanup() {
-  # Kill the testrpc instance that we started (if we started one).
-  if [ -n "$testrpc_pid" ]; then
+  # Kill the testrpc instance that we started (if we started one and if it's still running).
+  if [ -n "$testrpc_pid" ] && ps -p $testrpc_pid > /dev/null; then
     kill -9 $testrpc_pid
   fi
 }