From e5e2811bc68d54623a0131e0e58596f0524a52eb Mon Sep 17 00:00:00 2001
From: Brian Anderson <andersrb@gmail.com>
Date: Mon, 23 May 2011 22:49:13 -0400
Subject: [PATCH] test: Un-xfail some compile-fail tests

Changed a few error patterns to match rustc's errors where it seemed
reasonable.
---
 src/test/compile-fail/bad-alt.rs            | 3 ---
 src/test/compile-fail/bad-env-capture.rs    | 2 --
 src/test/compile-fail/bad-env-capture2.rs   | 2 --
 src/test/compile-fail/bad-env-capture3.rs   | 2 --
 src/test/compile-fail/bad-recv.rs           | 3 ---
 src/test/compile-fail/bad-send.rs           | 3 ---
 src/test/compile-fail/no-self-dispatch.rs   | 5 +----
 src/test/compile-fail/unbalanced-comment.rs | 5 +----
 8 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/test/compile-fail/bad-alt.rs b/src/test/compile-fail/bad-alt.rs
index cc25c8d580b9..0762953569e2 100644
--- a/src/test/compile-fail/bad-alt.rs
+++ b/src/test/compile-fail/bad-alt.rs
@@ -1,6 +1,3 @@
-// xfail-stage0
-// xfail-stage1
-// xfail-stage2
 // error-pattern: expecting
 
 fn main() {
diff --git a/src/test/compile-fail/bad-env-capture.rs b/src/test/compile-fail/bad-env-capture.rs
index fa1e1d08acf8..013bb56e4458 100644
--- a/src/test/compile-fail/bad-env-capture.rs
+++ b/src/test/compile-fail/bad-env-capture.rs
@@ -1,5 +1,3 @@
-// xfail-stage0
-// xfail-stage1
 // error-pattern: attempted dynamic environment-capture
 fn foo() {
   let int x;
diff --git a/src/test/compile-fail/bad-env-capture2.rs b/src/test/compile-fail/bad-env-capture2.rs
index ccec33104951..eded6ea703b2 100644
--- a/src/test/compile-fail/bad-env-capture2.rs
+++ b/src/test/compile-fail/bad-env-capture2.rs
@@ -1,5 +1,3 @@
-// xfail-stage0
-// xfail-stage1
 // error-pattern: attempted dynamic environment-capture
 fn foo(int x) {
   fn bar() {
diff --git a/src/test/compile-fail/bad-env-capture3.rs b/src/test/compile-fail/bad-env-capture3.rs
index 77f7881d14af..418decfedf60 100644
--- a/src/test/compile-fail/bad-env-capture3.rs
+++ b/src/test/compile-fail/bad-env-capture3.rs
@@ -1,5 +1,3 @@
-// xfail-stage0
-// xfail-stage1
 // error-pattern: attempted dynamic environment-capture
 obj foo(int x) {
     fn mth() {
diff --git a/src/test/compile-fail/bad-recv.rs b/src/test/compile-fail/bad-recv.rs
index bd8d65a4dcc8..cccb735da055 100644
--- a/src/test/compile-fail/bad-recv.rs
+++ b/src/test/compile-fail/bad-recv.rs
@@ -1,6 +1,3 @@
-// xfail-stage0
-// xfail-stage1
-// xfail-stage2
 // error-pattern: mismatched types
 
 fn main() {
diff --git a/src/test/compile-fail/bad-send.rs b/src/test/compile-fail/bad-send.rs
index 52a3d4ae0613..e699b4e38dfb 100644
--- a/src/test/compile-fail/bad-send.rs
+++ b/src/test/compile-fail/bad-send.rs
@@ -1,6 +1,3 @@
-// xfail-stage0
-// xfail-stage1
-// xfail-stage2
 // error-pattern: mismatched types
 
 fn main() {
diff --git a/src/test/compile-fail/no-self-dispatch.rs b/src/test/compile-fail/no-self-dispatch.rs
index 324d1af97ae3..4e96f1220d57 100644
--- a/src/test/compile-fail/no-self-dispatch.rs
+++ b/src/test/compile-fail/no-self-dispatch.rs
@@ -1,7 +1,4 @@
-// xfail-stage0
-// xfail-stage1
-// xfail-stage2
-// error-pattern: unresolved identifier
+// error-pattern: unresolved name
 obj oT() {
   fn get() -> int {
     ret 3;
diff --git a/src/test/compile-fail/unbalanced-comment.rs b/src/test/compile-fail/unbalanced-comment.rs
index 4f725598cfc3..c9d3e0c9b6a4 100644
--- a/src/test/compile-fail/unbalanced-comment.rs
+++ b/src/test/compile-fail/unbalanced-comment.rs
@@ -1,9 +1,6 @@
-// xfail-stage0
-// xfail-stage1
-// xfail-stage2
 // -*- rust -*-
 
-// error-pattern: token
+// error-pattern: unterminated block comment
 
 /*
  * This is an un-balanced /* multi-line comment.