Skip to content
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

Rollup of 8 pull requests #128128

Merged
merged 17 commits into from
Jul 24, 2024
Merged

Rollup of 8 pull requests #128128

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c713caf
update tracking issue for `const_binary_heap_new_in`
Coekjan Jun 4, 2024
772315d
Remove generic lifetime parameter of trait `Pattern`
a1phyr Jul 8, 2024
b2e5cce
Docs for core::primitive: mention that "core" can be shadowed, too, s…
Jul 21, 2024
8c3ce60
Remove wrapper functions from c.rs
ChrisDenton Jul 23, 2024
1f59a80
Fix return type of FileAttr methods on AIX target
hallfox Jul 23, 2024
2f55ced
ensure std step before preparing sysroot
onur-ozkan Jul 23, 2024
0728c15
Allow to pass a full path for `run-make` tests
GuillaumeGomez Jul 23, 2024
b8f7ed2
library/core/src/primitive.rs: small doc fix
safinaskar Jul 23, 2024
557210c
Add elem_offset and related methods
wr7 Jun 14, 2024
0666eee
Rollup merge of #125962 - Coekjan:const-binary-heap, r=Amanieu
matthiaskrgr Jul 24, 2024
d6080a1
Rollup merge of #126770 - wr7:master, r=Amanieu
matthiaskrgr Jul 24, 2024
6f69625
Rollup merge of #127481 - a1phyr:pattern_gat, r=Amanieu
matthiaskrgr Jul 24, 2024
e56e886
Rollup merge of #128043 - safinaskar:primitive, r=workingjubilee
matthiaskrgr Jul 24, 2024
ee77dda
Rollup merge of #128092 - ChrisDenton:wrappers, r=workingjubilee
matthiaskrgr Jul 24, 2024
20e86c9
Rollup merge of #128100 - GuillaumeGomez:run-make-path, r=Kobzol,jiey…
matthiaskrgr Jul 24, 2024
8884228
Rollup merge of #128106 - hallfox:patch-1, r=ChrisDenton
matthiaskrgr Jul 24, 2024
1fe9726
Rollup merge of #128108 - onur-ozkan:ensure-std-for-precompiled-rustc…
matthiaskrgr Jul 24, 2024
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
Allow to pass a full path for run-make tests
  • Loading branch information
@GuillaumeGomez
GuillaumeGomez committed Jul 23, 2024
commit 0728c155a3141a96abf648306c7ad11e30a49d65
27 changes: 25 additions & 2 deletions src/tools/compiletest/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use build_helper::git::{get_git_modified_files, get_git_untracked_files};
use core::panic;
use getopts::Options;
use std::collections::HashSet;
use std::ffi::OsString;
use std::ffi::{OsStr, OsString};
use std::fs;
use std::io::{self, ErrorKind};
use std::path::{Path, PathBuf};
Expand Down Expand Up @@ -225,6 +225,29 @@ pub fn parse_config(args: Vec<String>) -> Config {
// Avoid spawning an external command when we know tidy won't be used.
false
};
let filters = if mode == Mode::RunMake {
matches
.free
.iter()
.map(|f| {
let path = Path::new(f);
let mut iter = path.iter().skip(1);

// We skip the test folder and check if the user passed `rmake.rs` or `Makefile`.
if iter
.next()
.is_some_and(|s| s == OsStr::new("rmake.rs") || s == OsStr::new("Makefile"))
&& iter.next().is_none()
{
path.parent().unwrap().to_str().unwrap().to_string()
} else {
f.to_string()
}
})
.collect::<Vec<_>>()
} else {
matches.free.clone()
};
Config {
bless: matches.opt_present("bless"),
compile_lib_path: make_absolute(opt_path(matches, "compile-lib-path")),
Expand All @@ -249,7 +272,7 @@ pub fn parse_config(args: Vec<String>) -> Config {
debugger: None,
run_ignored,
with_debug_assertions,
filters: matches.free.clone(),
filters,
skip: matches.opt_strs("skip"),
filter_exact: matches.opt_present("exact"),
force_pass_mode: matches.opt_str("pass").map(|mode| {
Expand Down
Loading