Skip to content

Allow coverage tests to ignore test modes, and to enable color in coverage reports #119034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 4 commits into from
Jan 5, 2024
Merged

Allow coverage tests to ignore test modes, and to enable color in coverage reports #119034

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f9df1ad
Check for profiler support via a flag, instead of an environment var
Zalathar Oct 27, 2023
aa4bf0b
Allow tests to ignore individual test modes
Zalathar Nov 30, 2023
9ab8c63
Extract a `split_flags` helper in header directive parsing
Zalathar Jan 4, 2024
731ba80
Allow coverage tests to enable `llvm-cov --use-color`
Zalathar Dec 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Extract a split_flags helper in header directive parsing
  • Loading branch information
@Zalathar
Zalathar committed Jan 5, 2024
commit 9ab8c632ee2ede9a350104278864154d933ed1db
25 changes: 16 additions & 9 deletions src/tools/compiletest/src/header.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,16 +321,23 @@ impl TestProps {
|r| r,
);

if let Some(flags) = config.parse_name_value_directive(ln, COMPILE_FLAGS) {
self.compile_flags.extend(
flags
.split("'")
.enumerate()
.flat_map(|(i, f)| {
fn split_flags(flags: &str) -> Vec<String> {
// Individual flags can be single-quoted to preserve spaces; see
// <https://github.com/rust-lang/rust/pull/115948/commits/957c5db6>.
flags
.split("'")
.enumerate()
.flat_map(
|(i, f)| {
if i % 2 == 1 { vec![f] } else { f.split_whitespace().collect() }
})
.map(|s| s.to_owned()),
);
},
)
.map(move |s| s.to_owned())
.collect::<Vec<_>>()
}

if let Some(flags) = config.parse_name_value_directive(ln, COMPILE_FLAGS) {
self.compile_flags.extend(split_flags(&flags));
}
if config.parse_name_value_directive(ln, INCORRECT_COMPILER_FLAGS).is_some() {
panic!("`compiler-flags` directive should be spelled `compile-flags`");
Expand Down