Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMartin Hořeňovský2021-02-16 16:05:23 +0100
committerMartin Hořeňovský2021-02-19 23:23:00 +0100
commit29050daec0fc1a1b092ac2dc711bfc40648b8976 (patch)
treedd9c629650bd6934dd5a00eaa1f8e3b257ee61d7
parente5e9afad167be344939a24337322f5652ab3e7ed (diff)
downloadcatch3-29050daec0fc1a1b092ac2dc711bfc40648b8976.tar.gz
Add Linux and Windows CI builds with surrogate TUs
-rw-r--r--.github/workflows/linux-builds.yml10
-rw-r--r--appveyor.yml3
-rw-r--r--tools/misc/appveyorBuildConfigurationScript.bat2
3 files changed, 12 insertions, 3 deletions
diff --git a/.github/workflows/linux-builds.yml b/.github/workflows/linux-builds.yml
index 93ae21e6..eae7e003 100644
--- a/.github/workflows/linux-builds.yml
+++ b/.github/workflows/linux-builds.yml
@@ -20,6 +20,7 @@ jobs:
- clang++-10
build_type: [Debug, Release]
std: [14]
+ surrogates: [OFF]
include:
# cannot be installed on ubuntu-20.04 be default?
# - cxx: g++-6
@@ -30,6 +31,13 @@ jobs:
other_pkgs: clang-7
- cxx: 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:
- uses: actions/checkout@v2
@@ -47,7 +55,7 @@ jobs:
run: |
cmake -Bbuild -H$GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
-DCMAKE_CXX_STANDARD=${{matrix.std}} -DCATCH_DEVELOPMENT_BUILD=ON \
- -G Ninja
+ -DCATCH_BUILD_SURROGATES=${{matrix.surrogates}} -G Ninja
- name: Build tests + lib
working-directory: ${{runner.workspace}}/build
diff --git a/appveyor.yml b/appveyor.yml
index 86a1df18..d84d775c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -51,8 +51,9 @@ test_script:
# build explicitly.
environment:
matrix:
- - FLAVOR: VS 2019 x64 Debug
+ - FLAVOR: VS 2019 x64 Debug Surrogates
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+ surrogates: 1
platform: x64
configuration: Debug
diff --git a/tools/misc/appveyorBuildConfigurationScript.bat b/tools/misc/appveyorBuildConfigurationScript.bat
index 9ebd6ae0..d9be52eb 100644
--- a/tools/misc/appveyorBuildConfigurationScript.bat
+++ b/tools/misc/appveyorBuildConfigurationScript.bat
@@ -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!
) else (
@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" (