diff options
| author | MartinNowack <martin.nowack@gmail.com> | 2017-07-28 10:41:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-28 10:41:53 +0200 |
| commit | 3bea97fdafc9d68ec2e5c76fcde05d112aef8a38 (patch) | |
| tree | 34fd867b9c55e5c96cb1ce53663001ef23c6ea97 | |
| parent | b46f8186e60a18ec81e2f03783482c76ac234880 (diff) | |
| parent | 7a305a4275c6226f6dd4e103e8ab5b6b3be8e73c (diff) | |
| download | klee-3bea97fdafc9d68ec2e5c76fcde05d112aef8a38.tar.gz | |
Merge pull request #735 from andreamattavelli/fixes_travis_0717
[TravisCI] Some fixes for STP scripts
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rwxr-xr-x | .travis/stp.sh | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index f6034540..9c0ca814 100644 --- a/.travis.yml +++ b/.travis.yml @@ -97,12 +97,13 @@ addons: packages: - gcc-4.8 - g++-4.8 + - libboost-program-options-dev - libcap-dev - libedit-dev - libselinux1-dev - cmake -cache: +cache: apt: true directories: - $HOME/Library/Caches/Homebrew diff --git a/.travis/stp.sh b/.travis/stp.sh index 6df59ebe..e8647839 100755 --- a/.travis/stp.sh +++ b/.travis/stp.sh @@ -35,17 +35,14 @@ if [ "x${STP_VERSION}" != "x" ]; then # Determine STP build flags if [ "X${STP_VERSION}" = "Xmaster" ]; then - # 7e0b096ee79d59bb5c344b7dd4d51b5b8d226221 s/NO_BOOST/ONLY_SIMPLE/ # 5e9ca6339a2b3b000aa7a90c18601fdcf1212fe1 Silently BUILD_SHARED_LIBS removed. STATICCOMPILE does something similar STP_CMAKE_FLAGS=( \ "-DENABLE_PYTHON_INTERFACE:BOOL=OFF" \ - "-DONLY_SIMPLE:BOOL=ON" \ "-DSTATICCOMPILE:BOOL=ON" \ ) else STP_CMAKE_FLAGS=( \ "-DENABLE_PYTHON_INTERFACE:BOOL=OFF" \ - "-DNO_BOOST:BOOL=ON" \ "-DBUILD_SHARED_LIBS:BOOL=OFF" \ ) fi @@ -71,4 +68,5 @@ fi if [ $? -ne 0 ]; then echo "Build error" cat "${STP_LOG}" + exit 1 fi |