Some testsuite tweaks

[Alexandre Oliva <aoliva at redhat dot com>]

It seems that the preprocessor no longer likes g++.jason/2371.C.  I
had to tweak it a little bit for it to stop complaining about
returning into the wrong line numbers.

The other two tweaks are for tests that don't pass with the new ABI.
Since there's no way to XFAIL them conditionally on the use of the old
ABI, I just preprocess away the failing parts.

The last hunk removes a test that is actually a library test.  Error
messages are printed referencing header line numbers, so there's no
way it's going to pass without some dejagnu development work.

Ok to install?

Index: gcc/testsuite/g++.old-deja/g++.jason/2371.C
===================================================================
RCS file: /cvs/gcc/egcs/gcc/testsuite/g++.old-deja/g++.jason/2371.C,v
retrieving revision 1.5
diff -u -p -r1.5 2371.C
--- gcc/testsuite/g++.old-deja/g++.jason/2371.C 2000/07/04 07:47:10 1.5
+++ gcc/testsuite/g++.old-deja/g++.jason/2371.C 2001/02/05 19:44:11
@@ -1,3 +1,4 @@
+# 1 "SetLS.cc"
 // GROUPS passed templates nested-classes
 // Special g++ Options: 
 //
@@ -12,6 +13,7 @@
 
 #include <stdlib.h>
 #include <iostream.h>
+
 # 1 "../../templates/SetLS.h" 1
 // -*- C++ -*-
 
@@ -75,7 +77,7 @@
 
 
 
-# 26 "../../templates/ListS.h" 2
+# 23 "../../templates/ListS.h" 2
 
 # 37 "../../templates/ListS.h"
 
@@ -318,7 +320,7 @@ ListS<T>::remove_head_filling(T* fill)
 }
 
 
-# 39 "../../templates/SetLS.h" 2
+# 40 "../../templates/SetLS.h" 2
 
 
 # 62 "../../templates/SetLS.h"
@@ -419,32 +421,9 @@ SetLS<T>::contains(const T& item) const
     return XFALSE;
 }
 
-
-# 14 "SetLS.cc" 2
-
-
-
-# 1 "/projects/gnu-cygnus/gnu-cygnus-14/mips/lib/gcc-lib/decstation/cygnus-reno-1/g++-include/iostream.h" 1 3
-//    This is part of the iostream library, providing -*- C++ -*- input/output.
-//    Copyright (C) 1991 Per Bothner.
-//
-//    This library is free software; you can redistribute it and/or
-//    modify it under the terms of the GNU Library General Public
-//    License as published by the Free Software Foundation; either
-//    version 2 of the License, or (at your option) any later version.
-//
-//    This library is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//    Library General Public License for more details.
-//
-//    You should have received a copy of the GNU Library General Public
-//    License along with this library; if not, write to the Free
-//    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-# 211 "/projects/gnu-cygnus/gnu-cygnus-14/mips/lib/gcc-lib/decstation/cygnus-reno-1/g++-include/iostream.h" 3
+# 17 "SetLS.cc" 2
 
-# 21 "SetLS.cc" 2
 
 
 // In (most versions of) g++ 2.X, this use of typedefs has the effect
Index: gcc/testsuite/g++.old-deja/g++.pt/crash61.C
===================================================================
RCS file: /cvs/gcc/egcs/gcc/testsuite/g++.old-deja/g++.pt/crash61.C,v
retrieving revision 1.1
diff -u -p -r1.1 crash61.C
--- gcc/testsuite/g++.old-deja/g++.pt/crash61.C 2000/12/04 23:44:51 1.1
+++ gcc/testsuite/g++.old-deja/g++.pt/crash61.C 2001/02/05 19:44:14
@@ -1,6 +1,7 @@
 // Build don't link:
 // Source: Neil Booth, from PR # 106. 4 Dec 2000.
 
+#if __GXX_ABI_VERSION >= 100
 template <bool b> class bar
 {
 };
@@ -28,3 +29,4 @@ int main()
 {
   bar<true> a_bar = do_funky(foo<A_a, B_b>());
 }
+#endif
Index: gcc/testsuite/g++.old-deja/g++.pt/instantiate10.C
===================================================================
RCS file: /cvs/gcc/egcs/gcc/testsuite/g++.old-deja/g++.pt/instantiate10.C,v
retrieving revision 1.1
diff -u -p -r1.1 instantiate10.C
--- gcc/testsuite/g++.old-deja/g++.pt/instantiate10.C 2000/12/04 22:51:59 1.1
+++ gcc/testsuite/g++.old-deja/g++.pt/instantiate10.C 2001/02/05 19:44:14
@@ -1,7 +1,9 @@
 // Build don't link:
 // Origin: Neil Booth, from bug report #44
 
+#if __GXX_ABI_VERSION >= 100
 #include <iterator>
+#endif
 
 template<class T>
 struct X
Index: gcc/testsuite/g++.old-deja/g++.robertl/eb55.C
===================================================================
RCS file: eb55.C
diff -N eb55.C
--- gcc/testsuite/g++.old-deja/g++.robertl/eb55.C Mon Feb 5 11:55:35 2001
+++ /dev/null	Tue May  5 13:32:27 1998
@@ -1,12 +0,0 @@
-// Build don't link: 
-// Since the constructor is in streambuf.h, additional diagnostics are
-// produced, which are not really supported in the old-deja framework
-
-#include <strstream.h>
-
-void
-t( char* buf )
-{
-  istrstream str = buf;  //ERROR - inaccessible copy constructor
-}
-

-- 
Alexandre Oliva   Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer                  aoliva@{cygnus.com, redhat.com}
CS PhD student at IC-Unicamp        oliva@{lsd.ic.unicamp.br, gnu.org}
Free Software Evangelist    *Please* write to mailing lists, not to me