From 2e15faa2e8545a8565c59bd6888227143f2f9241 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@gcc.gnu.org>
Date: Mon, 26 Oct 1998 07:00:51 -0500
Subject: [PATCH] up

From-SVN: r23354
---
 gcc/testsuite/g++.old-deja/g++.law/friend4.C   | 1 -
 gcc/testsuite/g++.old-deja/g++.other/decl2.C   | 2 --
 gcc/testsuite/g++.old-deja/g++.other/friend5.C | 6 +-----
 gcc/testsuite/g++.old-deja/g++.robertl/eb125.C | 6 ++++--
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/gcc/testsuite/g++.old-deja/g++.law/friend4.C b/gcc/testsuite/g++.old-deja/g++.law/friend4.C
index 5502a002dc51..a734fc419dfd 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/friend4.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/friend4.C
@@ -1,6 +1,5 @@
 // Build don't link: 
 // GROUPS passed friends
-// excess errors test - XFAIL *-*-*
 // friends file
 // From: osinski@cs.nyu.edu (Ed Osinski)
 // Date:     Fri, 05 Jun 92 20:47:37 -0400
diff --git a/gcc/testsuite/g++.old-deja/g++.other/decl2.C b/gcc/testsuite/g++.old-deja/g++.other/decl2.C
index 35046504fb47..1da75406d9f4 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/decl2.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/decl2.C
@@ -1,8 +1,6 @@
 // Build don't link:
 // Based on a test-case by Maciej Radziejewski <maciejr@iws.uni-stuttgart.de>
 
-// crash test - XFAIL *-*-*
-
 int i(0)(1); // ERROR - multiple initialization
 int j(2) = 3; // ERROR - multiple initialization
 int k(4)(5)(6); // ERROR - multiple initialization
diff --git a/gcc/testsuite/g++.old-deja/g++.other/friend5.C b/gcc/testsuite/g++.old-deja/g++.other/friend5.C
index dd005b1f33ff..ab15fa58c5b0 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/friend5.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/friend5.C
@@ -1,9 +1,5 @@
-// Build don't link:
-
 // submitted by David C Binderman <dcb@pncl.co.uk>
 
-// crash test - XFAIL *-*-*
-
 struct A {
-	friend bool();
+	friend bool();		// ERROR - invalid declaration
 };
diff --git a/gcc/testsuite/g++.old-deja/g++.robertl/eb125.C b/gcc/testsuite/g++.old-deja/g++.robertl/eb125.C
index 5faa28087c84..aff6ae610074 100644
--- a/gcc/testsuite/g++.old-deja/g++.robertl/eb125.C
+++ b/gcc/testsuite/g++.old-deja/g++.robertl/eb125.C
@@ -1,3 +1,6 @@
+// This is a crash test; we don't care how many normal errors we get.
+// excess errors test - XFAIL *-*-*
+
 struct test_box
     {
      void print(void);
@@ -17,5 +20,4 @@ template <class BOX> void test(BOX *the_box)  // ERROR - semicolon missing
     the_box->print();
     };
 
-template void test<> (test_box *);     // gets bogus error - test is declared XFAIL *-*-*
-
+template void test<> (test_box *);