From: Alexander Regueiro <alexreg@me.com>
Date: Sun, 1 Jul 2018 01:26:31 +0000 (+0100)
Subject: Modified expected error messages in accordance with rebase.
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=1c342270424058847b3e348dea4038ff42ab75eb;p=rust.git

Modified expected error messages in accordance with rebase.
---

diff --git a/src/test/compile-fail/issue-14227.rs b/src/test/compile-fail/issue-14227.rs
index 1516e18a86f..95f017061a2 100644
--- a/src/test/compile-fail/issue-14227.rs
+++ b/src/test/compile-fail/issue-14227.rs
@@ -14,6 +14,9 @@
     pub static symbol: ();
 }
 static CRASH: () = symbol;
-//~^ ERROR constant evaluation error
+//~^ ERROR could not evaluate static initializer
+//~| tried to read from foreign (extern) static
+//~^^^ ERROR could not evaluate static initializer
+//~| tried to read from foreign (extern) static
 
 fn main() {}
diff --git a/src/test/compile-fail/issue-28324.rs b/src/test/compile-fail/issue-28324.rs
index 0f9fe3fe246..8512238dd31 100644
--- a/src/test/compile-fail/issue-28324.rs
+++ b/src/test/compile-fail/issue-28324.rs
@@ -15,7 +15,9 @@
 }
 
 pub static BAZ: u32 = *&error_message_count;
-//~^ ERROR constant evaluation error
+//~^ ERROR could not evaluate static initializer
+//~| tried to read from foreign (extern) static
+//~^^^ ERROR could not evaluate static initializer
 //~| tried to read from foreign (extern) static
 
 fn main() {}