1.cc: Test result string.

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.

From-SVN: r78943

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1c46f8206cd555cba2869f67aee227cebe3a9cd3..a41dd5177c6bda4b8eb1c65ec308742893b07814 100644 (file)
--- 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 7ca3053cff15fd6f21c15bf20ffdf24401e42b16..59654f06ed44a79867d7c84dbd6be223478e0dc1 100644 (file)
--- 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 21ba372bf8da6ff1062bec334d19af04155ade7a..8300fa57a75de0e86203f2224a27ee6ae4b3cf55 100644 (file)
--- 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 21e04328a963b2ef864d8299ba37be8ce9c35568..571a69b473daeb99bab532a28d16676412a0d46c 100644 (file)
--- 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 4bfa5ce7145c3b3939c81808111b5e7a562bf524..e6b04bdf3716cb905f972f5a4dd36488c0884fe5 100644 (file)
--- 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 31da208aeb7031efa1960fb1ecaea353b2f9c616..58493078b83db34e189c4fdaa03dcfd289553425 100644 (file)
--- 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 c4529838fa011cfb4698e38a383f42c815c64a3d..3c11fd6733cf306f542f0e585dffcd4629d0da96 100644 (file)
--- 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 41fa0d3da67c0e7c181f5733d8b866249bf9fd58..b35d70ebdf59cd618a381071c39f51d345b26aa0 100644 (file)
--- 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 d98566cf6ec8db33c4af586fc795d8d4c3b564a0..6246604d1cf98c34ca4b407a55226ec3bcb54c46 100644 (file)
--- 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 1025576d56462b5232eb174899a38f192681f408..07fe8d62fae73e1a9aab663fc03c9103066f8a81 100644 (file)
--- 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 21c6f450a2a7dcde18921cf436dbc43b03ae8d38..4c9dc80d45e0b2cc9b4263d3e6f6f80c18c08941 100644 (file)
--- 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 18c937ddea4b54105cc56f35dfcaa2dbcabc7b53..c5c9106057d1687ebf3e2c7c0ec4e149d5787bb5 100644 (file)
--- 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 1185319b10ce0890b5a174d3c5885a6772317a28..e016817087850d8dd8d01648493579d778ef29af 100644 (file)
--- 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 59190630e2868206c410b34632badb43d80212a2..071d9e22c20a7992148fd11826098d3c8dc3196a 100644 (file)
--- 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 64b5fc37895c1b6da586cf3b1ed89bd0b08a00f8..0978b815f5b75c0614190ff37b3681a5703a839b 100644 (file)
--- 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 1e1e524a74b5aa9a9d9db8b004e2b203ba5c4a8f..dcd9d7ff4dfc0e2988f32762cec040d6a3cf9cf4 100644 (file)
--- 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 13210acf903fb5b844a4aa66fa0d47a3d42706a4..d79a2ee3ac754536da403e9bd6f83f75fae02132 100644 (file)
--- 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 a0df965a1b6f9459ac1cdab2171a503381de4333..0414a337ea0f060ed0c28d1a241980e302bdb083 100644 (file)
--- 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 8ee2234216aeae76c371e6f04d4014b8a39f9976..184db02a2255ced0d37850e4c65806bb342fbeda 100644 (file)
--- 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;
 }