Auto merge of #140015 - GuillaumeGomez:subtree-update_cg_gcc_2025-04-… · rust-lang/rust@2ef7858 (original) (raw)

`@@ -529,20 +529,21 @@ fn asm_tests(env: &Env, args: &TestArg) -> Result<(), String> {

`

529

529

``

530

530

` env.insert("COMPILETEST_FORCE_STAGE0".to_string(), "1".to_string());

`

531

531

``

532

``

`-

let extra =

`

533

``

`-

if args.is_using_gcc_master_branch() { "" } else { " -Csymbol-mangling-version=v0" };

`

534

``

-

535

``

`-

let rustc_args = &format!(

`

536

``

`-

r#"-Zpanic-abort-tests \

`

537

``

`-

-Zcodegen-backend="{pwd}/target/{channel}/librustc_codegen_gcc.{dylib_ext}" \

`

538

``

`-

--sysroot "{sysroot_dir}" -Cpanic=abort{extra}"#,

`

``

532

`+

let codegen_backend_path = format!(

`

``

533

`+

"{pwd}/target/{channel}/librustc_codegen_gcc.{dylib_ext}",

`

539

534

` pwd = std::env::current_dir()

`

540

535

`` .map_err(|error| format!("current_dir failed: {:?}", error))?

``

541

536

`.display(),

`

542

537

` channel = args.config_info.channel.as_str(),

`

543

538

` dylib_ext = args.config_info.dylib_ext,

`

544

``

`-

sysroot_dir = args.config_info.sysroot_path,

`

545

``

`-

extra = extra,

`

``

539

`+

);

`

``

540

+

``

541

`+

let extra =

`

``

542

`+

if args.is_using_gcc_master_branch() { "" } else { " -Csymbol-mangling-version=v0" };

`

``

543

+

``

544

`+

let rustc_args = format!(

`

``

545

`+

"-Zpanic-abort-tests -Zcodegen-backend={codegen_backend_path} --sysroot {} -Cpanic=abort{extra}",

`

``

546

`+

args.config_info.sysroot_path

`

546

547

`);

`

547

548

``

548

549

`run_command_with_env(

`

`@@ -677,7 +678,7 @@ fn test_projects(env: &Env, args: &TestArg) -> Result<(), String> {

`

677

678

`fn test_libcore(env: &Env, args: &TestArg) -> Result<(), String> {

`

678

679

`// FIXME: create a function "display_if_not_quiet" or something along the line.

`

679

680

`println!("[TEST] libcore");

`

680

``

`-

let path = get_sysroot_dir().join("sysroot_src/library/core/tests");

`

``

681

`+

let path = get_sysroot_dir().join("sysroot_src/library/coretests");

`

681

682

`let _ = remove_dir_all(path.join("target"));

`

682

683

`run_cargo_command(&[&"test"], Some(&path), env, args)?;

`

683

684

`Ok(())

`