Skip to content

Commit f5488f0

Browse files
committed
compiletest/rmake: rename cmd to rustc
1 parent cf5edfe commit f5488f0

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
@@ -3609,8 +3609,9 @@ impl<'test> TestCx<'test> {
36093609

36103610
// FIXME(jieyouxu): explain what the hecc we are doing here.
36113611
// FIXME(jieyouxu): audit these env vars. some of them only makes sense for make, not rustc!
3612-
let mut cmd = Command::new(&self.config.rustc_path);
3613-
cmd.arg("-o")
3612+
let mut rustc = Command::new(&self.config.rustc_path);
3613+
rustc
3614+
.arg("-o")
36143615
.arg(&recipe_bin)
36153616
.arg(format!("-Ldependency={}", &support_lib_path.parent().unwrap().to_string_lossy()))
36163617
.arg(format!("-Ldependency={}", &support_lib_deps.to_string_lossy()))
@@ -3631,7 +3632,7 @@ impl<'test> TestCx<'test> {
36313632

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

36363637
// FIXME(jieyouxu): explain this!
36373638
if std::env::var_os("COMPILETEST_FORCE_STAGE0").is_some() {
@@ -3640,10 +3641,10 @@ impl<'test> TestCx<'test> {
36403641
debug!(?stage0_sysroot);
36413642
debug!(exists = stage0_sysroot.exists());
36423643

3643-
cmd.arg("--sysroot").arg(&stage0_sysroot);
3644+
rustc.arg("--sysroot").arg(&stage0_sysroot);
36443645
}
36453646

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

0 commit comments

Comments
 (0)