From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 20 Sep 2016 12:30:22 +0000 (+0200)
Subject: travis: Run 32-bit Windows build on precise (12.04) image
X-Git-Tag: 5.5.1dr4~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=39d544d56e9b10db68788cf2fce64a77d96cf14e;p=thirdparty%2Fstrongswan.git

travis: Run 32-bit Windows build on precise (12.04) image

That's required due to a bug in MinGW 3.1.0 that's shipped with trusty.
---

diff --git a/.travis.yml b/.travis.yml
index 70a69d5b3d..43323f3c60 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,8 +45,11 @@ matrix:
       env: TEST=apidoc
     - compiler: gcc
       env: TEST=win64 MONOLITHIC=yes
+    # this does not work on 14.04 due to a missing @4 decoration for
+    # TryAcquireSRWLockExclusive in MinGW 3.1.0
     - compiler: gcc
       env: TEST=win32 MONOLITHIC=yes
+      dist: precise
     - compiler: clang
       os: osx
       env: TEST=osx
diff --git a/scripts/test.sh b/scripts/test.sh
index 595fa5f0e3..a91086422a 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -72,7 +72,8 @@ win*)
 		;;
 	win32)
 		CONFIG="--host=i686-w64-mingw32 $CONFIG"
-		DEPS="gcc-mingw-w64-i686 binutils-mingw-w64-i686 mingw-w64-i686-dev $DEPS"
+		# currently only works on 12.04, so use mingw-w64-dev instead of mingw-w64-i686-dev
+		DEPS="gcc-mingw-w64-i686 binutils-mingw-w64-i686 mingw-w64-dev $DEPS"
 		CC="i686-w64-mingw32-gcc"
 		;;
 	esac