about summary refs log tree commit diff homepage
path: root/.travis
diff options
context:
space:
mode:
authorDan Liew <daniel.liew@imperial.ac.uk>2016-12-17 17:36:08 +0000
committerDan Liew <daniel.liew@imperial.ac.uk>2016-12-17 17:38:57 +0000
commit6566f3ca2893972a10e63b0308ff9b30a2d6a575 (patch)
tree774b75a182c7cdbeebace9f0d56ee8729cb6bd4f /.travis
parentf997712d5ccac6714e57d87626e37bb762491784 (diff)
downloadklee-6566f3ca2893972a10e63b0308ff9b30a2d6a575.tar.gz
[TravisCI] Fix bug where TravisCI build scripts would carry on executing
even though configure/build failed. This due to using the `&&` operator
which means failure of commands to execute in this compound statement
will not trigger the script to exit as requested by `set -e`.
Diffstat (limited to '.travis')
-rwxr-xr-x.travis/klee.sh12
1 files changed, 7 insertions, 5 deletions
diff --git a/.travis/klee.sh b/.travis/klee.sh
index 64bfcb67..36b22049 100755
--- a/.travis/klee.sh
+++ b/.travis/klee.sh
@@ -146,7 +146,8 @@ if [ "X${USE_CMAKE}" == "X1" ]; then
     ${KLEE_ASSERTS_OPTION} \
     -DENABLE_TESTS=TRUE \
     -DLIT_ARGS="-v" \
-    ${KLEE_SRC} && make
+    ${KLEE_SRC}
+  make
 else
   # Build KLEE
   # Note: ENABLE_SHARED=0 is required because llvm-2.9 is incorectly packaged
@@ -161,10 +162,11 @@ else
               ${KLEE_METASMT_CONFIGURE_OPTION} \
               ${KLEE_UCLIBC_CONFIGURE_OPTION} \
               ${TCMALLOC_OPTION} \
-              CXXFLAGS="${COVERAGE_FLAGS}" \
-              && make DISABLE_ASSERTIONS=${DISABLE_ASSERTIONS} \
-                      ENABLE_OPTIMIZED=${ENABLE_OPTIMIZED} \
-                      ENABLE_SHARED=0
+              CXXFLAGS="${COVERAGE_FLAGS}"
+  make \
+    DISABLE_ASSERTIONS=${DISABLE_ASSERTIONS} \
+    ENABLE_OPTIMIZED=${ENABLE_OPTIMIZED} \
+    ENABLE_SHARED=0
 fi
 ###############################################################################
 # Testing