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
This commit is contained in:
Benjamin Kosnik 2004-03-04 23:37:24 +00:00 committed by Benjamin Kosnik
parent 2aa89cbb78
commit 80e39f4ae5
19 changed files with 54 additions and 41 deletions

View File

@ -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

View File

@ -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;
}

View File

@ -77,5 +77,5 @@ template class __gnu_cxx::__mt_alloc<int>;
int main()
{
test04();
return !test;
return 0;
}

View File

@ -61,5 +61,5 @@ template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
int main()
{
test01();
return !test;
return 0;
}

View File

@ -56,5 +56,5 @@ template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
int main()
{
test02();
return !test;
return 0;
}

View File

@ -79,5 +79,5 @@ template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
int main()
{
test03();
return !test;
return 0;
}

View File

@ -56,5 +56,5 @@ template class __gnu_cxx::__mt_alloc<std::_List_node<int> >;
int main()
{
test04();
return !test;
return 0;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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
*/

View File

@ -53,5 +53,5 @@ template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<int> >;
int main()
{
test01();
return !test;
return 0;
}

View File

@ -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;
}

View File

@ -53,5 +53,5 @@ template class __gnu_cxx::__mt_alloc<std::_Rb_tree_node<int> >;
int main()
{
test01();
return !test;
return 0;
}

View File

@ -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;
}

View File

@ -61,5 +61,5 @@ template class __gnu_cxx::__mt_alloc<int>;
int main()
{
test01();
return !test;
return 0;
}

View File

@ -66,5 +66,5 @@ template class __gnu_cxx::__mt_alloc<int>;
int main()
{
test02();
return !test;
return 0;
}

View File

@ -91,5 +91,5 @@ template class __gnu_cxx::__mt_alloc<int>;
int main()
{
test03();
return !test;
return 0;
}

View File

@ -68,5 +68,5 @@ template class __gnu_cxx::__mt_alloc<int>;
int main()
{
test04();
return !test;
return 0;
}