Update tests to match the messages

8 files changed, 9 insertions, 30 deletions

diff --git a/src/test/compile-fail/dupe-symbols-1.rs b/src/test/compile-fail/dupe-symbols-1.rs
index 08370b534cd..9fa4eafcad0 100644
--- a/src/test/compile-fail/dupe-symbols-1.rs
+++ b/src/test/compile-fail/dupe-symbols-1.rs
@@ -17,5 +17,5 @@ pub fn a() {
 
 #[export_name="fail"]
 pub fn b() {
-//~^ symbol `fail` already exists
+//~^ symbol `fail` is already defined
 }
diff --git a/src/test/compile-fail/dupe-symbols-2.rs b/src/test/compile-fail/dupe-symbols-2.rs
index 592874491e0..976a65589b8 100644
--- a/src/test/compile-fail/dupe-symbols-2.rs
+++ b/src/test/compile-fail/dupe-symbols-2.rs
@@ -20,6 +20,6 @@ mod a {
 mod b {
     #[no_mangle]
     pub extern fn fail() {
-    //~^ symbol `fail` already exists
+    //~^ symbol `fail` is already defined
     }
 }
diff --git a/src/test/compile-fail/dupe-symbols-3.rs b/src/test/compile-fail/dupe-symbols-3.rs
index af5622861ef..98a61c33c58 100644
--- a/src/test/compile-fail/dupe-symbols-3.rs
+++ b/src/test/compile-fail/dupe-symbols-3.rs
@@ -17,5 +17,5 @@ pub fn a() {
 
 #[no_mangle]
 pub fn fail() {
-//~^ symbol `fail` already exists
+//~^ symbol `fail` is already defined
 }
diff --git a/src/test/compile-fail/dupe-symbols-4.rs b/src/test/compile-fail/dupe-symbols-4.rs
index 738dce6fed1..60e68f72b24 100644
--- a/src/test/compile-fail/dupe-symbols-4.rs
+++ b/src/test/compile-fail/dupe-symbols-4.rs
@@ -27,5 +27,5 @@ impl A for B {
 impl A for C {
     #[no_mangle]
     fn fail(self) {}
-    //~^ symbol `fail` already exists
+    //~^ symbol `fail` is already defined
 }
diff --git a/src/test/compile-fail/dupe-symbols-5.rs b/src/test/compile-fail/dupe-symbols-5.rs
index 5ca9ca87128..eb4b50d03ca 100644
--- a/src/test/compile-fail/dupe-symbols-5.rs
+++ b/src/test/compile-fail/dupe-symbols-5.rs
@@ -16,5 +16,5 @@ static HELLO: u8 = 0;
 
 #[export_name="fail"]
 pub fn b() {
-//~^ symbol `fail` already exists
+//~^ symbol `fail` is already defined
 }
diff --git a/src/test/compile-fail/dupe-symbols-6.rs b/src/test/compile-fail/dupe-symbols-6.rs
index 9fbc292930e..6f412d9a0de 100644
--- a/src/test/compile-fail/dupe-symbols-6.rs
+++ b/src/test/compile-fail/dupe-symbols-6.rs
@@ -15,4 +15,4 @@ static HELLO: u8 = 0;
 
 #[export_name="fail"]
 static HELLO_TWICE: u16 = 0;
-//~^ symbol `fail` already exists
+//~^ symbol `fail` is already defined
diff --git a/src/test/compile-fail/dupe-symbols-7.rs b/src/test/compile-fail/dupe-symbols-7.rs
index b061f9e257e..c2880ba6f51 100644
--- a/src/test/compile-fail/dupe-symbols-7.rs
+++ b/src/test/compile-fail/dupe-symbols-7.rs
@@ -8,14 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 //
-#![crate_type="rlib"]
+// error-pattern: entry symbol `main` defined multiple times
 #![allow(warnings)]
 
-extern {
-    fn fail();
-}
-
-#[export_name="fail"]
-pub fn a() {
-//~^ symbol `fail` already exists
-}
+#[no_mangle]
+fn main(){}
diff --git a/src/test/compile-fail/dupe-symbols-8.rs b/src/test/compile-fail/dupe-symbols-8.rs
deleted file mode 100644
index c2880ba6f51..00000000000
--- a/src/test/compile-fail/dupe-symbols-8.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.
-//
-// 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.
-//
-// error-pattern: entry symbol `main` defined multiple times
-#![allow(warnings)]
-
-#[no_mangle]
-fn main(){}