From 29b7377530b8464c2705b66ce277ce696c12dff9 Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 25 Mar 2014 11:46:17 +0100
Subject: [PATCH] travis: Run the "all" test case with leak detective enabled

But disable the gcrypt plugin, as it causes leaks.

Also disable the backtraces by libunwind as they seem to cause
threads to get cleaned up after the leak detective already has been
disabled, which leads to invalid free()s.
---
 .travis.yml     | 1 +
 scripts/test.sh | 6 ++++++
 2 files changed, 7 insertions(+)

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)?