Move test env var to test_runner

Author: pvdrz

src/bin/miri-rustc-tests.rs

@@ -66,7 +66,6 @@ impl rustc_driver::Callbacks for MiriCompilerCalls {
                 }
                 tcx.hir().krate().visit_all_item_likes(&mut Visitor(tcx));
             } else if let Some((entry_def_id, _)) = tcx.entry_fn(LOCAL_CRATE) {
-
                 let config = MiriConfig {
                     validate: true,
                     communicate: false,

tests/compiletest.rs

@@ -37,9 +37,6 @@ fn run_tests(mode: &str, path: &str, target: &str, mut flags: Vec<String>) {
         flags.push(format!("--sysroot {}", sysroot));
     }
 
-    // Add a test env var to do environment communication tests
-    std::env::set_var("MIRI_ENV_VAR_TEST", "0");
-
     // The rest of the configuration.
     let mut config = compiletest::Config::default().tempdir();
     config.mode = mode.parse().expect("Invalid mode");
@@ -126,6 +123,9 @@ fn compile_fail_miri(opt: bool) {
 }
 
 fn test_runner(_tests: &[&()]) {
+    // Add a test env var to do environment communication tests
+    std::env::set_var("MIRI_ENV_VAR_TEST", "0");
+
     run_pass_miri(false);
     run_pass_miri(true);