travis: Add a Windows 32-bit variant build test

diff --git a/.travis.yml b/.travis.yml
index 697425f57ab3248c49a4928397daec217bbe5456..c7f0e84a5037cdd7421ffd832e83a6109e5697b3 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -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

diff --git a/scripts/test.sh b/scripts/test.sh
index 7c1dc89ac6caa8fbc1f138b3ec5f78b86f20c45d..5aa576e804d7238fdbbf739a46daeb492ecce0b8 100755 (executable)
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -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