Skip to content
Merged
Changes from all commits
Commits
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
16 changes: 15 additions & 1 deletion src/bootstrap/src/core/build_steps/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2086,11 +2086,25 @@ HELP: You can add it into `bootstrap.toml` in `rust.codegen-backends = [{name:?}
}

// Get paths from cmd args
let paths = match &builder.config.cmd {
let mut paths = match &builder.config.cmd {
Subcommand::Test { .. } => &builder.config.paths[..],
_ => &[],
};

// in rustdoc-js mode, allow filters to be rs files or js files.
// use a late-initialized Vec to avoid cloning for other modes.
let mut paths_v;
if mode == "rustdoc-js" {
paths_v = paths.to_vec();
for p in &mut paths_v {
if let Some(ext) = p.extension()
&& ext == "js"
{
p.set_extension("rs");
}
}
paths = &paths_v;
}
// Get test-args by striping suite path
let mut test_args: Vec<&str> = paths
.iter()
Expand Down
Loading