From: Martin Willi <martin@revosec.ch>
Date: Mon, 13 Apr 2015 10:13:56 +0000 (+0200)
Subject: travis: Run a gcrypt test with leak-detective
X-Git-Tag: 5.3.1dr1~16^2~10
X-Git-Url: https://git.strongswan.org/?p=strongswan.git;a=commitdiff_plain;h=3aa785507d5403455b16494cdcd2857f8e66ae99;ds=sidebyside

travis: Run a gcrypt test with leak-detective

And also enable gcrypt in the all tests with leak-detective enabled.
---

diff --git a/.travis.yml b/.travis.yml
index 46e7cfd..1b19669 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,8 +25,8 @@ env:
     - TEST=default LEAK_DETECTIVE=yes
     - TEST=openssl
     - TEST=openssl LEAK_DETECTIVE=yes
-    # libgcrypt can't be deinitialized so we can't test it with leak detective
     - TEST=gcrypt
+    - TEST=gcrypt LEAK_DETECTIVE=yes
     # we can't test Vstr as negative int args are not properly passed to CBs
     - TEST=printf-builtin
     - TEST=printf-builtin LEAK_DETECTIVE=yes
diff --git a/scripts/test.sh b/scripts/test.sh
index d21deae..0b4658c 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -37,10 +37,6 @@ all)
 			--disable-systemd --disable-soup --disable-unwind-backtraces
 			--disable-svc --disable-dbghelp-backtraces --disable-socket-win
 			--disable-kernel-wfp --disable-kernel-iph --disable-winhttp"
-	if test "$LEAK_DETECTIVE" = "yes"; then
-		# libgcrypt can't be deinitialized
-		CONFIG="$CONFIG --disable-gcrypt"
-	fi
 	if test "$MONOLITHIC" = "yes"; then
 		# Ubuntu 12.04 does not provide a proper -liptc pkg-config
 		CONFIG="$CONFIG --disable-forecast --disable-connmark"