travis: Add a Windows 32-bit variant build test
authorMartin Willi <martin@revosec.ch>
Thu, 5 Jun 2014 12:07:21 +0000 (14:07 +0200)
committerMartin Willi <martin@revosec.ch>
Fri, 6 Jun 2014 14:28:28 +0000 (16:28 +0200)
.travis.yml
scripts/test.sh

index 697425f..c7f0e84 100644 (file)
@@ -38,4 +38,6 @@ matrix:
     - compiler: gcc
       env: TEST=dist
     - compiler: gcc
-      env: TEST=win MONOLITHIC=yes
+      env: TEST=win64 MONOLITHIC=yes
+    - compiler: gcc
+      env: TEST=win32 MONOLITHIC=yes
index 7c1dc89..5aa576e 100755 (executable)
@@ -51,8 +51,8 @@ all)
                  libnm-glib-dev libnm-glib-vpn-dev libpcsclite-dev libpam0g-dev
                  binutils-dev libunwind7-dev libjson0-dev"
        ;;
-win)
-       CONFIG="--host=x86_64-w64-mingw32 --disable-defaults --enable-svc --enable-ikev2
+win*)
+       CONFIG="--disable-defaults --enable-svc --enable-ikev2
                        --enable-ikev1 --enable-static --enable-test-vectors --enable-nonce
                        --enable-constraints --enable-revocation --enable-pem --enable-pkcs1
                        --enable-pkcs8 --enable-x509 --enable-pubkey --enable-acert
@@ -63,9 +63,19 @@ win)
        # no make check for Windows binaries
        TARGET=
        CFLAGS="$CFLAGS -mno-ms-bitfields"
-       DEPS="gcc-mingw-w64-x86-64 binutils-mingw-w64-x86-64 gcc-mingw-w64-base
-                 mingw-w64-dev"
-       CC="x86_64-w64-mingw32-gcc"
+       DEPS="gcc-mingw-w64-base mingw-w64-dev"
+       case "$TEST" in
+       win64)
+               CONFIG="--host=x86_64-w64-mingw32 $CONFIG"
+               DEPS="gcc-mingw-w64-x86-64 binutils-mingw-w64-x86-64 $DEPS"
+               CC="x86_64-w64-mingw32-gcc"
+               ;;
+       win32)
+               CONFIG="--host=i686-w64-mingw32 $CONFIG"
+               DEPS="gcc-mingw-w64-i686 binutils-mingw-w64-i686 $DEPS"
+               CC="i686-w64-mingw32-gcc"
+               ;;
+       esac
        ;;
 dist)
        TARGET=distcheck