From d0983fb3f09fda9c6790662571c06a3add11f4d7 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Thu, 30 Jul 2020 07:20:43 -0700
Subject: [PATCH] Don't print to raw stderr in test

Avoids polluting the output of tests with Cargo's build output.
---
 tests/testsuite/build.rs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/testsuite/build.rs b/tests/testsuite/build.rs
index 9ee6c7e8d..3b2de0fef 100644
--- a/tests/testsuite/build.rs
+++ b/tests/testsuite/build.rs
@@ -1,14 +1,17 @@
 //! Tests for the `cargo build` command.
 
 use cargo::{
-    core::compiler::CompileMode, core::Workspace, ops::CompileOptions,
-    util::paths::dylib_path_envvar, Config,
+    core::compiler::CompileMode,
+    core::{Shell, Workspace},
+    ops::CompileOptions,
+    util::paths::dylib_path_envvar,
+    Config,
 };
 use cargo_test_support::paths::{root, CargoPathExt};
 use cargo_test_support::registry::Package;
 use cargo_test_support::{
     basic_bin_manifest, basic_lib_manifest, basic_manifest, is_nightly, lines_match, main_file,
-    project, rustc_host, sleep_ms, symlink_supported, t, Execs, ProjectBuilder,
+    paths, project, rustc_host, sleep_ms, symlink_supported, t, Execs, ProjectBuilder,
 };
 use std::env;
 use std::fs;
@@ -427,7 +430,8 @@ fn cargo_compile_api_exposes_artifact_paths() {
         .file("src/bin.rs", "pub fn main() {}")
         .build();
 
-    let config = Config::default().unwrap();
+    let shell = Shell::from_write(Box::new(Vec::new()));
+    let config = Config::new(shell, env::current_dir().unwrap(), paths::home());
     let ws = Workspace::new(&p.root().join("Cargo.toml"), &config).unwrap();
     let compile_options = CompileOptions::new(ws.config(), CompileMode::Build).unwrap();