Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[beta] Don't set MAKEFLAGS for build scripts #4276

Merged
merged 3 commits into from
Jul 13, 2017
Merged

[beta] Don't set MAKEFLAGS for build scripts #4276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad5a408
Don't set MAKEFLAGS for build scripts
alexcrichton Jul 12, 2017
5186849
assert_eq failure message now multi-line related to rust pull request…
gilescope Jun 16, 2017
931aec1
Let two further tests tolerate col info in panics
est31 Jul 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 3 additions & 5 deletions tests/bench.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down Expand Up @@ -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: [..]"));
}

Expand Down Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions tests/cargotest/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion tests/jobserver.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions tests/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down