Move more code between the run_binary condition since it's only needed in this case

Author: GuillaumeGomez

tests/compile/simd-ffi.rs

@@ -5,6 +5,7 @@
 
 #![allow(internal_features, non_camel_case_types)]
 #![crate_type = "lib"]
+
 // we can compile to a variety of platforms, because we don't need
 // cross-compiled standard libraries.
 #![feature(no_core, auto_traits)]

tests/lang_tests.rs

@@ -23,25 +23,28 @@ fn compile_and_run_cmds(
         env_path = format!("/opt/m68k-unknown-linux-gnu/bin:{}", env_path);
         compiler.env("PATH", env_path);
 
-        let vm_parent_dir = std::env::var("CG_GCC_VM_DIR")
-            .map(PathBuf::from)
-            .unwrap_or_else(|_| std::env::current_dir().unwrap());
-        let vm_dir = "vm";
-        let exe_filename = exe.file_name().unwrap();
-        let vm_home_dir = vm_parent_dir.join(vm_dir).join("home");
-        let vm_exe_path = vm_home_dir.join(exe_filename);
-        // FIXME(antoyo): panicking here makes the test pass.
-        let inside_vm_exe_path = PathBuf::from("/home").join(exe_filename);
-        let mut copy = Command::new("sudo");
-        copy.arg("cp");
-        copy.args([exe, &vm_exe_path]);
-
-        let mut commands = vec![("Compiler", compiler), ("Copy", copy)];
+        let mut commands = vec![("Compiler", compiler)];
         if run_binary {
+            let vm_parent_dir = std::env::var("CG_GCC_VM_DIR")
+                .map(PathBuf::from)
+                .unwrap_or_else(|_| std::env::current_dir().unwrap());
+            let vm_dir = "vm";
+            let exe_filename = exe.file_name().unwrap();
+            let vm_home_dir = vm_parent_dir.join(vm_dir).join("home");
+            let vm_exe_path = vm_home_dir.join(exe_filename);
+            // FIXME(antoyo): panicking here makes the test pass.
+            let inside_vm_exe_path = PathBuf::from("/home").join(exe_filename);
+
+            let mut copy = Command::new("sudo");
+            copy.arg("cp");
+            copy.args([exe, &vm_exe_path]);
+
             let mut runtime = Command::new("sudo");
             runtime.args(["chroot", vm_dir, "qemu-m68k-static"]);
             runtime.arg(inside_vm_exe_path);
             runtime.current_dir(vm_parent_dir);
+
+            commands.push(("Copy", copy));
             commands.push(("Run-time", runtime));
         }
         commands