diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 974147548bdf7317fc1739c9d6f0e5a7296724ae..0afe3247991756d802350869eaf0235cb31d6e11 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -509,7 +509,7 @@ lizard: ############################################################################### # code coverage -gcov_gcc_12: +gcov_gcc_11: stage: analyze extends: .analyze_template @@ -518,14 +518,15 @@ gcov_gcc_12: before_script: - gcovr --version + - export CC=/usr/bin/gcc-11 + - export CXX=/usr/bin/g++-11 script: - - mkdir -p $CI_PROJECT_DIR/build + - mkdir -p $CI_PROJECT_DIR/builda - cd $CI_PROJECT_DIR/build - cmake .. --preset=make_all - -DCMAKE_CUDA_ARCHITECTURES=60 - -DBUILD_VF_COVERAGE=ON + -DCMAKE_BUILD_TYPE=PROFILE - make -j4 - ctest - cd .. diff --git a/CMake/compilerflags/GNU.cmake b/CMake/compilerflags/GNU.cmake index 8d54b52a434719a1e99aa705b121593973f3375a..cf77b2228e1ac470f064db71c8f8e87f33902f04 100644 --- a/CMake/compilerflags/GNU.cmake +++ b/CMake/compilerflags/GNU.cmake @@ -17,10 +17,10 @@ if(NOT BUILD_VF_INCLUDE_WHAT_YOU_USE) # optimization flag '-funroll-all-loops' i endif() # gcov -if (BUILD_VF_COVERAGE) - list(APPEND CS_COMPILER_FLAGS_CXX "--coverage") - set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} " --coverage") -endif() +# According to https://gcovr.com/en/stable/cookbook.html#out-of-source-builds-with-cmake +# This flags are used if cmake is called with -DCMAKE_BUILD_TYPE=PROFILE +set(CMAKE_C_FLAGS_PROFILE --coverage) +set(CMAKE_CXX_FLAGS_PROFILE --coverage) ############################################################################################################# # warnings diff --git a/CMakeLists.txt b/CMakeLists.txt index e7f62a5ba3308a7e382e1802a8cc42a1bb043b25..8822b504af3ff680f12f6d16e2e4c5b7a615ac00 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,6 @@ option(BUILD_VF_UNIT_TESTS "Build VirtualFluids unit tests" OFF) option(BUILD_VF_CLANG_TIDY "Add the clang tidy checks to the targets" OFF) option(BUILD_VF_INCLUDE_WHAT_YOU_USE "Add IWYU to the targets" OFF) option(BUILD_VF_CPPCHECK "Add cppcheck to the targets" OFF) -option(BUILD_VF_COVERAGE "Add the -coverage compiler flag." OFF) option(BUILD_CUDA_LTO "Enables the cuda link optimization." OFF) diff --git a/src/basics/config/ConfigurationFile.h b/src/basics/config/ConfigurationFile.h index ecdebf04970d5598db434065b670e791b04b4d5e..6c651b7039d91c7312c4b98f32e1a97b8b6433de 100644 --- a/src/basics/config/ConfigurationFile.h +++ b/src/basics/config/ConfigurationFile.h @@ -10,7 +10,7 @@ #include <string> #include <fstream> #include <iostream> -#include <stdlib.h> +#include <cstdlib> #include <basics/utilities/UbException.h>