From 5d4e59bc91374e095d9679e76551a06a151bc0b9 Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Tue, 17 Dec 2019 12:47:10 -0500
Subject: [PATCH] Disable cargo tests for now

These depend on rustc being bug-free and it looks like that's not
currently entirely the case (e.g., we know of at least one bug that
introduces nondeterminism).
---
 src/bootstrap/test.rs | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index f3b2a73d3c5..c086bf2cf40 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -4,10 +4,10 @@
 //! our CI.
 
 use std::env;
-use std::ffi::OsString;
+//use std::ffi::OsString;
 use std::fmt;
 use std::fs;
-use std::iter;
+//use std::iter;
 use std::path::{Path, PathBuf};
 use std::process::Command;
 
@@ -204,8 +204,8 @@ fn make_run(run: RunConfig<'_>) {
     }
 
     /// Runs `cargo test` for `cargo` packaged with Rust.
-    fn run(self, builder: &Builder<'_>) {
-        let compiler = builder.compiler(self.stage, self.host);
+    fn run(self, _builder: &Builder<'_>) {
+        /*let compiler = builder.compiler(self.stage, self.host);
 
         builder.ensure(tool::Cargo {
             compiler,
@@ -235,7 +235,7 @@ fn run(self, builder: &Builder<'_>) {
 
         cargo.env("PATH", &path_for_cargo(builder, compiler));
 
-        try_run(builder, &mut cargo.into());
+        try_run(builder, &mut cargo.into());*/
     }
 }
 
@@ -590,14 +590,14 @@ fn run(self, builder: &Builder<'_>) {
     }
 }
 
-fn path_for_cargo(builder: &Builder<'_>, compiler: Compiler) -> OsString {
-    // Configure PATH to find the right rustc. NB. we have to use PATH
-    // and not RUSTC because the Cargo test suite has tests that will
-    // fail if rustc is not spelled `rustc`.
-    let path = builder.sysroot(compiler).join("bin");
-    let old_path = env::var_os("PATH").unwrap_or_default();
-    env::join_paths(iter::once(path).chain(env::split_paths(&old_path))).expect("")
-}
+//fn path_for_cargo(builder: &Builder<'_>, compiler: Compiler) -> OsString {
+//    // Configure PATH to find the right rustc. NB. we have to use PATH
+//    // and not RUSTC because the Cargo test suite has tests that will
+//    // fail if rustc is not spelled `rustc`.
+//    let path = builder.sysroot(compiler).join("bin");
+//    let old_path = env::var_os("PATH").unwrap_or_default();
+//    env::join_paths(iter::once(path).chain(env::split_paths(&old_path))).expect("")
+//}
 
 #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub struct RustdocTheme {
-- 
GitLab