Skip to content

Commit 34bbd76

Browse files
committed
Fix coverage measurement using score_bazel_cpp_toolchains
1 parent dfe07a9 commit 34bbd76

3 files changed

Lines changed: 23 additions & 5 deletions

File tree

.bazelrc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,11 @@ coverage --features=coverage
5050
coverage --combined_report=lcov
5151
coverage --cache_test_results=no
5252
coverage --instrumentation_filter="^//score[/:]"
53+
54+
# Coverage configuration
55+
build:blcov-x86_64-linux --incompatible_strict_action_env
56+
build:blcov-x86_64-linux --platforms=@score_bazel_platforms//:x86_64-linux-gcc_12.2.0-posix
57+
build:blcov-x86_64-linux --extra_toolchains=@score_gcc_x86_64_toolchain//:x86_64-linux-gcc_12.2.0-posix
58+
test:blcov-x86_64-linux --build_tests_only
59+
test:blcov-x86_64-linux --test_tag_filters=-manual
60+
test:blcov-x86_64-linux --test_output=errors

.github/workflows/coverage_report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323

2424
jobs:
2525
coverage-report:
26-
runs-on: ubuntu-latest
26+
runs-on: ubuntu-22.04
2727

2828
permissions:
2929
contents: read
@@ -46,7 +46,7 @@ jobs:
4646

4747
- name: Run Bazel Coverage
4848
run: |
49-
bazel coverage -- //score/...
49+
bazel coverage --config=blcov-x86_64-linux -- //score/... //tests/...
5050
- name: Generate HTML Coverage Report
5151
run: |
5252
genhtml "$(bazel info output_path)/_coverage/_coverage_report.dat" \

MODULE.bazel

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ bazel_dep(name = "buildifier_prebuilt", version = "7.3.1")
2626
bazel_dep(name = "platforms", version = "1.0.0")
2727

2828
# S-CORE process rules
29-
bazel_dep(name = "score_bazel_platforms", version = "0.0.3")
29+
bazel_dep(name = "score_bazel_platforms", version = "0.0.4")
3030
bazel_dep(name = "score_docs_as_code", version = "2.2.0")
3131
bazel_dep(name = "score_tooling", version = "1.0.4")
3232
bazel_dep(name = "score_rust_policies", version = "0.0.3")
@@ -35,6 +35,7 @@ bazel_dep(name = "score_process", version = "1.4.0", dev_dependency = True)
3535
bazel_dep(name = "score_platform", version = "0.5.1", dev_dependency = True) # This is main score repo
3636

3737
# Toolchains and extensions
38+
bazel_dep(name = "score_bazel_cpp_toolchains", version = "0.2.0", dev_dependency = True)
3839
bazel_dep(name = "score_toolchains_gcc", version = "0.5", dev_dependency = True)
3940
bazel_dep(name = "score_toolchains_qnx", version = "0.0.6", dev_dependency = True)
4041
bazel_dep(name = "rust_qnx8_toolchain", version = "1.2.0", dev_dependency = True)
@@ -66,12 +67,23 @@ archive_override(
6667

6768
# Extensions
6869

70+
gcc_cpp = use_extension("@score_bazel_cpp_toolchains//extensions:gcc.bzl", "gcc", dev_dependency = True)
71+
gcc_cpp.toolchain(
72+
name = "score_gcc_x86_64_toolchain",
73+
target_cpu = "x86_64",
74+
target_os = "linux",
75+
use_default_package = True,
76+
version = "12.2.0",
77+
)
78+
use_repo(gcc_cpp, "score_gcc_x86_64_toolchain")
79+
6980
gcc = use_extension("@score_toolchains_gcc//extentions:gcc.bzl", "gcc", dev_dependency = True)
7081
gcc.toolchain(
7182
sha256 = "457f5f20f57528033cb840d708b507050d711ae93e009388847e113b11bf3600",
7283
strip_prefix = "x86_64-unknown-linux-gnu",
7384
url = "https://github.com/eclipse-score/toolchains_gcc_packages/releases/download/0.0.1/x86_64-unknown-linux-gnu_gcc12.tar.gz",
7485
)
86+
use_repo(gcc, "gcc_toolchain", "gcc_toolchain_gcc")
7587

7688
# TRLC dependency for requirements traceability
7789
bazel_dep(name = "trlc", version = "0.0.0", dev_dependency = True)
@@ -81,8 +93,6 @@ git_override(
8193
remote = "https://github.com/bmw-software-engineering/trlc.git",
8294
)
8395

84-
use_repo(gcc, "gcc_toolchain", "gcc_toolchain_gcc")
85-
8696
toolchains_qnx = use_extension("@score_toolchains_qnx//:extensions.bzl", "toolchains_qnx", dev_dependency = True)
8797
toolchains_qnx.sdp(
8898
sha256 = "f2e0cb21c6baddbcb65f6a70610ce498e7685de8ea2e0f1648f01b327f6bac63",

0 commit comments

Comments
 (0)