From 91cbd29807cb1ca60e897459b0616911b157f0d7 Mon Sep 17 00:00:00 2001 From: Daniel Donenfeld Date: Wed, 27 Feb 2019 17:44:45 -0800 Subject: [PATCH] Renable all appveyor tests. Fix whitespace issue. Change appveyor to exclude asm branches from testing instead of only testing master --- appveyor.yml | 21 ++++++++++----------- tests/CMakeLists.txt | 2 -- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index de39526..a5b9185 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,20 +1,19 @@ branches: - only: - - master + except: + - /asm.*/ skip_branch_with_pr: true - platform: - x86 - x64 configuration: - # - Debug + - Debug - Release image: - # - Visual Studio 2015 + - Visual Studio 2015 - Visual Studio 2017 environment: @@ -31,18 +30,18 @@ environment: VCVAR2015: 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat' VCVAR2017: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat' matrix: - # - GSL_CXX_STANDARD: 14 - # USE_TOOLSET: MSVC - # USE_GENERATOR: MSBuild + - GSL_CXX_STANDARD: 14 + USE_TOOLSET: MSVC + USE_GENERATOR: MSBuild - GSL_CXX_STANDARD: 17 USE_TOOLSET: MSVC USE_GENERATOR: MSBuild - GSL_CXX_STANDARD: 14 USE_TOOLSET: LLVM USE_GENERATOR: Ninja - # - GSL_CXX_STANDARD: 17 - # USE_TOOLSET: LLVM - # USE_GENERATOR: Ninja + - GSL_CXX_STANDARD: 17 + USE_TOOLSET: LLVM + USE_GENERATOR: Ninja matrix: exclude: diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e6c79a6..21fab77 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -100,13 +100,11 @@ set_property(TARGET test_catch PROPERTY FOLDER "GSL_tests") function(add_gsl_test name) add_executable(${name} ${name}.cpp) - target_link_libraries(${name} GSL test_catch gsl_tests_config ) - add_dependencies(${name} catch) add_test( ${name}