Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Run tests for cmake build from test bat file under AppVeyor

Browse Source 
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.
This commit is contained in:
Vadim Zeitlin
2017-12-10 22:40:23 +01:00
parent 6f23cea6df
commit 62af6a648f
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/tools/appveyor-test.bat
View File

@@ -42,6 +42,12 @@ echo --- Note: ignoring possible test failures under Cygwin
echo. echo.
exit /b 0 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 :error
echo. echo.
echo !!! Non-GUI test failed. echo !!! Non-GUI test failed.

9
build/tools/appveyor.bat
View File

@@ -87,7 +87,7 @@ if "%CONFIGURATION%"=="" set CONFIGURATION=Release
if "%SKIPTESTS%"=="1" ( if "%SKIPTESTS%"=="1" (
set BUILD_TESTS=OFF set BUILD_TESTS=OFF
) else ( ) else (
set BUILD_TESTS=CONSOLE_ONLY set BUILD_TESTS=ALL
) )
echo. echo.
echo --- Generating project files echo --- Generating project files
@@ -111,13 +111,6 @@ if ERRORLEVEL 1 goto cmake_test
appveyor PushArtifact wxWidgets_Binaries.zip appveyor PushArtifact wxWidgets_Binaries.zip
:cmake_test :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" ( if NOT "%SKIPINSTALL%"=="1" (
echo. echo.
echo --- Installing echo --- Installing