Skip to content

Commit f5597ff

Browse files
authored
Merge pull request #624 from folkertdev/run-asm-tests
fix backslashes in path used for `asm_tests`
2 parents 4380568 + 09d9076 commit f5597ff

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

build_system/src/test.rs

+10-9
Original file line numberDiff line numberDiff line change
@@ -542,20 +542,21 @@ fn asm_tests(env: &Env, args: &TestArg) -> Result<(), String> {
542542

543543
env.insert("COMPILETEST_FORCE_STAGE0".to_string(), "1".to_string());
544544

545-
let extra =
546-
if args.is_using_gcc_master_branch() { "" } else { " -Csymbol-mangling-version=v0" };
547-
548-
let rustc_args = &format!(
549-
r#"-Zpanic-abort-tests \
550-
-Zcodegen-backend="{pwd}/target/{channel}/librustc_codegen_gcc.{dylib_ext}" \
551-
--sysroot "{sysroot_dir}" -Cpanic=abort{extra}"#,
545+
let codegen_backend_path = format!(
546+
"{pwd}/target/{channel}/librustc_codegen_gcc.{dylib_ext}",
552547
pwd = std::env::current_dir()
553548
.map_err(|error| format!("`current_dir` failed: {:?}", error))?
554549
.display(),
555550
channel = args.config_info.channel.as_str(),
556551
dylib_ext = args.config_info.dylib_ext,
557-
sysroot_dir = args.config_info.sysroot_path,
558-
extra = extra,
552+
);
553+
554+
let extra =
555+
if args.is_using_gcc_master_branch() { "" } else { " -Csymbol-mangling-version=v0" };
556+
557+
let rustc_args = format!(
558+
"-Zpanic-abort-tests -Zcodegen-backend={codegen_backend_path} --sysroot {} -Cpanic=abort{extra}",
559+
args.config_info.sysroot_path
559560
);
560561

561562
run_command_with_env(

0 commit comments

Comments
 (0)