Skip to content

Commit

Permalink
Auto merge of #8080 - RoccoDev:master, r=alexcrichton
Browse files Browse the repository at this point in the history
Compatibility for rust-lang/rust#69926

This adds compatibility for the rust-lang/rust#69926 PR, which makes it so a warning count is displayed when the build is done.
  • Loading branch information
bors committed Apr 7, 2020
2 parents 2f10a67 + 79c8ae8 commit 390e8f2
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions tests/testsuite/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3175,13 +3175,13 @@ fn compiler_json_error_format() {

// Use `jobs=1` to ensure that the order of messages is consistent.
p.cargo("build -v --message-format=json --jobs=1")
.with_json(&output("false"))
.with_json_contains_unordered(&output("false"))
.run();

// With fresh build, we should repeat the artifacts,
// and replay the cached compiler warnings.
p.cargo("build -v --message-format=json --jobs=1")
.with_json(&output("true"))
.with_json_contains_unordered(&output("true"))
.run();
}

Expand Down Expand Up @@ -3210,7 +3210,7 @@ fn message_format_json_forward_stderr() {
.build();

p.cargo("rustc --release --bin foo --message-format JSON")
.with_json(
.with_json_contains_unordered(
r#"
{
"reason":"compiler-message",
Expand Down

0 comments on commit 390e8f2

Please sign in to comment.