diff options
-rw-r--r-- | circle.yml | 4 | ||||
-rw-r--r-- | other/travis/env-linux.sh | 3 |
2 files changed, 5 insertions, 2 deletions
@@ -37,7 +37,7 @@ compile: | |||
37 | ### ------- get libsodium ------- | 37 | ### ------- get libsodium ------- |
38 | 38 | ||
39 | ##### ------------ BUILD ------------ | 39 | ##### ------------ BUILD ------------ |
40 | - cmake -DWARNINGS=OFF . | 40 | - cmake -DASAN=ON -DDEBUG=ON -DSTRICT_ABI=ON -DTRACE=ON -DWARNINGS=OFF . |
41 | #- cmake . | 41 | #- cmake . |
42 | - make | 42 | - make |
43 | - sudo make install | 43 | - sudo make install |
@@ -121,4 +121,4 @@ compile: | |||
121 | 121 | ||
122 | test: | 122 | test: |
123 | override: | 123 | override: |
124 | - make VERBOSE=1 test || make VERBOSE=1 ARGS="--rerun-failed" test | 124 | - make VERBOSE=1 test || make VERBOSE=1 ARGS="--rerun-failed" test || make VERBOSE=1 ARGS="--rerun-failed" test || make VERBOSE=1 ARGS="--rerun-failed" test |
diff --git a/other/travis/env-linux.sh b/other/travis/env-linux.sh index 4615016e..b3292098 100644 --- a/other/travis/env-linux.sh +++ b/other/travis/env-linux.sh | |||
@@ -5,6 +5,9 @@ export PATH=$HOME/.cabal/bin:$PATH | |||
5 | 5 | ||
6 | CMAKE=cmake | 6 | CMAKE=cmake |
7 | CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS -DFORMAT_TEST=ON" | 7 | CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS -DFORMAT_TEST=ON" |
8 | # Asan is disabled because it's currently broken on Travis. | ||
9 | # See https://github.com/travis-ci/travis-ci/issues/9033. | ||
10 | CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS -DASAN=OFF" | ||
8 | NPROC=`nproc` | 11 | NPROC=`nproc` |
9 | CURDIR=$PWD | 12 | CURDIR=$PWD |
10 | RUN_TESTS=true | 13 | RUN_TESTS=true |