diff options
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rwxr-xr-x | scripts/test.sh | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index e7b0f7e51..2a23fea06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,6 +31,7 @@ env: - TEST=printf-builtin LEAK_DETECTIVE=yes - TEST=all - TEST=all MONOLITHIC=yes + - TEST=all LEAK_DETECTIVE=yes matrix: include: diff --git a/scripts/test.sh b/scripts/test.sh index 4785d0603..5e95faa92 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -32,6 +32,12 @@ all) --disable-dumm --disable-kernel-pfroute --disable-keychain --disable-lock-profiler --disable-maemo --disable-padlock --disable-osx-attr --disable-tkm --disable-uci" + if test "$LEAK_DETECTIVE" = "yes"; then + # libgcrypt can't be deinitialized + CONFIG="$CONFIG --disable-gcrypt" + # libunwind causes threads to be cleaned up after LD is disabled + CONFIG="$CONFIG --disable-unwind-backtraces" + fi # not enabled on the build server CONFIG="$CONFIG --disable-af-alg" # TODO: enable? perhaps via coveralls.io (cpp-coveralls)? |