From 09c0df4a21d34008cea3d3073facc507924f58b7 Mon Sep 17 00:00:00 2001
From: Niels Lohmann <mail@nlohmann.me>
Date: Sun, 24 Jun 2018 17:40:16 +0200
Subject: [PATCH] :construction_worker: choosing correct image

---
 appveyor.yml        | 25 +++++++++++--------------
 test/CMakeLists.txt |  2 +-
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 9979844b..705f53fa 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,55 +2,52 @@ version: '{build}'
 
 environment:
   matrix:
-    - os: Visual Studio 2015
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       COMPILER: mingw
       platform: x86
       FLAGS: ""
       GENERATOR: Ninja
 
-    - os: Visual Studio 2015
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       platform: x86
       FLAGS: ""
       GENERATOR: Visual Studio 14 2015
 
-    - os: Visual Studio 2017
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       platform: x86
       FLAGS: ""
       GENERATOR: Visual Studio 15 2017
 
-    - os: Visual Studio 2017
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       platform: x86
       FLAGS: "/permissive- /std:c++latest /utf-8"
       GENERATOR: Visual Studio 15 2017
 
-    - os: Visual Studio 2015
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       platform: x64
       FLAGS: ""
       GENERATOR: Visual Studio 14 2015
 
-    - os: Visual Studio 2017
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       platform: x64
       FLAGS: ""
       GENERATOR: Visual Studio 15 2017
 
-    - os: Visual Studio 2017
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       platform: x64
       FLAGS: "/permissive- /std:c++latest /utf-8"
       GENERATOR: Visual Studio 15 2017
 
-matrix:
-  fast_finish: true
-
 init:
   - cmake --version
   - msbuild /version
 
 install:
-  - set NINJA_URL="https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip"
-  - appveyor DownloadFile %NINJA_URL% -FileName ninja.zip
-  - 7z x ninja.zip -oC:\projects\deps\ninja > nul
-  - set PATH=C:\projects\deps\ninja;%PATH%
+  - if "%COMPILER%"=="mingw" appveyor DownloadFile https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip -FileName ninja.zip
+  - if "%COMPILER%"=="mingw" 7z x ninja.zip -oC:\projects\deps\ninja > nul
+  - if "%COMPILER%"=="mingw" set PATH=C:\projects\deps\ninja;%PATH%
   - if "%COMPILER%"=="mingw" set PATH=C:\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin;%PATH%
+  - if "%COMPILER%"=="mingw" g++ --version
 
 before_build:
   - cmake . -G "%GENERATOR%" -DCMAKE_CXX_FLAGS="%FLAGS%" -DCMAKE_IGNORE_PATH="C:/Program Files/Git/usr/bin"
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 122c9137..8509c151 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -116,7 +116,7 @@ foreach(file ${files})
     set_tests_properties("${testcase}_default" PROPERTIES LABELS "default")
 
     add_test(NAME "${testcase}_all"
-      COMMAND ${testcase} ${CATCH_TEST_FILTER} "\\*"
+      COMMAND ${testcase} ${CATCH_TEST_FILTER} "*"
       WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     )
     set_tests_properties("${testcase}_all" PROPERTIES LABELS "all")