bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rename ./x test's --rustc-args to --compiletest-rustc-args

Browse source
This commit is contained in:
Rémy Rakic 2024-08-12 15:11:25 +00:00
parent 0ad798aec7
commit 5e872568a8
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_codegen_gcc/build_system/src/test.rs
View file

@ -552,7 +552,7 @@ fn asm_tests(env: &Env, args: &TestArg) -> Result<(), String> {
&"--stage", &"--stage",
&"0", &"0",
&"tests/assembly/asm", &"tests/assembly/asm",
&"--rustc-args", &"--compiletest-rustc-args",
&rustc_args, &rustc_args,
], ],
Some(&rust_dir), Some(&rust_dir),
@ -1020,7 +1020,7 @@ where
&"--stage", &"--stage",
&"0", &"0",
&format!("tests/{}", test_type), &format!("tests/{}", test_type),
&"--rustc-args", &"--compiletest-rustc-args",
&rustc_args, &rustc_args,
], ],
Some(&rust_path), Some(&rust_path),

2
src/bootstrap/src/core/build_steps/test.rs
View file

@ -1815,7 +1815,7 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
let mut flags = if is_rustdoc { Vec::new() } else { vec!["-Crpath".to_string()] }; let mut flags = if is_rustdoc { Vec::new() } else { vec!["-Crpath".to_string()] };
flags.push(format!("-Cdebuginfo={}", builder.config.rust_debuginfo_level_tests)); flags.push(format!("-Cdebuginfo={}", builder.config.rust_debuginfo_level_tests));
flags.extend(builder.config.cmd.rustc_args().iter().map(|s| s.to_string())); flags.extend(builder.config.cmd.compiletest_rustc_args().iter().map(|s| s.to_string()));
if suite != "mir-opt" { if suite != "mir-opt" {
if let Some(linker) = builder.linker(target) { if let Some(linker) = builder.linker(target) {

4
src/bootstrap/src/core/builder/tests.rs
View file

@ -632,7 +632,7 @@ mod dist {
config.paths = vec!["library/std".into()]; config.paths = vec!["library/std".into()];
config.cmd = Subcommand::Test { config.cmd = Subcommand::Test {
test_args: vec![], test_args: vec![],
rustc_args: vec![], compiletest_rustc_args: vec![],
no_fail_fast: false, no_fail_fast: false,
no_doc: true, no_doc: true,
doc: false, doc: false,
@ -703,7 +703,7 @@ mod dist {
let mut config = configure(&["A-A"], &["A-A"]); let mut config = configure(&["A-A"], &["A-A"]);
config.cmd = Subcommand::Test { config.cmd = Subcommand::Test {
test_args: vec![], test_args: vec![],
rustc_args: vec![], compiletest_rustc_args: vec![],
no_fail_fast: false, no_fail_fast: false,
doc: true, doc: true,
no_doc: false, no_doc: false,

8
src/bootstrap/src/core/config/flags.rs
View file

@ -349,7 +349,7 @@ pub enum Subcommand {
test_args: Vec<String>, test_args: Vec<String>,
/// extra options to pass the compiler when running compiletest tests /// extra options to pass the compiler when running compiletest tests
#[arg(long, value_name = "ARGS", allow_hyphen_values(true))] #[arg(long, value_name = "ARGS", allow_hyphen_values(true))]
rustc_args: Vec<String>, compiletest_rustc_args: Vec<String>,
#[arg(long)] #[arg(long)]
/// do not run doc tests /// do not run doc tests
no_doc: bool, no_doc: bool,
@ -496,10 +496,10 @@ impl Subcommand {
} }
} }
pub fn rustc_args(&self) -> Vec<&str> { pub fn compiletest_rustc_args(&self) -> Vec<&str> {
match *self { match *self {
Subcommand::Test { ref rustc_args, .. } => { Subcommand::Test { ref compiletest_rustc_args, .. } => {
rustc_args.iter().flat_map(|s| s.split_whitespace()).collect() compiletest_rustc_args.iter().flat_map(|s| s.split_whitespace()).collect()
} }
_ => vec![], _ => vec![],
} }