3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-24 22:36:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add Linux and Windows CI builds with surrogate TUs

Browse Source
This commit is contained in:
Martin Hořeňovský 2021-02-16 16:05:23 +01:00
parent e5e9afad16
commit 29050daec0
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/linux-builds.yml vendored
View File

@ -20,6 +20,7 @@ jobs:
- clang++-10 - clang++-10
build_type: [Debug, Release] build_type: [Debug, Release]
std: [14] std: [14]
surrogates: [OFF]
include: include:
# cannot be installed on ubuntu-20.04 be default? # cannot be installed on ubuntu-20.04 be default?
# - cxx: g++-6 # - cxx: g++-6
@ -30,6 +31,13 @@ jobs:
other_pkgs: clang-7 other_pkgs: clang-7
- cxx: clang++-10 - cxx: clang++-10
other_pkgs: clang-10 other_pkgs: clang-10
# We want one build to build surrogates -- but not more, to
# avoid trouble with long compilation/CI times.
- cxx: clang++-10
build_type: Debug
std: 14
other_pkgs: clang-10
surrogates: ON
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -47,7 +55,7 @@ jobs:
run: | run: |
cmake -Bbuild -H$GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \ cmake -Bbuild -H$GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
-DCMAKE_CXX_STANDARD=${{matrix.std}} -DCATCH_DEVELOPMENT_BUILD=ON \ -DCMAKE_CXX_STANDARD=${{matrix.std}} -DCATCH_DEVELOPMENT_BUILD=ON \
-G Ninja -DCATCH_BUILD_SURROGATES=${{matrix.surrogates}} -G Ninja
- name: Build tests + lib - name: Build tests + lib
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build

3
appveyor.yml
View File

@ -51,8 +51,9 @@ test_script:
# build explicitly. # build explicitly.
environment: environment:
matrix: matrix:
- FLAVOR: VS 2019 x64 Debug - FLAVOR: VS 2019 x64 Debug Surrogates
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
surrogates: 1
platform: x64 platform: x64
configuration: Debug configuration: Debug

2
tools/misc/appveyorBuildConfigurationScript.bat
View File

@ -13,7 +13,7 @@ if "%CONFIGURATION%"=="Debug" (
cmake -H. -BBuild -A%PLATFORM% -DCATCH_TEST_USE_WMAIN=%wmain% -DMEMORYCHECK_COMMAND=build-misc\Debug\CoverageHelper.exe -DMEMORYCHECK_COMMAND_OPTIONS=--sep-- -DMEMORYCHECK_TYPE=Valgrind -DCATCH_BUILD_EXAMPLES=%examples% -DCATCH_BUILD_EXTRA_TESTS=%examples% -DCATCH_DEVELOPMENT_BUILD=ON || exit /b !ERRORLEVEL! cmake -H. -BBuild -A%PLATFORM% -DCATCH_TEST_USE_WMAIN=%wmain% -DMEMORYCHECK_COMMAND=build-misc\Debug\CoverageHelper.exe -DMEMORYCHECK_COMMAND_OPTIONS=--sep-- -DMEMORYCHECK_TYPE=Valgrind -DCATCH_BUILD_EXAMPLES=%examples% -DCATCH_BUILD_EXTRA_TESTS=%examples% -DCATCH_DEVELOPMENT_BUILD=ON || exit /b !ERRORLEVEL!
) else ( ) else (
@REM # We know that coverage is 0 @REM # We know that coverage is 0
cmake -H. -BBuild -A%PLATFORM% -DCATCH_TEST_USE_WMAIN=%wmain% -DCATCH_BUILD_EXAMPLES=%examples% -DCATCH_BUILD_EXTRA_TESTS=%examples% -DCATCH_DEVELOPMENT_BUILD=ON || exit /b !ERRORLEVEL! cmake -H. -BBuild -A%PLATFORM% -DCATCH_TEST_USE_WMAIN=%wmain% -DCATCH_BUILD_EXAMPLES=%examples% -DCATCH_BUILD_EXTRA_TESTS=%examples% -DCATCH_BUILD_SURROGATES=%surrogates% -DCATCH_DEVELOPMENT_BUILD=ON || exit /b !ERRORLEVEL!
) )
) )
if "%CONFIGURATION%"=="Release" ( if "%CONFIGURATION%"=="Release" (