From 3ee816a413e346dda445add7874f0e43c7353a4c Mon Sep 17 00:00:00 2001
From: "Jeffrey D. Oldham" <oldham@gcc.gnu.org>
Date: Wed, 10 Jan 2001 00:49:22 +0000
Subject: instantiate2.C: ERROR line should fail for mips.

2001-01-09  Jeffrey Oldham  <oldham@codesourcery.com>

	* g++.old-deja/g++.ext/instantiate2.C: ERROR line should fail for
	mips.
	* g++.old-deja/g++.ext/instantiate3.C: Likewise.

From-SVN: r38844
---
 gcc/testsuite/ChangeLog                           | 8 ++++++++
 gcc/testsuite/g++.old-deja/g++.ext/instantiate2.C | 2 +-
 gcc/testsuite/g++.old-deja/g++.ext/instantiate3.C | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c47778d..8c43e6c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-09  Jeffrey Oldham  <oldham@codesourcery.com>
+
+	* g++.old-deja/g++.ext/instantiate2.C: ERROR line should fail for
+	mips.
+	* g++.old-deja/g++.ext/instantiate3.C: Likewise.
+
 2001-01-09  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* g++.old_deja/g++.pt/using8.C: New test.
@@ -140,6 +146,7 @@
 	* gcc.dg/format-xopen-1.c: Rename to gcc.dg/format/xopen-1.c.
 	* gcc.dg/formatz-1.c: Rename to gcc.dg/format/z-1.c.
 
+>>>>>>> 1.986
 2001-01-05  Alexandre Oliva  <aoliva@redhat.com>
 
 	* gcc.c-torture/execute/991228-1.c: Take word endianness into
@@ -153,6 +160,7 @@
 
 	* g++.old-deja/g++.pt/crash62.C: New test.
 
+>>>>>>> 1.973
 2001-01-04  Richard Henderson  <rth@redhat.com>
 
 	* gcc.dg/20000926-1.c: Update expected warnings.
diff --git a/gcc/testsuite/g++.old-deja/g++.ext/instantiate2.C b/gcc/testsuite/g++.old-deja/g++.ext/instantiate2.C
index 05c3e20..9e31bc8 100644
--- a/gcc/testsuite/g++.old-deja/g++.ext/instantiate2.C
+++ b/gcc/testsuite/g++.old-deja/g++.ext/instantiate2.C
@@ -13,5 +13,5 @@ static template struct A<int>;
 int main ()
 {
   A<int>::t = 42;		// gets bogus error
-  A<char>::t = 42;		// ERROR - not instantiated
+  A<char>::t = 42;		// ERROR - not instantiated XFAIL mips*-*-*
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.ext/instantiate3.C b/gcc/testsuite/g++.old-deja/g++.ext/instantiate3.C
index 7d710c4..c3c9875 100644
--- a/gcc/testsuite/g++.old-deja/g++.ext/instantiate3.C
+++ b/gcc/testsuite/g++.old-deja/g++.ext/instantiate3.C
@@ -10,7 +10,7 @@ template <class T> struct A {
 inline template struct A<int>;
 
 A<int> a;			// gets bogus error
-A<char> b;			// ERROR - not instantiated
+A<char> b;			// ERROR - not instantiated XFAIL mips*-*-*
 
 int main ()
 {
-- 
cgit v1.1