From 225698d0720c9cdeccd93beb6954481b01ecc2b5 Mon Sep 17 00:00:00 2001
From: Marcel Raad <Marcel.Raad@teamviewer.com>
Date: Wed, 10 Oct 2018 22:22:06 +0200
Subject: AppVeyor: add MinGW-w64 build

Add a MinGW-w64 build using CMake's MSYS Makefiles generator.
Use the Visual Studio 2015 image as it has GCC 8, while the
Visual Studio 2017 image only has GCC 7.2.

Closes https://github.com/curl/curl/pull/3623
---
 appveyor.yml | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

(limited to 'appveyor.yml')

diff --git a/appveyor.yml b/appveyor.yml
index 77f9091ec..b010ddb41 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,6 +10,8 @@ environment:
         HTTP_ONLY: OFF
         TESTING: OFF
         SHARED: ON
+        DISABLED_TESTS: ""
+        COMPILER_PATH: ""
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
         PRJ_GEN: "Visual Studio 15 2017 Win64"
         PRJ_CFG: Release
@@ -18,6 +20,8 @@ environment:
         HTTP_ONLY: OFF
         TESTING: OFF
         SHARED: ON
+        DISABLED_TESTS: ""
+        COMPILER_PATH: ""
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
         PRJ_GEN: "Visual Studio 15 2017 Win64"
         PRJ_CFG: Release
@@ -26,6 +30,8 @@ environment:
         HTTP_ONLY: OFF
         TESTING: OFF
         SHARED: ON
+        DISABLED_TESTS: ""
+        COMPILER_PATH: ""
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
         PRJ_GEN: "Visual Studio 10 2010 Win64"
         PRJ_CFG: Debug
@@ -34,6 +40,8 @@ environment:
         HTTP_ONLY: OFF
         TESTING: ON
         SHARED: OFF
+        DISABLED_TESTS: ""
+        COMPILER_PATH: ""
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
         PRJ_GEN: "Visual Studio 15 2017 Win64"
         PRJ_CFG: Debug
@@ -42,6 +50,8 @@ environment:
         HTTP_ONLY: OFF
         TESTING: ON
         SHARED: OFF
+        DISABLED_TESTS: ""
+        COMPILER_PATH: ""
       - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
         PRJ_GEN: "Visual Studio 15 2017 Win64"
         PRJ_CFG: Debug
@@ -50,6 +60,24 @@ environment:
         HTTP_ONLY: ON
         TESTING: ON
         SHARED: OFF
+        DISABLED_TESTS: ""
+        COMPILER_PATH: ""
+      - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
+        PRJ_GEN: "MSYS Makefiles"
+        PRJ_CFG: Debug
+        OPENSSL: OFF
+        WINSSL: OFF
+        HTTP_ONLY: OFF
+        TESTING: ON
+        SHARED: OFF
+        DISABLED_TESTS: "!198"
+        COMPILER_PATH: "C:\\mingw-w64\\x86_64-8.1.0-posix-seh-rt_v6-rev0\\mingw64\\bin"
+        MSYS2_ARG_CONV_EXCL: "/*"
+
+install:
+    - set "PATH=C:\msys64\usr\bin;%PATH%"
+    - if not "%COMPILER_PATH%"=="" (
+        set "PATH=%COMPILER_PATH%;%PATH%" )
 
 build_script:
     - cmake .
@@ -64,11 +92,12 @@ build_script:
       -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=""
       -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG=""
       -DCMAKE_INSTALL_PREFIX="C:/CURL"
+      -DCMAKE_BUILD_TYPE=%PRJ_CFG%
     - cmake --build . --config %PRJ_CFG% --clean-first
 
 test_script:
     - if %TESTING%==ON (
-        C:\msys64\usr\bin\bash.exe -e -l -c "cd /c/projects/curl/tests && ./runtests.pl -a -p !flaky !1139" )
+        bash.exe -e -l -c "cd /c/projects/curl/tests && ./runtests.pl -a -p !flaky !1139 %DISABLED_TESTS%" )
 
 # whitelist branches to avoid testing feature branches twice (as branch and as pull request)
 branches:
-- 
cgit v1.2.3