Skip to content

Commit 13c6fe3

Browse files
committed
compiletest/rmake: rename cmd to rustc
1 parent ff0bf7f commit 13c6fe3

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

src/tools/compiletest/src/runtest.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3611,8 +3611,9 @@ impl<'test> TestCx<'test> {
36113611

36123612
// FIXME(jieyouxu): explain what the hecc we are doing here.
36133613
// FIXME(jieyouxu): audit these env vars. some of them only makes sense for make, not rustc!
3614-
let mut cmd = Command::new(&self.config.rustc_path);
3615-
cmd.arg("-o")
3614+
let mut rustc = Command::new(&self.config.rustc_path);
3615+
rustc
3616+
.arg("-o")
36163617
.arg(&recipe_bin)
36173618
.arg(format!("-Ldependency={}", &support_lib_path.parent().unwrap().to_string_lossy()))
36183619
.arg(format!("-Ldependency={}", &support_lib_deps.to_string_lossy()))
@@ -3633,7 +3634,7 @@ impl<'test> TestCx<'test> {
36333634

36343635
// In test code we want to be very pedantic about values being silently discarded that are
36353636
// annotated with `#[must_use]`.
3636-
cmd.arg("-Dunused_must_use");
3637+
rustc.arg("-Dunused_must_use");
36373638

36383639
// FIXME(jieyouxu): explain this!
36393640
if std::env::var_os("COMPILETEST_FORCE_STAGE0").is_some() {
@@ -3642,10 +3643,10 @@ impl<'test> TestCx<'test> {
36423643
debug!(?stage0_sysroot);
36433644
debug!(exists = stage0_sysroot.exists());
36443645

3645-
cmd.arg("--sysroot").arg(&stage0_sysroot);
3646+
rustc.arg("--sysroot").arg(&stage0_sysroot);
36463647
}
36473648

3648-
let res = self.run_command_to_procres(&mut cmd);
3649+
let res = self.run_command_to_procres(&mut rustc);
36493650
if !res.status.success() {
36503651
self.fatal_proc_rec("run-make test failed: could not build `rmake.rs` recipe", &res);
36513652
}

0 commit comments

Comments
 (0)