From 7f111be2d06aa9717d19ce0269523cb877fb44b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= Date: Sun, 9 Sep 2018 16:33:05 +0200 Subject: [PATCH] Do not run unit tests with VS2008 and VS2010. Too much templating magic there ... --- appveyor.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c8aa9623..f622b3f5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,36 +6,42 @@ environment: VS_COMPILER_VERSION: 9 VCVARS: C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat ARCHITECTURE: x86 + UNIT_TESTS: OFF - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 CMAKE_GENERATOR: Visual Studio 10 2010 INTEGRATION_TESTS: 0 VS_COMPILER_VERSION: 10 VCVARS: C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat ARCHITECTURE: x86 + UNIT_TESTS: OFF - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 CMAKE_GENERATOR: Visual Studio 11 2012 Win64 INTEGRATION_TESTS: 0 VS_COMPILER_VERSION: 11 VCVARS: C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat ARCHITECTURE: x86_amd64 + UNIT_TESTS: ON - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 CMAKE_GENERATOR: Visual Studio 12 2013 Win64 INTEGRATION_TESTS: 0 VS_COMPILER_VERSION: 12 VCVARS: C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat ARCHITECTURE: x86_amd64 + UNIT_TESTS: ON - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 CMAKE_GENERATOR: Visual Studio 14 2015 Win64 INTEGRATION_TESTS: 1 VS_COMPILER_VERSION: 14 VCVARS: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat ARCHITECTURE: x86_amd64 + UNIT_TESTS: ON - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 CMAKE_GENERATOR: Visual Studio 15 2017 Win64 INTEGRATION_TESTS: 1 VS_COMPILER_VERSION: 15 VCVARS: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat ARCHITECTURE: x86_amd64 + UNIT_TESTS: ON shallow_clone: true @@ -72,13 +78,13 @@ build_script: - cmd: call "%VCVARS%" x86_amd64 - cmd: conan install .. --build missing - cmd: echo %CMAKE_GENERATOR% - - cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_PNG=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_ENABLE_CURL=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DCMAKE_INSTALL_PREFIX=install .. + - cmd: cmake -G "%CMAKE_GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_PNG=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_ENABLE_CURL=ON -DEXIV2_BUILD_UNIT_TESTS=%UNIT_TESTS% -DCMAKE_INSTALL_PREFIX=install .. - cmd: cmake --build . --config Release - cmd: cmake --build . --config Release --target install after_build: - cmd: cd bin - - cmd: unit_tests.exe + - cmd: if %UNIT_TESTS% == "ON" unit_tests.exe - cmd: cd ../../tests/ - cmd: set EXIV2_EXT=.exe - cmd: if %INTEGRATION_TESTS% == "1" c:\Python36\python.exe runner.py -v