about summary refs log tree commit diff homepage
diff options
context:
space:
mode:
authorMartinNowack <martin.nowack@gmail.com>2016-05-25 16:02:17 +0200
committerMartinNowack <martin.nowack@gmail.com>2016-05-25 16:02:17 +0200
commita8012548f2cc31e2c2283f9f500b281532aa5aa7 (patch)
treec7d90e26b6220f66e163ca853aeb0369fc392c8d
parent4278fdcb819bb9a68ed43f88c86df21c6b04a0ab (diff)
parent301d189bc525524139c0c93930c9f1f8326bdb59 (diff)
downloadklee-a8012548f2cc31e2c2283f9f500b281532aa5aa7.tar.gz
Merge pull request #398 from hoangmle/master
fix a compile error, add a travis matrix entry for Z3 & LLVM-2.9
-rw-r--r--.travis.yml1
-rw-r--r--lib/Solver/Z3Solver.cpp2
2 files changed, 3 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 91e0e89b..4e679237 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,7 @@ env:
     matrix:
     # Test experimental Z3 support
     - LLVM_VERSION=3.4 SOLVERS=Z3 KLEE_UCLIBC=klee_uclibc_v1.0.0 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=1 COVERAGE=0
+    - LLVM_VERSION=2.9 SOLVERS=Z3 KLEE_UCLIBC=klee_uclibc_v1.0.0 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=1 COVERAGE=0
     - LLVM_VERSION=3.4 SOLVERS=STP:Z3 STP_VERSION=2.1.0 KLEE_UCLIBC=klee_uclibc_v1.0.0 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=1 COVERAGE=0
     # FIXME: Enable when we want to test LLVM3.5
     #- LLVM_VERSION=3.5 SOLVERS=STP STP_VERSION=master KLEE_UCLIBC=0 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=1
diff --git a/lib/Solver/Z3Solver.cpp b/lib/Solver/Z3Solver.cpp
index 994386ab..96a7dafa 100644
--- a/lib/Solver/Z3Solver.cpp
+++ b/lib/Solver/Z3Solver.cpp
@@ -15,6 +15,8 @@
 #include "klee/util/Assignment.h"
 #include "klee/util/ExprUtil.h"
 
+#include "llvm/Support/ErrorHandling.h"
+
 namespace klee {
 
 class Z3SolverImpl : public SolverImpl {