Auto merge of #4276 - alexcrichton:revert2, r=alexcrichton

[beta] Don't set MAKEFLAGS for build scripts

Closes #4156
Closes rust-lang/rust#42635

Cargo.toml

@@ -29,7 +29,7 @@ fs2 = "0.4"
 git2 = "0.6"
 git2-curl = "0.7"
 glob = "0.2"
-jobserver = "0.1.4"
+jobserver = "0.1.6"
 libc = "0.2"
 libgit2-sys = "0.6"
 log = "0.3"

tests/bench.rs

@@ -241,11 +241,9 @@ fn cargo_bench_failing_test() {
 [COMPILING] foo v0.5.0 ({})
 [FINISHED] release [optimized] target(s) in [..]
 [RUNNING] target[/]release[/]deps[/]foo-[..][EXE]
-thread '[..]' panicked at 'assertion failed: \
-    `(left == right)`[..]", p.url()))
+thread '[..]' panicked at 'assertion failed: `(left == right)`[..]", p.url()))
                        .with_stderr_contains("[..]left: `\"hello\"`[..]")
                        .with_stderr_contains("[..]right: `\"nope\"`[..]")
-                       .with_stderr_contains("[..]src[/]foo.rs:14")
                        .with_status(101));
 }
 
@@ -295,7 +293,7 @@ fn bench_with_lib_dep() {
 [FINISHED] release [optimized] target(s) in [..]
 [RUNNING] target[/]release[/]deps[/]foo-[..][EXE]
 [RUNNING] target[/]release[/]deps[/]baz-[..][EXE]", p.url()))
-                       .with_stdout_contains("test lib_bench ... bench: [..]")                     
+                       .with_stdout_contains("test lib_bench ... bench: [..]")
                        .with_stdout_contains("test bin_bench ... bench: [..]"));
 }
 
@@ -695,7 +693,7 @@ fn bench_dylib() {
 [RUNNING] `[..]target[/]release[/]deps[/]foo-[..][EXE] --bench`
 [RUNNING] `[..]target[/]release[/]deps[/]bench-[..][EXE] --bench`", dir = p.url()))
                        .with_stdout_contains_n("test foo ... bench: [..]", 2));
-    
+
     p.root().move_into_the_past();
     assert_that(p.cargo("bench").arg("-v"),
                 execs().with_status(0)

tests/cargotest/lib.rs

@@ -62,6 +62,7 @@ fn _process(t: &OsStr) -> cargo::util::ProcessBuilder {
      .env_remove("EMAIL")
      .env_remove("MFLAGS")
      .env_remove("MAKEFLAGS")
+     .env_remove("CARGO_MAKEFLAGS")
      .env_remove("GIT_AUTHOR_NAME")
      .env_remove("GIT_AUTHOR_EMAIL")
      .env_remove("GIT_COMMITTER_NAME")

tests/jobserver.rs

@@ -23,7 +23,7 @@ fn jobserver_exists() {
             use std::env;
 
             fn main() {
-                let var = env::var("MAKEFLAGS").unwrap();
+                let var = env::var("CARGO_MAKEFLAGS").unwrap();
                 let arg = var.split(' ')
                              .find(|p| p.starts_with("--jobserver"))
                              .unwrap();

tests/test.rs

@@ -263,7 +263,7 @@ failures:
 
 ---- test_hello stdout ----
 <tab>thread 'test_hello' panicked at 'assertion failed: false', \
-      tests[/]footest.rs:4
+      tests[/]footest.rs:4[..]
 ")
                        .with_stdout_contains("\
 failures:
@@ -295,7 +295,7 @@ failures:
 
 ---- test_hello stdout ----
 <tab>thread 'test_hello' panicked at 'assertion failed: false', \
-      src[/]lib.rs:4
+      src[/]lib.rs:4[..]
 ")
                        .with_stdout_contains("\
 failures: