Merge branch 'utils-split'

[people/ms/strongswan.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 8209ca9f1a3738f76a6572b878ec524b189367db..1b1966971c5e87c0e197bb51e5d699737784583c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,15 +7,8 @@ compiler:
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq bison flex gperf gettext
-  # TODO: modularize this to speed up builds (e.g. call 'test.sh deps' to do this for the current TEST)
-  - sudo apt-get install -qq libgmp-dev libssl-dev libgcrypt11-dev
-  - sudo apt-get install -qq libcurl4-gnutls-dev libsoup2.4-dev
-  - sudo apt-get install -qq libunbound-dev libldns-dev
-  - sudo apt-get install -qq libmysqlclient-dev libsqlite3-dev
-  - sudo apt-get install -qq clearsilver-dev libfcgi-dev
-  - sudo apt-get install -qq libnm-glib-dev libnm-glib-vpn-dev
-  - sudo apt-get install -qq libpcsclite-dev libpam0g-dev
-  - sudo apt-get install -qq binutils-dev libunwind7-dev
+  - ./scripts/test.sh deps
+  - ./scripts/test.sh pydeps
 
 script:
   - ./autogen.sh
@@ -32,12 +25,20 @@ 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
     - TEST=all
     - TEST=all MONOLITHIC=yes
+    - TEST=all LEAK_DETECTIVE=yes
 
 matrix:
   include:
     - compiler: gcc
       env: TEST=dist
+    - compiler: gcc
+      env: TEST=win64 MONOLITHIC=yes
+    - compiler: gcc
+      env: TEST=win32 MONOLITHIC=yes