Renable all appveyor tests. Fix whitespace issue. Change appveyor to exclude asm branches from testing instead of only testing master

This commit is contained in:
Daniel Donenfeld 2019-02-27 17:44:45 -08:00
parent 6535e63ae2
commit 91cbd29807
2 changed files with 10 additions and 13 deletions

View File

@ -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:

View File

@ -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}