about summary refs log tree commit diff homepage
diff options
context:
space:
mode:
authorMartin Nowack <m.nowack@imperial.ac.uk>2019-03-13 13:31:34 +0000
committerCristian Cadar <c.cadar@imperial.ac.uk>2019-03-17 15:43:21 +0000
commitc4989f7d6c164a312fd5fe79c8729ccd952b58c2 (patch)
tree1df761be2dbdaa84028c16eabe914d0689f45df1
parentae1539e421cc225e77cf23d7662644321e78a8ed (diff)
downloadklee-c4989f7d6c164a312fd5fe79c8729ccd952b58c2.tar.gz
Add travis support to build with libc++
Enable libc++ support by default but disable for LLVM < 3.7 as not
supported.

Disable support for Mac OSX: wllvm is not working well with dylib
but Mac OSX currently requires dynamic version compiled.
In general it should be possible, maybe later version.
-rw-r--r--.travis.yml12
1 files changed, 7 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 00caf8be..352ef4be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,6 +50,7 @@ env:
     - TCMALLOC_VERSION: 2.7
     - UCLIBC_VERSION: klee_uclibc_v1.0.0
     - USE_TCMALLOC: 1
+    - USE_LIBCXX: 1
     - Z3_VERSION: 4.8.4
 
     matrix:
@@ -62,14 +63,15 @@ env:
     - LLVM_VERSION=3.9
     - LLVM_VERSION=3.8
     - LLVM_VERSION=3.7
-    - LLVM_VERSION=3.6
-    - LLVM_VERSION=3.5
-    - LLVM_VERSION=3.4
+    - LLVM_VERSION=3.6 USE_LIBCXX=0
+    - LLVM_VERSION=3.5 USE_LIBCXX=0
+    - LLVM_VERSION=3.4 USE_LIBCXX=0
 
     # *Sanitizer builds. Do unoptimized build otherwise the optimizer might remove problematic code
     - SANITIZER_BUILD=address ENABLE_OPTIMIZED=0 USE_TCMALLOC=0
     - SANITIZER_BUILD=undefined ENABLE_OPTIMIZED=0 USE_TCMALLOC=0
-    - SANITIZER_BUILD=memory ENABLE_OPTIMIZED=0 USE_TCMALLOC=0 SOLVERS=STP
+    # Use without libcxx as it is too slow to finish before travis time-out
+    - SANITIZER_BUILD=memory ENABLE_OPTIMIZED=0 USE_TCMALLOC=0 SOLVERS=STP USE_LIBCXX=0
 
     # Test just using Z3 only
     - SOLVERS=Z3
@@ -100,7 +102,7 @@ matrix:
   include:
     - os: osx
       osx_image: xcode8.3
-      env: SOLVERS=STP UCLIBC_VERSION=0 USE_TCMALLOC=0
+      env: SOLVERS=STP UCLIBC_VERSION=0 USE_TCMALLOC=0 USE_LIBCXX=0
 addons:
   apt:
     packages: