From d265777d6a8a08af7492b9612c240700ec85ef58 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Mon, 7 Oct 2024 18:23:39 +0300 Subject: [PATCH 01/13] try adapt sonar coverage --- cmake/coverage.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/coverage.cmake b/cmake/coverage.cmake index 6393545a9..996885e06 100644 --- a/cmake/coverage.cmake +++ b/cmake/coverage.cmake @@ -4,14 +4,14 @@ if (NOT RPP_BUILD_TESTS_TOGETHER) message( FATAL_ERROR "Expected to set RPP_BUILD_TESTS_TOGETHER flag when build coverage via llvm cov") endif() -set(RPP_COVERAGE_TARGETS -instr-profile=${RPP_TEST_RESULTS_DIR}/results.profdata --object $ --object $ --object $) +set(RPP_COVERAGE_TARGETS -instr-profile=${RPP_TEST_RESULTS_DIR}/results.profdata -object $ -object $ -object $) add_custom_target( coverage - COMMAND llvm-profdata merge -sparse=true ${RPP_TEST_RESULTS_DIR}/test_rpp.profraw ${RPP_TEST_RESULTS_DIR}/test_rppqt.profraw ${RPP_TEST_RESULTS_DIR}/test_rppgrpc.profraw -o ${RPP_TEST_RESULTS_DIR}/results.profdata + COMMAND llvm-profdata merge -sparse=true *.profraw -o ${RPP_TEST_RESULTS_DIR}/results.profdata COMMAND llvm-cov report --ignore-filename-regex=build|tests ${RPP_COVERAGE_TARGETS} - COMMAND llvm-cov show --ignore-filename-regex=build|tests --show-branches=count --show-expansions --show-line-counts --show-line-counts-or-regions --show-regions ${RPP_COVERAGE_TARGETS} > ${RPP_TEST_RESULTS_DIR}/coverage.txt + COMMAND llvm-cov show --ignore-filename-regex=build --show-branches=count --show-expansions --show-line-counts --show-line-counts-or-regions --show-regions ${RPP_COVERAGE_TARGETS} > ${RPP_TEST_RESULTS_DIR}/coverage.txt COMMENT "Generating coverage report" VERBATIM ) From 4918759242adee95d520eefe8870b52a2d18cc8e Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Mon, 7 Oct 2024 20:51:19 +0300 Subject: [PATCH 02/13] Update coverage.cmake --- cmake/coverage.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/coverage.cmake b/cmake/coverage.cmake index 996885e06..79e041bad 100644 --- a/cmake/coverage.cmake +++ b/cmake/coverage.cmake @@ -8,7 +8,7 @@ set(RPP_COVERAGE_TARGETS -instr-profile=${RPP_TEST_RESULTS_DIR}/results.profdata add_custom_target( coverage - COMMAND llvm-profdata merge -sparse=true *.profraw -o ${RPP_TEST_RESULTS_DIR}/results.profdata + COMMAND llvm-profdata merge -sparse=true ${RPP_TEST_RESULTS_DIR}/*.profraw -o ${RPP_TEST_RESULTS_DIR}/results.profdata COMMAND llvm-cov report --ignore-filename-regex=build|tests ${RPP_COVERAGE_TARGETS} COMMAND llvm-cov show --ignore-filename-regex=build --show-branches=count --show-expansions --show-line-counts --show-line-counts-or-regions --show-regions ${RPP_COVERAGE_TARGETS} > ${RPP_TEST_RESULTS_DIR}/coverage.txt From 5108dab8f304ce9c43d7ea3464519ef161c4682d Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Mon, 7 Oct 2024 22:42:21 +0300 Subject: [PATCH 03/13] Update coverage.cmake --- cmake/coverage.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/coverage.cmake b/cmake/coverage.cmake index 79e041bad..14052fec8 100644 --- a/cmake/coverage.cmake +++ b/cmake/coverage.cmake @@ -8,7 +8,7 @@ set(RPP_COVERAGE_TARGETS -instr-profile=${RPP_TEST_RESULTS_DIR}/results.profdata add_custom_target( coverage - COMMAND llvm-profdata merge -sparse=true ${RPP_TEST_RESULTS_DIR}/*.profraw -o ${RPP_TEST_RESULTS_DIR}/results.profdata + COMMAND llvm-profdata merge ${RPP_TEST_RESULTS_DIR}/*.profraw -o ${RPP_TEST_RESULTS_DIR}/results.profdata COMMAND llvm-cov report --ignore-filename-regex=build|tests ${RPP_COVERAGE_TARGETS} COMMAND llvm-cov show --ignore-filename-regex=build --show-branches=count --show-expansions --show-line-counts --show-line-counts-or-regions --show-regions ${RPP_COVERAGE_TARGETS} > ${RPP_TEST_RESULTS_DIR}/coverage.txt From c813bf6fc875acf9080c5ffcff6b5d93e8101730 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Mon, 7 Oct 2024 22:42:35 +0300 Subject: [PATCH 04/13] Update coverage.cmake --- cmake/coverage.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/coverage.cmake b/cmake/coverage.cmake index 14052fec8..ac8d92c7e 100644 --- a/cmake/coverage.cmake +++ b/cmake/coverage.cmake @@ -8,7 +8,7 @@ set(RPP_COVERAGE_TARGETS -instr-profile=${RPP_TEST_RESULTS_DIR}/results.profdata add_custom_target( coverage - COMMAND llvm-profdata merge ${RPP_TEST_RESULTS_DIR}/*.profraw -o ${RPP_TEST_RESULTS_DIR}/results.profdata + COMMAND llvm-profdata merge -o ${RPP_TEST_RESULTS_DIR}/results.profdata ${RPP_TEST_RESULTS_DIR}/*.profraw COMMAND llvm-cov report --ignore-filename-regex=build|tests ${RPP_COVERAGE_TARGETS} COMMAND llvm-cov show --ignore-filename-regex=build --show-branches=count --show-expansions --show-line-counts --show-line-counts-or-regions --show-regions ${RPP_COVERAGE_TARGETS} > ${RPP_TEST_RESULTS_DIR}/coverage.txt From 3b6b2a8ffe69e8c75fda24c82f300ee248f8d54d Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Mon, 7 Oct 2024 23:03:50 +0300 Subject: [PATCH 05/13] fixes --- cmake/coverage.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cmake/coverage.cmake b/cmake/coverage.cmake index ac8d92c7e..95c3bef17 100644 --- a/cmake/coverage.cmake +++ b/cmake/coverage.cmake @@ -9,9 +9,7 @@ set(RPP_COVERAGE_TARGETS -instr-profile=${RPP_TEST_RESULTS_DIR}/results.profdata add_custom_target( coverage COMMAND llvm-profdata merge -o ${RPP_TEST_RESULTS_DIR}/results.profdata ${RPP_TEST_RESULTS_DIR}/*.profraw - - COMMAND llvm-cov report --ignore-filename-regex=build|tests ${RPP_COVERAGE_TARGETS} + COMMAND llvm-cov report --ignore-filename-regex=build ${RPP_COVERAGE_TARGETS} COMMAND llvm-cov show --ignore-filename-regex=build --show-branches=count --show-expansions --show-line-counts --show-line-counts-or-regions --show-regions ${RPP_COVERAGE_TARGETS} > ${RPP_TEST_RESULTS_DIR}/coverage.txt COMMENT "Generating coverage report" - VERBATIM ) From 7fbdf05c149aced761e5a879a05840d28c7541e3 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Mon, 7 Oct 2024 23:04:02 +0300 Subject: [PATCH 06/13] one mor --- CMakePresets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakePresets.json b/CMakePresets.json index 149c07bd4..6275e2630 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -178,7 +178,7 @@ "inherits": ["ci-build", "build-tests", "build-qt", "build-grpc", "build-asio", "ci-unix", "ci-clang"], "cacheVariables": { "RPP_ENABLE_COVERAGE": "ON", - "CMAKE_CXX_FLAGS": "-O0 -g -fprofile-instr-generate -fcoverage-mapping --coverage", + "CMAKE_CXX_FLAGS": "-O0 -g -fprofile-instr-generate -fcoverage-mapping", "RPP_BUILD_TESTS_TOGETHER" : true } }, From 32f5aca5bf81ad8fb7561b38c870a6a881177371 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Mon, 7 Oct 2024 23:24:44 +0300 Subject: [PATCH 07/13] update options --- cmake/coverage.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/coverage.cmake b/cmake/coverage.cmake index 95c3bef17..4986de04e 100644 --- a/cmake/coverage.cmake +++ b/cmake/coverage.cmake @@ -10,6 +10,6 @@ add_custom_target( coverage COMMAND llvm-profdata merge -o ${RPP_TEST_RESULTS_DIR}/results.profdata ${RPP_TEST_RESULTS_DIR}/*.profraw COMMAND llvm-cov report --ignore-filename-regex=build ${RPP_COVERAGE_TARGETS} - COMMAND llvm-cov show --ignore-filename-regex=build --show-branches=count --show-expansions --show-line-counts --show-line-counts-or-regions --show-regions ${RPP_COVERAGE_TARGETS} > ${RPP_TEST_RESULTS_DIR}/coverage.txt + COMMAND llvm-cov show --ignore-filename-regex=build --show-branches=count ${RPP_COVERAGE_TARGETS} > ${RPP_TEST_RESULTS_DIR}/coverage_old.txt COMMENT "Generating coverage report" ) From fa115e87309207d798c9c4c016e5e40ff627f1df Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Mon, 7 Oct 2024 23:59:09 +0300 Subject: [PATCH 08/13] fix --- cmake/coverage.cmake | 2 +- sonar-project.properties | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/coverage.cmake b/cmake/coverage.cmake index 4986de04e..769a3eb8f 100644 --- a/cmake/coverage.cmake +++ b/cmake/coverage.cmake @@ -10,6 +10,6 @@ add_custom_target( coverage COMMAND llvm-profdata merge -o ${RPP_TEST_RESULTS_DIR}/results.profdata ${RPP_TEST_RESULTS_DIR}/*.profraw COMMAND llvm-cov report --ignore-filename-regex=build ${RPP_COVERAGE_TARGETS} - COMMAND llvm-cov show --ignore-filename-regex=build --show-branches=count ${RPP_COVERAGE_TARGETS} > ${RPP_TEST_RESULTS_DIR}/coverage_old.txt + COMMAND llvm-cov show --ignore-filename-regex=build --show-branches=count ${RPP_COVERAGE_TARGETS} > ${RPP_TEST_RESULTS_DIR}/coverage.txt COMMENT "Generating coverage report" ) diff --git a/sonar-project.properties b/sonar-project.properties index 0a0f48854..e4be545db 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -10,3 +10,4 @@ sonar.cpd.exclusions=src/tests/**/* sonar.issue.ignore.allfile=a1 sonar.issue.ignore.allfile.a1.fileRegexp=#include.*doctest sonar.cfamily.compile-commands=build/compile_commands.json +sonar.tests=src/tests/**/* \ No newline at end of file From 8715c1ce2c8e2775f9910aaa1836e8eb340fb69c Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 20:58:56 +0000 Subject: [PATCH 09/13] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index e4be545db..e6a821e43 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -10,4 +10,4 @@ sonar.cpd.exclusions=src/tests/**/* sonar.issue.ignore.allfile=a1 sonar.issue.ignore.allfile.a1.fileRegexp=#include.*doctest sonar.cfamily.compile-commands=build/compile_commands.json -sonar.tests=src/tests/**/* \ No newline at end of file +sonar.tests=src/tests/**/* From a3ed8c104c6d1fda2ad11eff1b87ca8f2f36b8c1 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Tue, 8 Oct 2024 09:20:08 +0300 Subject: [PATCH 10/13] Update sonar-project.properties --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index e6a821e43..4580b0e36 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -10,4 +10,4 @@ sonar.cpd.exclusions=src/tests/**/* sonar.issue.ignore.allfile=a1 sonar.issue.ignore.allfile.a1.fileRegexp=#include.*doctest sonar.cfamily.compile-commands=build/compile_commands.json -sonar.tests=src/tests/**/* +sonar.tests=src/tests From 02b865882fcce824a0b8a29a436ca89330b51375 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Tue, 8 Oct 2024 12:59:37 +0300 Subject: [PATCH 11/13] Update sonar-project.properties --- sonar-project.properties | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sonar-project.properties b/sonar-project.properties index 4580b0e36..d5fbc84a2 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -3,10 +3,8 @@ sonar.organization=victimsnino sonar.projectName=ReactivePlusPlus # SQ standard properties -sonar.sources=src/rpp,src/tests,src/extensions +sonar.sources=src/rpp,src/extensions sonar.cfamily.llvm-cov.reportPath=build/test_results/coverage.txt -sonar.coverage.exclusions=src/tests/**/* -sonar.cpd.exclusions=src/tests/**/* sonar.issue.ignore.allfile=a1 sonar.issue.ignore.allfile.a1.fileRegexp=#include.*doctest sonar.cfamily.compile-commands=build/compile_commands.json From 03909726d422efc3c124dea640a298ecaaa1bf0b Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Tue, 8 Oct 2024 14:16:59 +0300 Subject: [PATCH 12/13] Update sonar-project.properties --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index d5fbc84a2..3373062d4 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -3,7 +3,7 @@ sonar.organization=victimsnino sonar.projectName=ReactivePlusPlus # SQ standard properties -sonar.sources=src/rpp,src/extensions +sonar.sources=src/rpp,src/extensions,src/tests sonar.cfamily.llvm-cov.reportPath=build/test_results/coverage.txt sonar.issue.ignore.allfile=a1 sonar.issue.ignore.allfile.a1.fileRegexp=#include.*doctest From f5837ea0443c5427859871b39cd99916b4d324f3 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Tue, 8 Oct 2024 15:24:03 +0300 Subject: [PATCH 13/13] Update sonar-project.properties --- sonar-project.properties | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sonar-project.properties b/sonar-project.properties index 3373062d4..0a0f48854 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -3,9 +3,10 @@ sonar.organization=victimsnino sonar.projectName=ReactivePlusPlus # SQ standard properties -sonar.sources=src/rpp,src/extensions,src/tests +sonar.sources=src/rpp,src/tests,src/extensions sonar.cfamily.llvm-cov.reportPath=build/test_results/coverage.txt +sonar.coverage.exclusions=src/tests/**/* +sonar.cpd.exclusions=src/tests/**/* sonar.issue.ignore.allfile=a1 sonar.issue.ignore.allfile.a1.fileRegexp=#include.*doctest sonar.cfamily.compile-commands=build/compile_commands.json -sonar.tests=src/tests