Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

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
Disarm drop bombs for unexecuted test Cargo commands
The code for running tests uses a custom command machinery because it streams the output of the command. We thus need to mark the command as executed in a dry run, to avoid a drop bomb panic.
  • Loading branch information
Kobzol committed Jul 12, 2024
commit 0cab9626f416f0f6bcf65221a3ed8ee38e69e97c
2 changes: 1 addition & 1 deletion src/bootstrap/src/utils/channel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ impl GitInfo {

// Ok, let's scrape some info
let ver_date = output(
&mut helpers::git(Some(dir))
helpers::git(Some(dir))
.arg("log")
.arg("-1")
.arg("--date=short")
Expand Down
1 change: 1 addition & 0 deletions src/bootstrap/src/utils/render_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ pub(crate) fn try_run_tests(
stream: bool,
) -> bool {
if builder.config.dry_run() {
cmd.mark_as_executed();
return true;
}

Expand Down