about summary refs log tree commit diff homepage
diff options
context:
space:
mode:
authorDan Liew <daniel.liew@imperial.ac.uk>2016-12-17 17:38:14 +0000
committerDan Liew <daniel.liew@imperial.ac.uk>2016-12-18 14:44:41 +0000
commitff8fa19642baed8100c7d47bf1e92aaf864758f0 (patch)
treec80323d9fc0613a4d5f41faca92e682b6a007a59
parent6566f3ca2893972a10e63b0308ff9b30a2d6a575 (diff)
downloadklee-ff8fa19642baed8100c7d47bf1e92aaf864758f0.tar.gz
[TravisCI] Remove `set +e` commands so that when running tests we fail
fast rather than continuing to run the tests (due to `set -e` at the
beginning of the script).

Although this gives less information in the event of a broken build
it means our builds might finish faster if they are broken and it
also simplifies the script significantly.
-rwxr-xr-x.travis/klee.sh16
1 files changed, 0 insertions, 16 deletions
diff --git a/.travis/klee.sh b/.travis/klee.sh
index 36b22049..ee65781f 100755
--- a/.travis/klee.sh
+++ b/.travis/klee.sh
@@ -168,17 +168,12 @@ else
     ENABLE_OPTIMIZED=${ENABLE_OPTIMIZED} \
     ENABLE_SHARED=0
 fi
-###############################################################################
-# Testing
-###############################################################################
-set +e # We want to let all the tests run before we exit
 
 ###############################################################################
 # Unit tests
 ###############################################################################
 if [ "X${USE_CMAKE}" == "X1" ]; then
   make unittests
-  RETURN="$?"
 else
   # The unittests makefile doesn't seem to have been packaged so get it from SVN
   sudo mkdir -p /usr/lib/llvm-${LLVM_VERSION}/build/unittests/
@@ -190,7 +185,6 @@ else
       DISABLE_ASSERTIONS=${DISABLE_ASSERTIONS} \
       ENABLE_OPTIMIZED=${ENABLE_OPTIMIZED} \
       ENABLE_SHARED=0
-  RETURN="$?"
 fi
 
 ###############################################################################
@@ -198,7 +192,6 @@ fi
 ###############################################################################
 if [ "X${USE_CMAKE}" == "X1" ]; then
   make integrationtests
-  RETURN="${RETURN}$?"
 else
   # Note can't use ``make check`` because llvm-lit is not available
   cd test
@@ -208,9 +201,7 @@ else
       ENABLE_OPTIMIZED=${ENABLE_OPTIMIZED} \
       ENABLE_SHARED=0
 
-  set +e # We want to let all the tests run before we exit
   lit -v .
-  RETURN="${RETURN}$?"
 fi
 
 #generate and upload coverage if COVERAGE is set
@@ -244,10 +235,3 @@ if [ ${COVERAGE} -eq 1 ]; then
     tar -zcvf coverage.tar.gz coverage/
     curl --form "file=@coverage.tar.gz" -u ${USER}:${PASSWORD} ${COVERAGE_SERVER}
 fi
-###############################################################################
-# Result
-###############################################################################
-if [ "${RETURN}" != "00" ]; then
-    echo "Running tests failed"
-    exit 1
-fi