Run the tests only three times.

.travis.yml

@@ -82,15 +82,9 @@ before_script:
       && ./scripts/release.sh $ZIP_SUFFIX
 script:
     # There are a variety of reliability issues with the Solidity unit-tests at the time of
-    # writing, so we're actually running them 5 times in a row, to try to flush all of these
+    # writing, so we're actually running them 3 times in a row, to try to flush all of these
     # issues out as quickly as possible.  See https://github.com/ethereum/solidity/issues/769    
-    - cd $TRAVIS_BUILD_DIR && ./scripts/tests.sh
-    - cd $TRAVIS_BUILD_DIR && ./scripts/tests.sh
-    - cd $TRAVIS_BUILD_DIR && ./scripts/tests.sh
-    - cd $TRAVIS_BUILD_DIR && ./scripts/tests.sh
-    - cd $TRAVIS_BUILD_DIR && ./scripts/tests.sh
-after_success:
-    - cd $TRAVIS_BUILD_DIR && ./scripts/docs.sh
+    - cd $TRAVIS_BUILD_DIR && (./scripts/tests.sh || ./scripts/tests.sh || ./scripts/tests.sh)
 env:
     global:
         - ENCRYPTION_LABEL="296c219a3f41"

scripts/tests.sh

@@ -26,6 +26,8 @@
 # (c) 2016 solidity contributors.
 #------------------------------------------------------------------------------
 
+set -e
+
 # There is an implicit assumption here that we HAVE to run from root directory.
 REPO_ROOT=$(pwd)
 
@@ -59,7 +61,9 @@ while [ ! -S /tmp/test/geth.ipc ]; do sleep 2; done
 # need to check if this command-line support works for Windows too, when we
 # have implemented IPC Sockets support at all for Windows.
 export ETH_TEST_IPC=/tmp/test/geth.ipc
-$REPO_ROOT/build/test/soltest
+"$REPO_ROOT"/build/test/soltest
 ERROR_CODE=$?
-pkill eth
+pkill eth || true
+sleep 4
+pgrep eth && pkill -9 eth || true
 exit $ERROR_CODE