diff options
| author | Dominik Holland <dominik.holland@qt.io> | 2024-03-06 19:49:12 +0100 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@qt.io> | 2024-03-07 09:27:59 +0100 |
| commit | 64f0e8e0340dc94754de7200035a3c947a3f7f7a (patch) | |
| tree | a2ab1d85d3b0b7b3c19cd05c08a2f358f1d8239a | |
| parent | 23b39347af03a40af4d19be9793f0f93a691a78f (diff) | |
Improve the code-coverage setup
Instead of making a standalone_test build and referencing the
build folder from there, we do the test build together with
the module build and run it like on a developer machine.
This makes the whole report more reliable and fixes some
areas which were marked as not tested at all.
Change-Id: Ifa646ebc613e35bb8aa2dc6e1c1df5c57191c180
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| -rw-r--r-- | coin/instructions/cmake_module_lcov_code_coverage.yaml | 4 | ||||
| -rw-r--r-- | coin/module_config.yaml | 10 |
2 files changed, 2 insertions, 12 deletions
diff --git a/coin/instructions/cmake_module_lcov_code_coverage.yaml b/coin/instructions/cmake_module_lcov_code_coverage.yaml index 1b86e123..9b6d75df 100644 --- a/coin/instructions/cmake_module_lcov_code_coverage.yaml +++ b/coin/instructions/cmake_module_lcov_code_coverage.yaml @@ -2,7 +2,7 @@ type: Group instructions: - !include "{{qt/qtbase}}/coin_module_test_template_common.yaml" - type: ChangeDirectory - directory: "{{.SourceDir}}_standalone_tests" + directory: "{{.SourceDir}}_build" - type: EnvironmentVariable variableName: CMAKE_BUILD_TIMEOUT variableValue: "6000" @@ -42,4 +42,4 @@ instructions: - type: ScheduleUploadTestResults - type: EnvironmentVariable variableName: COIN_CTEST_RESULTSDIR - variableValue: "{{.SourceDir}}_standalone_tests/upload" + variableValue: "{{.SourceDir}}_build/upload" diff --git a/coin/module_config.yaml b/coin/module_config.yaml index f2aed118..8fef75a6 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -35,13 +35,6 @@ instructions: condition: property property: features contains_value: lcov - - type: AppendToEnvironmentVariable - variableName: COMMON_TEST_CMAKE_ARGS - variableValue: " -DAM_COVERAGE=ON" - enable_if: - condition: property - property: features - contains_value: lcov - type: Rename sourcePath: "{{.SourceDir}}/coin/axivion/ci_config_common.json" targetPath: "{{.Env.HOME}}/axivion/ci_config_common.json" @@ -80,6 +73,3 @@ instructions: - condition: property property: target.os in_values: ["IOS", "Android", "WebAssembly", "QNX"] - - condition: property - property: features - contains_value: lcov |