diff options
| author | Cristian Cadar <c.cadar@imperial.ac.uk> | 2015-09-04 19:01:21 +0200 |
|---|---|---|
| committer | Cristian Cadar <c.cadar@imperial.ac.uk> | 2015-09-04 19:01:21 +0200 |
| commit | 89d023e59cf61c17744ec8dca3451f25eeba58b0 (patch) | |
| tree | f4c188032e1c9c893bf17844dd3d7e9ff31d28bb /.travis/stp.sh | |
| parent | 8f6c2fd67c34a9725f79652fb6bcb24f42b0f432 (diff) | |
| parent | 9c7364481547580d53f4f2c1a6c7b40a29e902de (diff) | |
| download | klee-89d023e59cf61c17744ec8dca3451f25eeba58b0.tar.gz | |
Merge pull request #276 from MartinNowack/travis_update
Travis: Support KLEE with different STP versions, in particular 2.1.0; Disable r940
Diffstat (limited to '.travis/stp.sh')
| -rwxr-xr-x | .travis/stp.sh | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/.travis/stp.sh b/.travis/stp.sh index d2b4f1f1..53b7b6bc 100755 --- a/.travis/stp.sh +++ b/.travis/stp.sh @@ -5,7 +5,7 @@ set -e STP_LOG="$(pwd)/stp-build.log" -if [ "${STP_VERSION}" == "UPSTREAM" ]; then +if [ "x${STP_VERSION}" != "x" ]; then # Build minisat git clone https://github.com/stp/minisat cd minisat @@ -18,7 +18,7 @@ if [ "${STP_VERSION}" == "UPSTREAM" ]; then cd ../../ # Build STP - git clone --depth 1 git://github.com/stp/stp.git src + git clone --depth 1 -b "${STP_VERSION}" git://github.com/stp/stp.git src mkdir build cd build # Disabling building of shared libs is a workaround. @@ -27,34 +27,8 @@ if [ "${STP_VERSION}" == "UPSTREAM" ]; then set +e # Do not exit if build fails because we need to display the log make >> "${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 - mkdir build # This is actually the install directory - cd src_build/ - git checkout bc78d1f9f06fc095bd1ddad90eacdd1f05f64dae # r940 - - # Fixes for GCC - # We don't try to fix clang compilation because there too many things that need - # fixing and it isn't really r940 anymore if we start doing that - git config --global user.name "travis" - git config --global user.email "travis@travis.123" - git cherry-pick ece1a55fb367bd905078baca38476e35b4df06c3 - patch -p1 -i ${KLEE_SRC}/.travis/stp-r940-smtlib2.y.patch - - # Oh man this project is so broken. The binary build directory is missing - mkdir -p bin - - export CC=gcc - export CXX=g++ - ./scripts/configure --with-prefix=${BUILD_DIR}/stp/build --with-cryptominisat2 - echo "WARNING FORCING GCC TO BE USED TO COMPILE STP" - - 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" + echo "No STP_VERSION given or empty" exit 1 fi |