9 files changed, 23 insertions, 61 deletions
diff --git a/src/test/compile-fail/borrowck-call-sendfn.rs b/src/test/compile-fail/borrowck-call-sendfn.rs
index 00e8a12d572..57c0deb178d 100644
--- a/src/test/compile-fail/borrowck-call-sendfn.rs
+++ b/src/test/compile-fail/borrowck-call-sendfn.rs
@@ -8,15 +8,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-test #2978
-
 struct Foo {
     f: proc()
 }
 
-fn call(x: @Foo) {
-    x.f(); //~ ERROR foo
-    //~^ NOTE bar
+fn call(x: Foo) {
+    x.f(); //~ ERROR does not implement any method in scope named `f`
 }
 
 fn main() {}
diff --git a/src/test/compile-fail/issue-5500-1.rs b/src/test/compile-fail/issue-5500-1.rs
index 42812e5559c..e1779a1db86 100644
--- a/src/test/compile-fail/issue-5500-1.rs
+++ b/src/test/compile-fail/issue-5500-1.rs
@@ -8,15 +8,13 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-test
-
 struct TrieMapIterator<'a> {
-    priv node: &'a uint
+    node: &'a uint
 }
 
 fn main() {
     let a = 5;
-    let _iter = TrieMapIterator{node: &a};  //~ ERROR bad
-    _iter.node = &
+    let _iter = TrieMapIterator{node: &a};
+    _iter.node = & //~ ERROR cannot assign to immutable field
     fail!()
 }
diff --git a/src/test/compile-fail/issue-5500.rs b/src/test/compile-fail/issue-5500.rs
deleted file mode 100644
index c778e750e3a..00000000000
--- a/src/test/compile-fail/issue-5500.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// ignore-test
-
-fn main() { &fail!() } //~ ERROR bad
diff --git a/src/test/compile-fail/issue-6762.rs b/src/test/compile-fail/issue-6801.rs
index 5d6b62fe283..5d6b62fe283 100644
--- a/src/test/compile-fail/issue-6762.rs
+++ b/src/test/compile-fail/issue-6801.rs
diff --git a/src/test/compile-fail/issue-897-2.rs b/src/test/compile-fail/issue-897-2.rs
index f2fffffb3dc..91d47cae15c 100644
--- a/src/test/compile-fail/issue-897-2.rs
+++ b/src/test/compile-fail/issue-897-2.rs
@@ -1,18 +1,4 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// ignore-test
-// ignored because the lint pass doesn't know to ignore standard library
-// stuff.
-
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -29,4 +15,5 @@ fn f() -> ! {
     return g();
     g(); //~ ERROR: unreachable statement
 }
-fn main() { }
+
+fn main() { f() }
diff --git a/src/test/compile-fail/issue-897.rs b/src/test/compile-fail/issue-897.rs
index 7befa16c238..18e25de3eae 100644
--- a/src/test/compile-fail/issue-897.rs
+++ b/src/test/compile-fail/issue-897.rs
@@ -8,12 +8,14 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-test
+// error-pattern: unreachable statement
 
 #[deny(unreachable_code)];
 
 fn f() -> ! {
     return fail!();
-    fail!(); //~ ERROR: unreachable statement
+    fail!(); // the unreachable statement error is in <std macro>, at this line, there
+             // only is a note
 }
-fn main() { }
+
+fn main() { f() }
diff --git a/src/test/compile-fail/view-items-at-top.rs b/src/test/compile-fail/view-items-at-top.rs
index 9614c1f037e..c7c96809eec 100644
--- a/src/test/compile-fail/view-items-at-top.rs
+++ b/src/test/compile-fail/view-items-at-top.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-test
-
 extern mod extra;
 
 fn f() {
diff --git a/src/test/run-fail/addr-of-bot.rs b/src/test/run-fail/issue-5500.rs
index 45dbe11c76e..45dbe11c76e 100644
--- a/src/test/run-fail/addr-of-bot.rs
+++ b/src/test/run-fail/issue-5500.rs
diff --git a/src/test/run-pass/issue-3559.rs b/src/test/run-pass/issue-3559.rs
index 8da800c98b8..5cc098e591c 100644
--- a/src/test/run-pass/issue-3559.rs
+++ b/src/test/run-pass/issue-3559.rs
@@ -8,27 +8,20 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-test #4276
+use std::hashmap::HashMap;
 
-// rustc --test map_to_str.rs && ./map_to_str
-extern mod extra;
-
-fn check_strs(actual: &str, expected: &str) -> bool
-{
-    if actual != expected
-    {
-        println!("Found %s, but expected %s", actual, expected);
+fn check_strs(actual: &str, expected: &str) -> bool {
+    if actual != expected {
+        println!("Found {}, but expected {}", actual, expected);
         return false;
     }
     return true;
 }
 
-fn tester()
-{
-    let mut table = std::hashmap::HashMap::new();
-    table.insert(@~"one", 1);
-    table.insert(@~"two", 2);
-    assert!(check_strs(table.to_str(), ~"xxx"));   // not sure what expected should be
+pub fn main() {
+    let mut table = HashMap::new();
+    table.insert(~"one", 1);
+    table.insert(~"two", 2);
+    assert!(check_strs(table.to_str(), "{one: 1, two: 2}") ||
+            check_strs(table.to_str(), "{two: 2, one: 1}"));
 }
-
-pub fn main() {}