Commit 3cc4b6fe authored by Dominik Charousset's avatar Dominik Charousset Committed by Joseph Noir

Fix CMake flags for gcovr build

parent b9b93243
...@@ -48,7 +48,9 @@ buildMatrix = [ ...@@ -48,7 +48,9 @@ buildMatrix = [
]], ]],
// Additional debug build with coverage. // Additional debug build with coverage.
['Linux', [ ['Linux', [
cmakeArgs: '-D CAF_ENABLE_GCOV:BOOL=yes', cmakeArgs: '-D CAF_ENABLE_GCOV:BOOL=yes '
+ '-D CAF_NO_EXCEPTIONS:BOOL=yes '
+ '-D CAF_FORCE_NO_EXCEPTIONS:BOOL=yes',
builds: ['debug'], builds: ['debug'],
tools: ['gcovr'], tools: ['gcovr'],
extraSteps: ['coverageReport'], extraSteps: ['coverageReport'],
...@@ -109,39 +111,39 @@ def buildSteps(buildType, cmakeArgs) { ...@@ -109,39 +111,39 @@ def buildSteps(buildType, cmakeArgs) {
if (STAGE_NAME.contains('Windows')) { if (STAGE_NAME.contains('Windows')) {
echo "Windows build on $NODE_NAME" echo "Windows build on $NODE_NAME"
withEnv(['PATH=C:\\Windows\\System32;C:\\Program Files\\CMake\\bin;C:\\Program Files\\Git\\cmd;C:\\Program Files\\Git\\bin']) { withEnv(['PATH=C:\\Windows\\System32;C:\\Program Files\\CMake\\bin;C:\\Program Files\\Git\\cmd;C:\\Program Files\\Git\\bin']) {
// Configure and build. // Configure and build.
def ret = bat(returnStatus: true, def ret = bat(returnStatus: true,
script: """cmake -E make_directory build script: """cmake -E make_directory build
cd build cd build
cmake -D CMAKE_BUILD_TYPE=$buildType -G "Visual Studio 15 2017" $cmakeArgs $msOpts .. cmake -D CMAKE_BUILD_TYPE=$buildType -G "Visual Studio 15 2017" $cmakeArgs $msOpts ..
IF /I "%ERRORLEVEL%" NEQ "0" ( IF /I "%ERRORLEVEL%" NEQ "0" (
EXIT 1 EXIT 1
) )
EXIT 0""") EXIT 0""")
if (ret) { if (ret) {
echo "[!!!] Configure failed!" echo "[!!!] Configure failed!"
currentBuild.result = 'FAILURE' currentBuild.result = 'FAILURE'
return return
} }
// bat "echo \"Step: Build for '${tags}'\"" // bat "echo \"Step: Build for '${tags}'\""
ret = bat(returnStatus: true, ret = bat(returnStatus: true,
script: """cd build script: """cd build
cmake --build . cmake --build .
IF /I "%ERRORLEVEL%" NEQ "0" ( IF /I "%ERRORLEVEL%" NEQ "0" (
EXIT 1 EXIT 1
) )
EXIT 0""") EXIT 0""")
if (ret) { if (ret) {
echo "[!!!] Build failed!" echo "[!!!] Build failed!"
currentBuild.result = 'FAILURE' currentBuild.result = 'FAILURE'
return return
} }
// Test. // Test.
ctest([ ctest([
arguments: '--output-on-failure', arguments: '--output-on-failure',
installation: 'cmake auto install', installation: 'cmake auto install',
workingDir: 'build', workingDir: 'build',
]) ])
} }
} else { } else {
echo "Unix build on $NODE_NAME" echo "Unix build on $NODE_NAME"
...@@ -252,3 +254,4 @@ pipeline { ...@@ -252,3 +254,4 @@ pipeline {
} }
} }
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment