From 25be47cd224a089c386c3743d1695872b928c3e6 Mon Sep 17 00:00:00 2001
From: bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 4 Mar 2004 23:37:24 +0000
Subject: [PATCH] 2004-03-04  Benjamin Kosnik  <bkoz@redhat.com>

	* testsuite/23_containers/multiset/insert/1.cc: Test result string.

	* testsuite/23_containers/bitset/invalidation/1.cc: Main always
	returns 0.
	* testsuite/23_containers/deque/invalidation/4.cc: Same.
	* testsuite/23_containers/list/invalidation/1.cc: Same.
	* testsuite/23_containers/list/invalidation/2.cc: Same.
	* testsuite/23_containers/list/invalidation/3.cc: Same.
	* testsuite/23_containers/list/invalidation/4.cc: Same.
	* testsuite/23_containers/map/invalidation/2.cc: Same.
	* testsuite/23_containers/multimap/invalidation/1.cc: Same.
	* testsuite/23_containers/multimap/invalidation/2.cc: Same.
	* testsuite/23_containers/multiset/invalidation/1.cc: Same.
	* testsuite/23_containers/multiset/invalidation/2.cc: Same.
	* testsuite/23_containers/set/invalidation/1.cc: Same.
	* testsuite/23_containers/set/invalidation/2.cc: Same.
	* testsuite/23_containers/vector/invalidation/1.cc: Same.
	* testsuite/23_containers/vector/invalidation/2.cc: Same.
	* testsuite/23_containers/vector/invalidation/3.cc: Same.
	* testsuite/23_containers/vector/invalidation/4.cc: Same.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@78943 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libstdc++-v3/ChangeLog                             | 23 +++++++++++++++++
 .../23_containers/bitset/invalidation/1.cc         |  4 +--
 .../23_containers/deque/invalidation/4.cc          |  2 +-
 .../testsuite/23_containers/list/invalidation/1.cc |  2 +-
 .../testsuite/23_containers/list/invalidation/2.cc |  2 +-
 .../testsuite/23_containers/list/invalidation/3.cc |  2 +-
 .../testsuite/23_containers/list/invalidation/4.cc |  2 +-
 .../testsuite/23_containers/map/invalidation/2.cc  |  2 +-
 .../23_containers/multimap/invalidation/1.cc       |  2 +-
 .../23_containers/multimap/invalidation/2.cc       |  2 +-
 .../testsuite/23_containers/multiset/insert/1.cc   | 29 ++++++++--------------
 .../23_containers/multiset/invalidation/1.cc       |  2 +-
 .../23_containers/multiset/invalidation/2.cc       |  5 ++--
 .../testsuite/23_containers/set/invalidation/1.cc  |  2 +-
 .../testsuite/23_containers/set/invalidation/2.cc  |  6 ++---
 .../23_containers/vector/invalidation/1.cc         |  2 +-
 .../23_containers/vector/invalidation/2.cc         |  2 +-
 .../23_containers/vector/invalidation/3.cc         |  2 +-
 .../23_containers/vector/invalidation/4.cc         |  2 +-
 19 files changed, 54 insertions(+), 41 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1c46f8206cd..a41dd5177c6 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,26 @@
+2004-03-04  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* testsuite/23_containers/multiset/insert/1.cc: Test result string.
+
+	* testsuite/23_containers/bitset/invalidation/1.cc: Main always
+	returns 0.	
+	* testsuite/23_containers/deque/invalidation/4.cc: Same.
+	* testsuite/23_containers/list/invalidation/1.cc: Same.
+	* testsuite/23_containers/list/invalidation/2.cc: Same.
+	* testsuite/23_containers/list/invalidation/3.cc: Same.
+	* testsuite/23_containers/list/invalidation/4.cc: Same.
+	* testsuite/23_containers/map/invalidation/2.cc: Same.
+	* testsuite/23_containers/multimap/invalidation/1.cc: Same.
+	* testsuite/23_containers/multimap/invalidation/2.cc: Same.
+	* testsuite/23_containers/multiset/invalidation/1.cc: Same.
+	* testsuite/23_containers/multiset/invalidation/2.cc: Same.
+	* testsuite/23_containers/set/invalidation/1.cc: Same.
+	* testsuite/23_containers/set/invalidation/2.cc: Same.
+	* testsuite/23_containers/vector/invalidation/1.cc: Same.
+	* testsuite/23_containers/vector/invalidation/2.cc: Same.
+	* testsuite/23_containers/vector/invalidation/3.cc: Same.
+	* testsuite/23_containers/vector/invalidation/4.cc: Same.
+
 2004-03-04  Paolo Carlini  <pcarlini@suse.de>
 
 	* scripts/testsuite_flags.in: Add "-D_GLIBCXX_ASSERT" to
diff --git a/libstdc++-v3/testsuite/23_containers/bitset/invalidation/1.cc b/libstdc++-v3/testsuite/23_containers/bitset/invalidation/1.cc
index 7ca3053cff1..59654f06ed4 100644
--- a/libstdc++-v3/testsuite/23_containers/bitset/invalidation/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/bitset/invalidation/1.cc
@@ -1,6 +1,6 @@
 // Bitset reference invalidation tests
 
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 //
 // 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
@@ -42,5 +42,5 @@ void test01()
 int main()
 {
   test01();
-  return !test;
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/23_containers/deque/invalidation/4.cc b/libstdc++-v3/testsuite/23_containers/deque/invalidation/4.cc
index 21ba372bf8d..8300fa57a75 100644
--- a/libstdc++-v3/testsuite/23_containers/deque/invalidation/4.cc
+++ b/libstdc++-v3/testsuite/23_containers/deque/invalidation/4.cc
@@ -77,5 +77,5 @@ template class __gnu_cxx::__mt_alloc<int>;
 int main()
 {
   test04();
-  return !test;
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/23_containers/list/invalidation/1.cc b/libstdc++-v3/testsuite/23_containers/list/invalidation/1.cc
index 21e04328a96..571a69b473d 100644
--- a/libstdc++-v3/testsuite/23_containers/list/invalidation/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/invalidation/1.cc
@@ -61,5 +61,5 @@ template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
 int main()
 {
   test01();
-  return !test;
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/23_containers/list/invalidation/2.cc b/libstdc++-v3/testsuite/23_containers/list/invalidation/2.cc
index 4bfa5ce7145..e6b04bdf371 100644
--- a/libstdc++-v3/testsuite/23_containers/list/invalidation/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/invalidation/2.cc
@@ -56,5 +56,5 @@ template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
 int main()
 {
   test02();
-  return !test;
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/23_containers/list/invalidation/3.cc b/libstdc++-v3/testsuite/23_containers/list/invalidation/3.cc
index 31da208aeb7..58493078b83 100644
--- a/libstdc++-v3/testsuite/23_containers/list/invalidation/3.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/invalidation/3.cc
@@ -79,5 +79,5 @@ template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
 int main()
 {
   test03();
-  return !test;
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/23_containers/list/invalidation/4.cc b/libstdc++-v3/testsuite/23_containers/list/invalidation/4.cc
index c4529838fa0..3c11fd6733c 100644
--- a/libstdc++-v3/testsuite/23_containers/list/invalidation/4.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/invalidation/4.cc
@@ -56,5 +56,5 @@ template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
 int main()
 {
   test04();
-  return !test;
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/23_containers/map/invalidation/2.cc b/libstdc++-v3/testsuite/23_containers/map/invalidation/2.cc
index 41fa0d3da67..b35d70ebdf5 100644
--- a/libstdc++-v3/testsuite/23_containers/map/invalidation/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/map/invalidation/2.cc
@@ -72,5 +72,5 @@ template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<std::pair<int const, int
 int main()
 {
   test02();
-  return !test;
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/invalidation/1.cc b/libstdc++-v3/testsuite/23_containers/multimap/invalidation/1.cc
index d98566cf6ec..6246604d1cf 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/invalidation/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/invalidation/1.cc
@@ -54,5 +54,5 @@ template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<std::pair<int const, int
 int main()
 {
   test01();
-  return !test;
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/invalidation/2.cc b/libstdc++-v3/testsuite/23_containers/multimap/invalidation/2.cc
index 1025576d564..07fe8d62fae 100644
--- a/libstdc++-v3/testsuite/23_containers/multimap/invalidation/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/multimap/invalidation/2.cc
@@ -73,5 +73,5 @@ template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<std::pair<int const, int
 int main()
 {
   test02();
-  return !test;
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/insert/1.cc b/libstdc++-v3/testsuite/23_containers/multiset/insert/1.cc
index 21c6f450a2a..4c9dc80d45e 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/insert/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/insert/1.cc
@@ -1,6 +1,6 @@
 // 1999-06-24 bkoz
 
-// Copyright (C) 1999 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2004 Free Software Foundation, Inc.
 //
 // 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
@@ -20,10 +20,11 @@
 
 // 23.3.4 template class multiset
 
-#include <iostream>
+#include <sstream>
 #include <iterator>
 #include <set>
 #include <algorithm>
+#include <testsuite_hooks.h>
 
 namespace std 
 {
@@ -43,6 +44,7 @@ template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<std::pair<int, int> > >;
 
 int main () 
 {
+  bool test __attribute__((unused)) = true;
   typedef std::multiset<std::pair<int, int> >::iterator iterator;
   std::pair<int, int> p(69, 0);
   std::multiset<std::pair<int, int> > s;
@@ -56,24 +58,13 @@ int main ()
 	++p.second;
       }
 
-  // XXX need to use debug-assert here and get this working with an
-  // ostrinsrtream, that way we can just check the strings for
-  // equivalance.
+  std::ostringstream stream;
   std::copy(s.begin(), s.end(), 
-            std::ostream_iterator<std::pair<int, int> >(std::cout, "\n"));
+            std::ostream_iterator<std::pair<int, int> >(stream, "\n"));
+  const std::string expected("69 0\n69 1\n69 2\n69 3\n69 4\n"
+			     "69 5\n69 6\n69 7\n69 8\n69 9\n");
+  std::string tested(stream.str());
+  VERIFY( tested == expected );
 
   return 0;
 }
-
-/* output:
-69 5
-69 0
-69 6
-69 1
-69 7
-69 2
-69 8
-69 3
-69 9
-69 4
-*/
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/invalidation/1.cc b/libstdc++-v3/testsuite/23_containers/multiset/invalidation/1.cc
index 18c937ddea4..c5c9106057d 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/invalidation/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/invalidation/1.cc
@@ -53,5 +53,5 @@ template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<int> >;
 int main()
 {
   test01();
-  return !test;
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/invalidation/2.cc b/libstdc++-v3/testsuite/23_containers/multiset/invalidation/2.cc
index 1185319b10c..e0168170878 100644
--- a/libstdc++-v3/testsuite/23_containers/multiset/invalidation/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/multiset/invalidation/2.cc
@@ -25,11 +25,10 @@
 using __gnu_debug::multiset;
 using std::advance;
 
-bool test = true;
-
 // Erase
 void test02()
 {
+  bool test __attribute__((unused)) = true;
   multiset<int> v;
   for (int i = 0; i < 20; ++i)
     v.insert(i);
@@ -72,5 +71,5 @@ template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<int> >;
 int main()
 {
   test02();
-  return !test;
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/23_containers/set/invalidation/1.cc b/libstdc++-v3/testsuite/23_containers/set/invalidation/1.cc
index 59190630e28..071d9e22c20 100644
--- a/libstdc++-v3/testsuite/23_containers/set/invalidation/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/invalidation/1.cc
@@ -53,5 +53,5 @@ template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<int> >;
 int main()
 {
   test01();
-  return !test;
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/23_containers/set/invalidation/2.cc b/libstdc++-v3/testsuite/23_containers/set/invalidation/2.cc
index 64b5fc37895..0978b815f5b 100644
--- a/libstdc++-v3/testsuite/23_containers/set/invalidation/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/set/invalidation/2.cc
@@ -25,11 +25,11 @@
 using __gnu_debug::set;
 using std::advance;
 
-bool test = true;
-
 // Erase
 void test02()
 {
+  bool test __attribute__((unused)) = true;
+
   set<int> v;
   for (int i = 0; i < 20; ++i)
     v.insert(i);
@@ -72,5 +72,5 @@ template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<int> >;
 int main()
 {
   test02();
-  return !test;
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/23_containers/vector/invalidation/1.cc b/libstdc++-v3/testsuite/23_containers/vector/invalidation/1.cc
index 1e1e524a74b..dcd9d7ff4df 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/invalidation/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/invalidation/1.cc
@@ -61,5 +61,5 @@ template class __gnu_cxx::__mt_alloc<int>;
 int main()
 {
   test01();
-  return !test;
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/23_containers/vector/invalidation/2.cc b/libstdc++-v3/testsuite/23_containers/vector/invalidation/2.cc
index 13210acf903..d79a2ee3ac7 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/invalidation/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/invalidation/2.cc
@@ -66,5 +66,5 @@ template class __gnu_cxx::__mt_alloc<int>;
 int main()
 {
   test02();
-  return !test;
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/23_containers/vector/invalidation/3.cc b/libstdc++-v3/testsuite/23_containers/vector/invalidation/3.cc
index a0df965a1b6..0414a337ea0 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/invalidation/3.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/invalidation/3.cc
@@ -91,5 +91,5 @@ template class __gnu_cxx::__mt_alloc<int>;
 int main()
 {
   test03();
-  return !test;
+  return 0;
 }
diff --git a/libstdc++-v3/testsuite/23_containers/vector/invalidation/4.cc b/libstdc++-v3/testsuite/23_containers/vector/invalidation/4.cc
index 8ee2234216a..184db02a225 100644
--- a/libstdc++-v3/testsuite/23_containers/vector/invalidation/4.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/invalidation/4.cc
@@ -68,5 +68,5 @@ template class __gnu_cxx::__mt_alloc<int>;
 int main()
 {
   test04();
-  return !test;
+  return 0;
 }
-- 
2.11.0