diff options
Diffstat (limited to '.travis')
| -rwxr-xr-x | .travis/install-llvm-and-runtime-compiler.sh | 13 | ||||
| -rwxr-xr-x | .travis/klee.sh | 13 | ||||
| -rwxr-xr-x | .travis/stp.sh | 17 |
3 files changed, 32 insertions, 11 deletions
diff --git a/.travis/install-llvm-and-runtime-compiler.sh b/.travis/install-llvm-and-runtime-compiler.sh new file mode 100755 index 00000000..e1a17f6b --- /dev/null +++ b/.travis/install-llvm-and-runtime-compiler.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -ev + +sudo apt-get install llvm-${LLVM_VERSION} llvm-${LLVM_VERSION}-dev + +if [ "${LLVM_VERSION}" != "2.9" ]; then + sudo apt-get install llvm-${LLVM_VERSION}-tools clang-${LLVM_VERSION} +else + # Get llvm-gcc. We don't bother installing it + wget http://llvm.org/releases/2.9/llvm-gcc4.2-2.9-x86_64-linux.tar.bz2 + tar -xjf llvm-gcc4.2-2.9-x86_64-linux.tar.bz2 + mv llvm-gcc4.2-2.9-x86_64-linux llvm-gcc +fi diff --git a/.travis/klee.sh b/.travis/klee.sh index 266f8fce..faf3f5f5 100755 --- a/.travis/klee.sh +++ b/.travis/klee.sh @@ -2,9 +2,6 @@ # Make sure we exit if there is a failure set -e -# Travis doesn't seem to like this in the yaml file so put it here instead -[ "${LLVM_VERSION}" != "2.9" ] && sudo apt-get install llvm-${LLVM_VERSION}-tools clang-${LLVM_VERSION} - # Calculate LLVM branch name to retrieve missing files from SVN_BRANCH="release_$( echo ${LLVM_VERSION} | sed 's/\.//g')" @@ -15,11 +12,9 @@ if [ "${LLVM_VERSION}" != "2.9" ]; then KLEE_CC=/usr/bin/clang-${LLVM_VERSION} KLEE_CXX=/usr/bin/clang++-${LLVM_VERSION} else - # Just use pre-built llvm-gcc. - wget http://llvm.org/releases/2.9/llvm-gcc4.2-2.9-x86_64-linux.tar.bz2 || exit - tar -xjf llvm-gcc4.2-2.9-x86_64-linux.tar.bz2 - KLEE_CC=$(pwd)/llvm-gcc4.2-2.9-x86_64-linux/bin/llvm-gcc - KLEE_CXX=$(pwd)/llvm-gcc4.2-2.9-x86_64-linux/bin/llvm-g++ + # Just use pre-built llvm-gcc downloaded earlier + KLEE_CC=${BUILD_DIR}/llvm-gcc/bin/llvm-gcc + KLEE_CXX=${BUILD_DIR}/llvm-gcc/bin/llvm-g++ export C_INCLUDE_PATH=/usr/include/x86_64-linux-gnu export CPLUS_INCLUDE_PATH=/usr/include/x86_64-linux-gnu @@ -67,6 +62,7 @@ ${KLEE_SRC}/configure --with-llvmsrc=/usr/lib/llvm-${LLVM_VERSION}/build \ ############################################################################### # Testing ############################################################################### +set +e # We want to let all the tests run before we exit ############################################################################### # Unit tests @@ -77,7 +73,6 @@ svn export http://llvm.org/svn/llvm-project/llvm/branches/${SVN_BRANCH}/unittes ../Makefile.unittest sudo mv ../Makefile.unittest /usr/lib/llvm-${LLVM_VERSION}/build/unittests/ - make unittests \ DISABLE_ASSERTIONS=${DISABLE_ASSERTIONS} \ ENABLE_OPTIMIZED=${ENABLE_OPTIMIZED} \ diff --git a/.travis/stp.sh b/.travis/stp.sh index 94bbab4d..abc4e566 100755 --- a/.travis/stp.sh +++ b/.travis/stp.sh @@ -3,6 +3,8 @@ # Make sure we exit if there is a failure set -e +STP_LOG="$(pwd)/stp-build.log" + if [ "${STP_VERSION}" == "UPSTREAM" ]; then git clone --depth 1 git://github.com/stp/stp.git src mkdir build @@ -10,7 +12,10 @@ if [ "${STP_VERSION}" == "UPSTREAM" ]; then # Disabling building of shared libs is a workaround cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DENABLE_PYTHON_INTERFACE:BOOL=OFF ../src # Don't try to build stp executable, there's an issue with using gcc4.8 with boost libraries built with gcc4.6 - make libstp CopyPublicHeaders + + set +e # Do not exit if build fails because we need to display the log + make libstp CopyPublicHeaders >> "${STP_LOG}" 2>&1 + elif [ "${STP_VERSION}" == "r940" ]; then # Building the old "r940" version that for some reason we love so much! git clone git://github.com/stp/stp.git src_build @@ -33,8 +38,16 @@ elif [ "${STP_VERSION}" == "r940" ]; then export CXX=g++ ./scripts/configure --with-prefix=${BUILD_DIR}/stp/build --with-cryptominisat2 echo "WARNING FORCING GCC TO BE USED TO COMPILE STP" - make OPTIMIZE=-O2 CFLAGS_M32= install + + set +e # Do not exit if build fails because we need to display the log + make OPTIMIZE=-O2 CFLAGS_M32= install >> "${STP_LOG}" 2>&1 else echo "Unsupported STP_VERSION" exit 1 fi + +# Only show build output if something went wrong to keep log output short +if [ $? -ne 0 ]; then + echo "Build error" + cat "${STP_LOG}" +fi |