From 0643494bc4d093dd660044b86c1d43820c40daf8 Mon Sep 17 00:00:00 2001
From: bombless <bombless@126.com>
Date: Fri, 20 Feb 2015 03:10:31 +0800
Subject: [PATCH] Fix tests

---
 src/test/compile-fail/issue-22426-1.rs                   | 3 ++-
 src/test/compile-fail/issue-22426-2.rs                   | 3 ++-
 .../compile-fail/{issue-22426.rs => issue-22426-3.rs}    | 3 ++-
 src/test/run-pass/issue-22426.rs                         | 9 ++++++++-
 4 files changed, 14 insertions(+), 4 deletions(-)
 rename src/test/compile-fail/{issue-22426.rs => issue-22426-3.rs} (89%)

diff --git a/src/test/compile-fail/issue-22426-1.rs b/src/test/compile-fail/issue-22426-1.rs
index edc56ae19394..f026a5db551e 100644
--- a/src/test/compile-fail/issue-22426-1.rs
+++ b/src/test/compile-fail/issue-22426-1.rs
@@ -10,7 +10,8 @@
 
 fn main() {
   match 42 {
-    x < 7 => (), //~ ERROR unexpected token `<`
+    x < 7 => (),
+   //~^ error: unexpected token: `<`
     _ => ()
   }
 }
diff --git a/src/test/compile-fail/issue-22426-2.rs b/src/test/compile-fail/issue-22426-2.rs
index c24de36ec752..ea5180e3eec6 100644
--- a/src/test/compile-fail/issue-22426-2.rs
+++ b/src/test/compile-fail/issue-22426-2.rs
@@ -8,4 +8,5 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn a(B<) {} //~ ERROR unexpected token `<`
+fn a(B<) {}
+   //~^ error: unexpected token: `<`
diff --git a/src/test/compile-fail/issue-22426.rs b/src/test/compile-fail/issue-22426-3.rs
similarity index 89%
rename from src/test/compile-fail/issue-22426.rs
rename to src/test/compile-fail/issue-22426-3.rs
index 37625e69a430..2e0b5d6b80fa 100644
--- a/src/test/compile-fail/issue-22426.rs
+++ b/src/test/compile-fail/issue-22426-3.rs
@@ -13,7 +13,8 @@ struct Foo<T>(T, T);
 impl<T> Foo<T> {
     fn foo(&self) {
         match *self {
-            Foo<T>(x, y) => { //~ ERROR unexpected token `<`
+            Foo<T>(x, y) => {
+            //~^ error: unexpected token: `<`
               println!("Goodbye, World!")
             }
         }
diff --git a/src/test/run-pass/issue-22426.rs b/src/test/run-pass/issue-22426.rs
index d1d1b037d8d6..f067d7fd3b12 100644
--- a/src/test/run-pass/issue-22426.rs
+++ b/src/test/run-pass/issue-22426.rs
@@ -13,9 +13,16 @@ struct Foo<T>(T, T);
 impl<T> Foo<T> {
     fn foo(&self) {
         match *self {
-            Foo::<T>(ref x, ref y) => { //~ ERROR unexpected token `<`
+            Foo::<T>(ref x, ref y) => {
               println!("Goodbye, World!")
             }
         }
     }
 }
+
+fn main() {
+  match 42 {
+    x if x < 7 => (),
+    _ => ()
+  }
+}