diff options
| author | Martin Nowack <martin@se.inf.tu-dresden.de> | 2015-08-31 09:48:25 +0200 |
|---|---|---|
| committer | Martin Nowack <martin@se.inf.tu-dresden.de> | 2015-08-31 09:48:25 +0200 |
| commit | 9c7364481547580d53f4f2c1a6c7b40a29e902de (patch) | |
| tree | e62eb477770aed5ef653afae6b238a8a11cacbec | |
| parent | 957145ef5706c6aaa10ff7b1273e24df29c9b50a (diff) | |
| download | klee-9c7364481547580d53f4f2c1a6c7b40a29e902de.tar.gz | |
Delete old patches.
Say farewell to r940.
| -rw-r--r-- | .travis/stp-r940-smtlib2.y.patch | 24 | ||||
| -rwxr-xr-x | .travis/stp.sh | 30 | ||||
| -rw-r--r-- | Dockerfile | 2 |
3 files changed, 3 insertions, 53 deletions
diff --git a/.travis/stp-r940-smtlib2.y.patch b/.travis/stp-r940-smtlib2.y.patch deleted file mode 100644 index 212c0180..00000000 --- a/.travis/stp-r940-smtlib2.y.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/parser/smtlib2.y b/src/parser/smtlib2.y -index a94bd6c..5263bf5 100644 ---- a/src/parser/smtlib2.y -+++ b/src/parser/smtlib2.y -@@ -64,6 +64,7 @@ - FatalError(""); - return 1; - } -+ int yyerror(void* AssertsQuery, const char* s) { return yyerror(s); } - - ASTNode querysmt2; - ASTVec assertionsSMT2; -@@ -72,9 +73,10 @@ - #define YYMAXDEPTH 104857600 - #define YYERROR_VERBOSE 1 - #define YY_EXIT_FAILURE -1 --#define YYPARSE_PARAM AssertsQuery - %} - -+%parse-param {void* AssertsQuery} -+ - %union { - unsigned uintval; /* for numerals in types. */ - //ASTNode,ASTVec diff --git a/.travis/stp.sh b/.travis/stp.sh index 437e825d..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}" != "r940" ]; then +if [ "x${STP_VERSION}" != "x" ]; then # Build minisat git clone https://github.com/stp/minisat cd minisat @@ -27,34 +27,8 @@ if [ "${STP_VERSION}" != "r940" ]; 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 diff --git a/Dockerfile b/Dockerfile index d9fdd02d..c15d7034 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ MAINTAINER Dan Liew <daniel.liew@imperial.ac.uk> # the resulting image is unnecessarily large! ENV LLVM_VERSION=3.4 \ - STP_VERSION=UPSTREAM \ + STP_VERSION=master \ DISABLE_ASSERTIONS=0 \ ENABLE_OPTIMIZED=1 \ KLEE_UCLIBC=1 \ |