nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-24 21:53:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #117961 - Zalathar:suggest, r=Mark-Simulacrum

Browse Source 
Add `x suggest` entries for testing `mir-opt` and `coverage`

The `x suggest` subcommand uses git to find paths that have been modified, and uses those paths to suggest relevant test suites to run.

This PR adds suggestions for `x test mir-opt` and `x test coverage` .
This commit is contained in:
Takayuki Maeda 2023-11-19 04:14:41 +09:00 committed by GitHub
commit b82532765c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tools/suggest-tests/src/lib.rs
View File

@ -33,13 +33,15 @@ pub fn get_suggestions<T: AsRef<str>>(modified_files: &[T]) -> Vec<Suggestion> {
let mut suggestions = Vec::new();
// static suggestions
for sug in STATIC_SUGGESTIONS.iter() {
let glob = Pattern::new(&sug.0).expect("Found invalid glob pattern!");
for (globs, sugs) in STATIC_SUGGESTIONS.iter() {
let globs = globs
.iter()
.map(|glob| Pattern::new(glob).expect("Found invalid glob pattern!"))
.collect::<Vec<_>>();
let matches_some_glob = |file: &str| globs.iter().any(|glob| glob.matches(file));
for file in modified_files {
if glob.matches(file.as_ref()) {
suggestions.extend_from_slice(&sug.1);
}
if modified_files.iter().map(AsRef::as_ref).any(matches_some_glob) {
suggestions.extend_from_slice(sugs);
}
}

31
src/tools/suggest-tests/src/static_suggestions.rs
View File

@ -2,23 +2,34 @@ use crate::{sug, Suggestion};
// FIXME: perhaps this could use `std::lazy` when it is stablizied
macro_rules! static_suggestions {
($( $glob:expr => [ $( $suggestion:expr ),* ] ),*) => {
pub(crate) const STATIC_SUGGESTIONS: ::once_cell::unsync::Lazy<Vec<(&'static str, Vec<Suggestion>)>>
= ::once_cell::unsync::Lazy::new(|| vec![ $( ($glob, vec![ $($suggestion),* ]) ),*]);
($( [ $( $glob:expr ),* $(,)? ] => [ $( $suggestion:expr ),* $(,)? ] ),* $(,)? ) => {
pub(crate) const STATIC_SUGGESTIONS: ::once_cell::unsync::Lazy<Vec<(Vec<&'static str>, Vec<Suggestion>)>>
= ::once_cell::unsync::Lazy::new(|| vec![ $( (vec![ $($glob),* ], vec![ $($suggestion),* ]) ),*]);
}
}
static_suggestions! {
"*.md" => [
sug!("test", 0, ["linkchecker"])
["*.md"] => [
sug!("test", 0, ["linkchecker"]),
],
"compiler/*" => [
["compiler/*"] => [
sug!("check"),
sug!("test", 1, ["tests/ui", "tests/run-make"])
sug!("test", 1, ["tests/ui", "tests/run-make"]),
],
"src/librustdoc/*" => [
sug!("test", 1, ["rustdoc"])
]
["compiler/rustc_mir_transform/*"] => [
sug!("test", 1, ["mir-opt"]),
],
[
"compiler/rustc_mir_transform/src/coverage/*",
"compiler/rustc_codegen_llvm/src/coverageinfo/*",
] => [
sug!("test", 1, ["coverage"]),
],
["src/librustdoc/*"] => [
sug!("test", 1, ["rustdoc"]),
],
}