From 62af6a648f6d1623d59cc8bb2a9af19d4d553146 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 10 Dec 2017 22:40:23 +0100
Subject: [PATCH] Run tests for cmake build from test bat file under AppVeyor

The tests need to be run from appveyor-test.bat and not the main
appveyor.bat itself with the current approach, so move ctest invocation
there.
---
 build/tools/appveyor-test.bat | 6 ++++++
 build/tools/appveyor.bat      | 9 +--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/build/tools/appveyor-test.bat b/build/tools/appveyor-test.bat
index 797ec75d76..9de61f8488 100755
--- a/build/tools/appveyor-test.bat
+++ b/build/tools/appveyor-test.bat
@@ -42,6 +42,12 @@ echo --- Note: ignoring possible test failures under Cygwin
 echo.
 exit /b 0
 
+:cmake
+if "%CONFIGURATION%"=="" set CONFIGURATION=Release
+cd build_cmake
+ctest -V -C %CONFIGURATION% --interactive-debug-mode 0 .
+if errorlevel 1 goto error
+
 :error
 echo.
 echo !!! Non-GUI test failed.
diff --git a/build/tools/appveyor.bat b/build/tools/appveyor.bat
index a424deacd9..468fb0f953 100644
--- a/build/tools/appveyor.bat
+++ b/build/tools/appveyor.bat
@@ -87,7 +87,7 @@ if "%CONFIGURATION%"=="" set CONFIGURATION=Release
 if "%SKIPTESTS%"=="1" (
     set BUILD_TESTS=OFF
 ) else (
-    set BUILD_TESTS=CONSOLE_ONLY
+    set BUILD_TESTS=ALL
 )
 echo.
 echo --- Generating project files
@@ -111,13 +111,6 @@ if ERRORLEVEL 1 goto cmake_test
 appveyor PushArtifact wxWidgets_Binaries.zip
 
 :cmake_test
-if NOT "%SKIPTESTS%"=="1" (
-    echo.
-    echo --- Running tests
-    echo.
-    ctest -V -C %CONFIGURATION% --interactive-debug-mode 0 .
-    if ERRORLEVEL 1 goto error
-)
 if NOT "%SKIPINSTALL%"=="1" (
     echo.
     echo --- Installing