mirror of
https://github.com/microsoft/GSL.git
synced 2024-11-03 17:56:43 -05:00
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:
parent
6535e63ae2
commit
91cbd29807
21
appveyor.yml
21
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:
|
||||
|
@ -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}
|
||||
|
Loading…
Reference in New Issue
Block a user