Merge pull request #60 from Chia-Network/test-script-improvements

Test script improvements

Author: prozacchiwawa

test/test.sh

@@ -1,3 +1,7 @@
+#!/bin/bash
+
+set -e
+
 rm -rf chialisp.json
 rm -rf ./test/*.vsix
 cp -r chialisp-*.vsix ./test

test/wait-for-it.sh

@@ -53,9 +53,9 @@ wait_for_wrapper()
 {
     # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
     if [[ $WAITFORIT_QUIET -eq 1 ]]; then
-        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
+        $WAITFORIT_TIMEOUT_COMMAND $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
     else
-        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
+        $WAITFORIT_TIMEOUT_COMMAND $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
     fi
     WAITFORIT_PID=$!
     trap "kill -INT -$WAITFORIT_PID" INT
@@ -140,6 +140,25 @@ WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15}
 WAITFORIT_STRICT=${WAITFORIT_STRICT:-0}
 WAITFORIT_CHILD=${WAITFORIT_CHILD:-0}
 WAITFORIT_QUIET=${WAITFORIT_QUIET:-0}
+WAITFORIT_TIMEOUT_COMMAND=timeout
+
+# Use gtimeout if timeout is not available
+if ! which timeout; then
+    if which gtimeout; then
+        WAITFORIT_TIMEOUT_COMMAND=gtimeout
+    fi
+fi
+
+# install `timeout` if missing
+if [ "$(uname)" == Darwin ]; then
+    if ! which timeout; then
+        echo "We are running on a mac without the timeout command. Attempting to install it."
+        set -e
+        brew install coreutils
+        set +e
+        WAITFORIT_TIMEOUT_COMMAND=gtimeout
+    fi
+fi
 
 # check to see if timeout is from busybox?
 WAITFORIT_TIMEOUT_PATH=$(type -p timeout)