-
Notifications
You must be signed in to change notification settings - Fork 12.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of #106249 - Ezrashaw:suggest-test-tool, r=jyn514,albert…
…larsan68 Create "suggested tests" tool in `rustbuild` Not the claimed person in #97339 but: I've done a very rough implementation of this feature in-tree. I'm very new to `rustc` development (outside of docs) so some help would be greatly appreciated. The UI of this new subcommand obviously will change and I need some mentoring with the `--run` flag. r? ```@jyn514```
- Loading branch information
Showing
15 changed files
with
385 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| #![cfg_attr(feature = "build-metrics", allow(unused))] | ||
|
|
||
| use std::str::FromStr; | ||
|
|
||
| use std::path::PathBuf; | ||
|
|
||
| use crate::{ | ||
| builder::{Builder, Kind}, | ||
| tool::Tool, | ||
| }; | ||
|
|
||
| #[cfg(feature = "build-metrics")] | ||
| pub fn suggest(builder: &Builder<'_>, run: bool) { | ||
| panic!("`x suggest` is not supported with `build-metrics`") | ||
| } | ||
|
|
||
| /// Suggests a list of possible `x.py` commands to run based on modified files in branch. | ||
| #[cfg(not(feature = "build-metrics"))] | ||
| pub fn suggest(builder: &Builder<'_>, run: bool) { | ||
| let suggestions = | ||
| builder.tool_cmd(Tool::SuggestTests).output().expect("failed to run `suggest-tests` tool"); | ||
|
|
||
| if !suggestions.status.success() { | ||
| println!("failed to run `suggest-tests` tool ({})", suggestions.status); | ||
| println!( | ||
| "`suggest_tests` stdout:\n{}`suggest_tests` stderr:\n{}", | ||
| String::from_utf8(suggestions.stdout).unwrap(), | ||
| String::from_utf8(suggestions.stderr).unwrap() | ||
| ); | ||
| panic!("failed to run `suggest-tests`"); | ||
| } | ||
|
|
||
| let suggestions = String::from_utf8(suggestions.stdout).unwrap(); | ||
| let suggestions = suggestions | ||
| .lines() | ||
| .map(|line| { | ||
| let mut sections = line.split_ascii_whitespace(); | ||
|
|
||
| // this code expects one suggestion per line in the following format: | ||
| // <x_subcommand> {some number of flags} [optional stage number] | ||
| let cmd = sections.next().unwrap(); | ||
| let stage = sections.next_back().map(|s| str::parse(s).ok()).flatten(); | ||
| let paths: Vec<PathBuf> = sections.map(|p| PathBuf::from_str(p).unwrap()).collect(); | ||
|
|
||
| (cmd, stage, paths) | ||
| }) | ||
| .collect::<Vec<_>>(); | ||
|
|
||
| if !suggestions.is_empty() { | ||
| println!("==== SUGGESTIONS ===="); | ||
| for sug in &suggestions { | ||
| print!("x {} ", sug.0); | ||
| if let Some(stage) = sug.1 { | ||
| print!("--stage {stage} "); | ||
| } | ||
|
|
||
| for path in &sug.2 { | ||
| print!("{} ", path.display()); | ||
| } | ||
| println!(); | ||
| } | ||
| println!("====================="); | ||
| } else { | ||
| println!("No suggestions found!"); | ||
| return; | ||
| } | ||
|
|
||
| if run { | ||
| for sug in suggestions { | ||
| let mut build = builder.build.clone(); | ||
|
|
||
| let builder = | ||
| Builder::new_standalone(&mut build, Kind::parse(&sug.0).unwrap(), sug.2, sug.1); | ||
|
|
||
| builder.execute_cli() | ||
| } | ||
| } else { | ||
| println!("help: consider using the `--run` flag to automatically run suggested tests"); | ||
| } | ||
| } |
Oops, something went wrong.