Auto merge of #2979 - jonathandturner:prepare_for_new_format, r=alexcrichton

bors · web-flow · commit 2d85908217f9 · 2016-08-09T09:25:54.000-07:00
Update cargo tests in prep for new errors This updates a couple tests so that we can upgrade rustc to new error format. r? @alexcrichton
diff --git a/tests/build-script.rs b/tests/build-script.rs
@@ -857,7 +857,6 @@ fn output_separate_lines() {
 [RUNNING] `[..]foo-[..]build-script-build[..]`
 [RUNNING] `rustc [..] --crate-name foo [..] -L foo -l static=foo`
 [ERROR] could not find native static library [..]
-[ERROR] Could not compile [..]
 "));
 }
 
@@ -886,7 +885,6 @@ fn output_separate_lines_new() {
 [RUNNING] `[..]foo-[..]build-script-build[..]`
 [RUNNING] `rustc [..] --crate-name foo [..] -L foo -l static=foo`
 [ERROR] could not find native static library [..]
-[ERROR] Could not compile [..]
 "));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -857,7 +857,6 @@ fn output_separate_lines() {`
`857`	`857`	[RUNNING] `[..]foo-[..]build-script-build[..]`
`858`	`858`	[RUNNING] `rustc [..] --crate-name foo [..] -L foo -l static=foo`
`859`	`859`	`[ERROR] could not find native static library [..]`
`860`		`-[ERROR] Could not compile [..]`
`861`	`860`	`"));`
`862`	`861`	`}`
`863`	`862`
`@@ -886,7 +885,6 @@ fn output_separate_lines_new() {`
`886`	`885`	[RUNNING] `[..]foo-[..]build-script-build[..]`
`887`	`886`	[RUNNING] `rustc [..] --crate-name foo [..] -L foo -l static=foo`
`888`	`887`	`[ERROR] could not find native static library [..]`
`889`		`-[ERROR] Could not compile [..]`
`890`	`888`	`"));`
`891`	`889`	`}`
`892`	`890`