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 46e7cfd6c73d897d9e1cb165cd5e884e34f99373..1b1966971c5e87c0e197bb51e5d699737784583c 100644 (file)
--- 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 d21deaedc790bd608c1a6d79229348972e027fe8..0b4658c16c03f682a66945336cf0e45e0ec576ae 100755 (executable)
--- 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"