para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2024-11-03 17:56:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
appveyor.yml
View File

@ -1,20 +1,19 @@
branches: branches:
only: except:
- master - /asm.*/
skip_branch_with_pr: true skip_branch_with_pr: true
platform: platform:
- x86 - x86
- x64 - x64
configuration: configuration:
# - Debug - Debug
- Release - Release
image: image:
# - Visual Studio 2015 - Visual Studio 2015
- Visual Studio 2017 - Visual Studio 2017
environment: environment:
@ -31,18 +30,18 @@ environment:
VCVAR2015: 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat' 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' VCVAR2017: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat'
matrix: matrix:
# - GSL_CXX_STANDARD: 14 - GSL_CXX_STANDARD: 14
# USE_TOOLSET: MSVC USE_TOOLSET: MSVC
# USE_GENERATOR: MSBuild USE_GENERATOR: MSBuild
- GSL_CXX_STANDARD: 17 - GSL_CXX_STANDARD: 17
USE_TOOLSET: MSVC USE_TOOLSET: MSVC
USE_GENERATOR: MSBuild USE_GENERATOR: MSBuild
- GSL_CXX_STANDARD: 14 - GSL_CXX_STANDARD: 14
USE_TOOLSET: LLVM USE_TOOLSET: LLVM
USE_GENERATOR: Ninja USE_GENERATOR: Ninja
# - GSL_CXX_STANDARD: 17 - GSL_CXX_STANDARD: 17
# USE_TOOLSET: LLVM USE_TOOLSET: LLVM
# USE_GENERATOR: Ninja USE_GENERATOR: Ninja
matrix: matrix:
exclude: exclude:

2
tests/CMakeLists.txt
View File

@ -100,13 +100,11 @@ set_property(TARGET test_catch PROPERTY FOLDER "GSL_tests")
function(add_gsl_test name) function(add_gsl_test name)
add_executable(${name} ${name}.cpp) add_executable(${name} ${name}.cpp)
target_link_libraries(${name} target_link_libraries(${name}
GSL GSL
test_catch test_catch
gsl_tests_config gsl_tests_config
) )
add_dependencies(${name} catch) add_dependencies(${name} catch)
add_test( add_test(
${name} ${name}