From b29aa3f785fc64afe3ab048751f9740306b98fd6 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 22 Nov 2017 15:37:34 +0100
Subject: [PATCH] Run unit tests on AppVeyor too

Launch the tests after building them.
---
 appveyor.yml                  |  4 +--
 build/tools/appveyor-test.bat | 49 +++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100755 build/tools/appveyor-test.bat

diff --git a/appveyor.yml b/appveyor.yml
index 1ce5ccc578..7b8ecada2b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -44,6 +44,6 @@ before_build:
         Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
         throw "There are newer queued builds for this pull request, failing early." }
 
-build_script: build\tools\appveyor.bat
+build_script: c:\projects\wxwidgets\build\tools\appveyor.bat
 
-test: off
+test_script: c:\projects\wxwidgets\build\tools\appveyor-test.bat
diff --git a/build/tools/appveyor-test.bat b/build/tools/appveyor-test.bat
new file mode 100755
index 0000000000..797ec75d76
--- /dev/null
+++ b/build/tools/appveyor-test.bat
@@ -0,0 +1,49 @@
+echo.
+echo --- Running tests.
+echo.
+
+cd c:\projects\wxwidgets\tests
+
+goto %TOOLSET%
+
+:msbuild
+PATH=C:\projects\wxwidgets\lib\vc_x64_dll;%PATH%
+.\vc_x64_mswudll\test.exe
+if errorlevel 1 goto :error
+.\vc_x64_mswudll\test_gui.exe
+goto :eof
+
+:nmake
+if "%BUILD%"=="debug" set debug_suffix=d
+.\vc_mswu%debug_suffix%\test.exe
+if errorlevel 1 goto :error
+.\vc_mswu%debug_suffix%\test_gui.exe
+goto :eof
+
+:mingw
+.\gcc_mswud\test.exe
+if errorlevel 1 goto :error
+.\gcc_mswud\test_gui.exe
+goto :eof
+
+:msys2
+PATH=C:\projects\wxwidgets\lib;%PATH%
+.\test.exe
+if errorlevel 1 goto :error
+.\test_gui.exe
+goto :eof
+
+:cygwin
+PATH=C:\projects\wxwidgets\lib;%PATH%
+.\test.exe
+.\test_gui.exe
+echo.
+echo --- Note: ignoring possible test failures under Cygwin
+echo.
+exit /b 0
+
+:error
+echo.
+echo !!! Non-GUI test failed.
+echo.
+goto :eof