2003-05-13 Benjamin Kosnik <bkoz@redhat.com>

	* testsuite/27_io/ios_base/cons/copy_neg.cc: Remove
	excess errors dg marker, use dg-errors instead.
	* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
	* testsuite/20_util/auto_ptr_neg.cc: Same.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@66797 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 22 insertions, 10 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c7273a27e39..16972d8dfe9 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2003-05-13  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* testsuite/27_io/ios_base/cons/copy_neg.cc: Remove
+	excess errors dg marker, use dg-errors instead.
+	* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
+	* testsuite/20_util/auto_ptr_neg.cc: Same.
+	
 2003-05-12  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* include/std/std_fstream.h (basic_filebuf::_M_codecvt): Add
diff --git a/libstdc++-v3/testsuite/20_util/auto_ptr_neg.cc b/libstdc++-v3/testsuite/20_util/auto_ptr_neg.cc
index ff39a0d24d5..6f1c629e84b 100644
--- a/libstdc++-v3/testsuite/20_util/auto_ptr_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/auto_ptr_neg.cc
@@ -1,4 +1,6 @@
-// Copyright (C) 2002 Free Software Foundation
+// { dg-do compile }
+
+// Copyright (C) 2002, 2003 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -21,9 +23,6 @@
 #include <memory>
 #include <testsuite_hooks.h>
 
-// { dg-do compile }
-// { dg-excess-errors "" }
-
 // via Jack Reeves <jack_reeves@hispeed.ch>
 // libstdc++/3946
 // http://gcc.gnu.org/ml/libstdc++/2002-07/msg00024.html
@@ -37,7 +36,7 @@ int
 test01()
 {
   std::auto_ptr<Base> ptr2;
-  ptr2 = new Base; // { dg-error "no" "candidates" "auto_ptr"} 
+  ptr2 = new Base; // { dg-error "no match" }
   return 0;
 }
 
@@ -45,6 +44,7 @@ int
 main()
 {
   test01();
-
   return 0;
 }
+// { dg-error "candidates" "" { target *-*-* } 216 } 
+// { dg-error "std::auto_ptr" "" { target *-*-* } 338 } 
diff --git a/libstdc++-v3/testsuite/27_io/ios_base/cons/assign_neg.cc b/libstdc++-v3/testsuite/27_io/ios_base/cons/assign_neg.cc
index 2d6c2eaccdc..7e138313b6f 100644
--- a/libstdc++-v3/testsuite/27_io/ios_base/cons/assign_neg.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_base/cons/assign_neg.cc
@@ -1,5 +1,4 @@
 // { dg-do compile }
-// { dg-excess-errors "" }
 
 // Copyright (C) 2003 Free Software Foundation, Inc.
 //
@@ -41,3 +40,6 @@ void test01()
   test_base io2;
   io1 = io2;
 }
+// { dg-error "within this context" "" { target *-*-* } 41 } 
+// { dg-error "is private" "" { target *-*-* } 666 } 
+// { dg-error "operator=" "" { target *-*-* } 0 } 
diff --git a/libstdc++-v3/testsuite/27_io/ios_base/cons/copy_neg.cc b/libstdc++-v3/testsuite/27_io/ios_base/cons/copy_neg.cc
index 4ab655f195a..56531485c8b 100644
--- a/libstdc++-v3/testsuite/27_io/ios_base/cons/copy_neg.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_base/cons/copy_neg.cc
@@ -1,5 +1,4 @@
 // { dg-do compile }
-// { dg-excess-errors "" }
 
 // Copyright (C) 2003 Free Software Foundation, Inc.
 //
@@ -32,11 +31,15 @@
 
 // Library defect report
 //50.  Copy constructor and assignment operator of ios_base
-class test_base : public std::ios_base { };
+struct test_base : public std::ios_base 
+{ };
 
 void test02()
 {
   // copy ctor
   test_base io1;
-  test_base io2 =  io1;
+  test_base io2 = io1; 
 }
+// { dg-error "within this context" "" { target *-*-* } 41 } 
+// { dg-error "is private" "" { target *-*-* } 663 } 
+// { dg-error "copy constructor" "" { target *-*-* } 0 }