itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix random errors in test compiler_json_error_format.

Browse Source
This commit is contained in:
Eric Huss 2018-06-23 15:51:22 -07:00
parent e2348c2db2
commit ad3bab1fc4
1 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
tests/testsuite/build.rs
View File

@ -3996,13 +3996,32 @@ fn compiler_json_error_format() {
.file("bar/src/lib.rs", r#"fn dead() {}"#)
.build();
// Using jobs=1 to ensure that the order of messages is consistent.
assert_that(
p.cargo("build")
.arg("-v")
.arg("--message-format")
.arg("json"),
p.cargo("build -v --message-format=json --jobs=1"),
execs().with_status(0).with_json(
r#"
{
"reason":"compiler-artifact",
"package_id":"foo 0.5.0 ([..])",
"target":{
"kind":["custom-build"],
"crate_types":["bin"],
"name":"build-script-build",
"src_path":"[..]build.rs"
},
"profile": {
"debug_assertions": true,
"debuginfo": 2,
"opt_level": "0",
"overflow_checks": true,
"test": false
},
"features": [],
"filenames": "{...}",
"fresh": false
}
{
"reason":"compiler-message",
"package_id":"bar 0.5.0 ([..])",
@ -4036,27 +4055,6 @@ fn compiler_json_error_format() {
"fresh": false
}
{
"reason":"compiler-artifact",
"package_id":"foo 0.5.0 ([..])",
"target":{
"kind":["custom-build"],
"crate_types":["bin"],
"name":"build-script-build",
"src_path":"[..]build.rs"
},
"profile": {
"debug_assertions": true,
"debuginfo": 2,
"opt_level": "0",
"overflow_checks": true,
"test": false
},
"features": [],
"filenames": "{...}",
"fresh": false
}
{
"reason":"build-script-executed",
"package_id":"foo 0.5.0 ([..])",
@ -4105,10 +4103,7 @@ fn compiler_json_error_format() {
// With fresh build, we should repeat the artifacts,
// but omit compiler warnings.
assert_that(
p.cargo("build")
.arg("-v")
.arg("--message-format")
.arg("json"),
p.cargo("build -v --message-format=json --jobs=1"),
execs().with_status(0).with_json(
r#"
{