From 467c98ac83962ffbde51649851b157f42f29a89d Mon Sep 17 00:00:00 2001 From: "Andrew V. Teylu" Date: Tue, 23 Apr 2024 10:14:59 +0100 Subject: [PATCH 1/3] Add support for MCDC coverage --- src/main.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main.rs b/src/main.rs index 44475e76..ff0d4a38 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1013,6 +1013,7 @@ impl Format { "-show-line-counts-or-regions", "-show-expansions", "-show-branches=count", + "-show-mcdc", &format!("-Xdemangler={}", cx.current_exe.display()), "-Xdemangler=llvm-cov", "-Xdemangler=demangle", From f2428c805f8d5228085b9ec966cdab145064673a Mon Sep 17 00:00:00 2001 From: "Andrew V. Teylu" Date: Tue, 23 Apr 2024 10:27:23 +0100 Subject: [PATCH 2/3] Add MCDC to dictionary --- .github/.cspell/project-dictionary.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/.cspell/project-dictionary.txt b/.github/.cspell/project-dictionary.txt index 3644ae06..c4b5c08f 100644 --- a/.github/.cspell/project-dictionary.txt +++ b/.github/.cspell/project-dictionary.txt @@ -8,6 +8,7 @@ fcoverage fprofile instrprof libhello +mcdc microkernel MSYSTEM nextest From 22cef8e2b565ab71f8bd6c804517ba21558da3cf Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Fri, 19 Jul 2024 01:08:37 +0900 Subject: [PATCH 3/3] check if -show-mcdc is available --- src/main.rs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index ff0d4a38..9ccf5201 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1013,7 +1013,16 @@ impl Format { "-show-line-counts-or-regions", "-show-expansions", "-show-branches=count", - "-show-mcdc", + ]); + if cmd!(&cx.llvm_cov, "show", "--help") + .read() + .unwrap_or_default() + .contains("-show-mcdc") + { + // -show-mcdc requires LLVM 18+ + cmd.arg("-show-mcdc"); + } + cmd.args([ &format!("-Xdemangler={}", cx.current_exe.display()), "-Xdemangler=llvm-cov", "-Xdemangler=demangle",