Fix compiletest to not ignore additional errors.

Also fixes tests to pass.

Author: Nick Hamann

src/compiletest/runtest.rs

@@ -881,20 +881,28 @@ fn check_error_patterns(props: &TestProps,
     }
     let mut next_err_idx = 0;
     let mut next_err_pat = &props.error_patterns[next_err_idx];
-    let mut done = false;
-    for line in output_to_check.lines() {
+    let mut matched_all_patterns = false;
+    let mut lines = output_to_check.lines();
+    for line in &mut lines {
         if line.contains(next_err_pat) {
             debug!("found error pattern {}", next_err_pat);
             next_err_idx += 1;
             if next_err_idx == props.error_patterns.len() {
-                debug!("found all error patterns");
-                done = true;
+                matched_all_patterns = true;
                 break;
             }
             next_err_pat = &props.error_patterns[next_err_idx];
         }
     }
-    if done { return; }
+
+    if matched_all_patterns {
+        if lines.next().is_none() {
+            debug!("found all error patterns");
+            return;
+        } else {
+            fatal_proc_rec("no more error patterns to match against", proc_res);
+        }
+    }
 
     let missing_patterns = &props.error_patterns[next_err_idx..];
     if missing_patterns.len() == 1 {

src/test/compile-fail/issue-11154.rs

@@ -1,4 +1,4 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -11,5 +11,7 @@
 // compile-flags: -C lto -C prefer-dynamic
 
 // error-pattern: cannot prefer dynamic linking
+// error-pattern: only 'staticlib' and 'bin' outputs are supported with LTO
+// error-pattern: aborting due to previous error
 
 fn main() {}

src/test/compile-fail/unsupported-cast.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,12 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern:illegal cast
-
 #![feature(libc)]
 
 extern crate libc;
 
 fn main() {
-  println!("{:?}", 1.0 as *const libc::FILE); // Can't cast float to foreign.
+  println!("{:?}", 1.0 as *const libc::FILE); //~ ERROR illegal cast; cast through a usize first: `f64` as `*const libc::types::common::c95::FILE`
 }

src/test/compile-fail/use-meta-mismatch.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern:can't find crate for `extra`
-
-extern crate fake_crate as extra;
+extern crate fake_crate as extra; //~ ERROR can't find crate for `extra`
 
 fn main() { }

src/test/compile-fail/while-type-error.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,6 +8,4 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: mismatched types
-
-fn main() { while main { } }
+fn main() { while main { } } //~ ERROR mismatched types

src/test/compile-fail/wrong-ret-type.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,6 +8,5 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: mismatched types
-fn mk_int() -> usize { let i: isize = 3; return i; }
+fn mk_int() -> usize { let i: isize = 3; return i; } //~ ERROR mismatched types
 fn main() { }

src/test/run-fail/panic-task-name-none.rs

@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // error-pattern:thread '<unnamed>' panicked at 'test'
+// error-pattern:thread '<main>' panicked at 'assertion failed: r.is_ok()'
 
 use std::thread;
 

src/test/run-fail/panic-task-name-owned.rs

@@ -9,11 +9,12 @@
 // except according to those terms.
 
 // error-pattern:thread 'owned name' panicked at 'test'
+// error-pattern:thread '<main>' panicked at 'called `Result::unwrap()` on an `Err` value: Any'
 
 use std::thread::Builder;
 
 fn main() {
-    let r: () = Builder::new().name("owned name".to_string()).spawn(move|| {
+    let _r: () = Builder::new().name("owned name".to_string()).spawn(move|| {
         panic!("test");
         ()
     }).unwrap().join().unwrap();

src/test/run-fail/rt-set-exit-status-panic.rs

@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // error-pattern:whatever
+// error-pattern:thread '<main>' panicked at 'explicit panic'
 
 #![feature(exit_status, rustc_private)]
 

src/test/run-fail/rt-set-exit-status-panic2.rs

@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // error-pattern:whatever
+// error-pattern:thread '<main>' panicked at 'explicit panic'
 
 #![feature(exit_status, rustc_private)]