Skip to content

R
riscv-gcc-1
Commit cb2168c9 by Benjamin Kosnik Committed by Benjamin Kosnik
Options

testsuite_iterators.h: Guard move.h includes. 

2010-11-16  Benjamin Kosnik  <bkoz@redhat.com>

	* testsuite/util/testsuite_iterators.h: Guard move.h includes.
	* testsuite/util/testsuite_allocator.h: Same.

	* testsuite/20_util/temporary_buffer.cc: Use typedef, qualify.

	* testsuite/ext/pb_ds/regression/hash_data_map_rand.cc: Define
	PB_DS_REGRESSION in the source file.
	* testsuite/ext/pb_ds/regression/trie_data_map_rand.cc: Same.
	* testsuite/ext/pb_ds/regression/list_update_no_data_map_rand.cc: Same.
	* testsuite/ext/pb_ds/regression/tree_no_data_map_rand.cc: Same.
	* testsuite/ext/pb_ds/regression/list_update_data_map_rand.cc: Same.
	* testsuite/ext/pb_ds/regression/hash_no_data_map_rand.cc: Same.
	* testsuite/ext/pb_ds/regression/priority_queue_rand.cc: Same.
	* testsuite/ext/pb_ds/regression/tree_data_map_rand.cc: Same.
	* testsuite/ext/pb_ds/regression/trie_no_data_map_rand.cc: Same.

	* testsuite/21_strings/c_strings/wchar_t/3_neg.cc: Move to this.
	Use _neg suffix.
	* testsuite/21_strings/c_strings/wchar_t/3.cc: ...from this.
	* testsuite/21_strings/c_strings/char/3_neg.cc: Same.
	* testsuite/21_strings/c_strings/char/3.cc: Same.
	* testsuite/ext/slist/23781_neg.cc: Same.
	* testsuite/ext/slist/23781.cc: Same.
	* testsuite/ext/profile/mutex_extensions.cc: Same.
	* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
	* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820.cc: Same.
	* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
	* testsuite/tr1/6_containers/tuple/comparison_operators/35480_neg.cc:
	Same.
	* testsuite/tr1/6_containers/tuple/comparison_operators/35480.cc: Same.
	* testsuite/23_containers/multimap/23781_neg.cc: Same.
	* testsuite/23_containers/multimap/23781.cc: Same.
	* testsuite/23_containers/set/23781_neg.cc: Same.
	* testsuite/23_containers/set/23781.cc: Same.
	* testsuite/23_containers/multiset/23781_neg.cc: Same.
	* testsuite/23_containers/multiset/23781.cc: Same.
	* testsuite/23_containers/list/23781_neg.cc: Same.
	* testsuite/23_containers/list/23781.cc: Same.
	* testsuite/23_containers/map/23781_neg.cc: Same.
	* testsuite/23_containers/map/23781.cc: Same.
	* testsuite/20_util/duration/cons/dr974_neg.cc: Same.
	* testsuite/20_util/duration/cons/dr974.cc: Same.
	* testsuite/20_util/tuple/comparison_operators/35480_neg.cc: Same.
	* testsuite/20_util/tuple/comparison_operators/35480.cc: Same.
	* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
	* testsuite/20_util/shared_ptr/cons/43820.cc: Same.
	* testsuite/20_util/unique_ptr/cons/pointer_array_convertible_neg.cc:
	Same.
	* testsuite/20_util/unique_ptr/cons/pointer_array_convertible.cc: Same.

From-SVN: r167956
parent bcdae749
Showing with 109 additions and 41 deletions
libstdc++-v3/ChangeLog
2010-11-16 Benjamin Kosnik <bkoz@redhat.com>
* testsuite/util/testsuite_iterators.h: Guard move.h includes.
* testsuite/util/testsuite_allocator.h: Same.
* testsuite/20_util/temporary_buffer.cc: Use typedef, qualify.
* testsuite/ext/pb_ds/regression/hash_data_map_rand.cc: Define
PB_DS_REGRESSION in the source file.
* testsuite/ext/pb_ds/regression/trie_data_map_rand.cc: Same.
* testsuite/ext/pb_ds/regression/list_update_no_data_map_rand.cc: Same.
* testsuite/ext/pb_ds/regression/tree_no_data_map_rand.cc: Same.
* testsuite/ext/pb_ds/regression/list_update_data_map_rand.cc: Same.
* testsuite/ext/pb_ds/regression/hash_no_data_map_rand.cc: Same.
* testsuite/ext/pb_ds/regression/priority_queue_rand.cc: Same.
* testsuite/ext/pb_ds/regression/tree_data_map_rand.cc: Same.
* testsuite/ext/pb_ds/regression/trie_no_data_map_rand.cc: Same.
* testsuite/21_strings/c_strings/wchar_t/3_neg.cc: Move to this.
Use _neg suffix.
* testsuite/21_strings/c_strings/wchar_t/3.cc: ...from this.
* testsuite/21_strings/c_strings/char/3_neg.cc: Same.
* testsuite/21_strings/c_strings/char/3.cc: Same.
* testsuite/ext/slist/23781_neg.cc: Same.
* testsuite/ext/slist/23781.cc: Same.
* testsuite/ext/profile/mutex_extensions.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/tr1/6_containers/tuple/comparison_operators/35480_neg.cc:
Same.
* testsuite/tr1/6_containers/tuple/comparison_operators/35480.cc: Same.
* testsuite/23_containers/multimap/23781_neg.cc: Same.
* testsuite/23_containers/multimap/23781.cc: Same.
* testsuite/23_containers/set/23781_neg.cc: Same.
* testsuite/23_containers/set/23781.cc: Same.
* testsuite/23_containers/multiset/23781_neg.cc: Same.
* testsuite/23_containers/multiset/23781.cc: Same.
* testsuite/23_containers/list/23781_neg.cc: Same.
* testsuite/23_containers/list/23781.cc: Same.
* testsuite/23_containers/map/23781_neg.cc: Same.
* testsuite/23_containers/map/23781.cc: Same.
* testsuite/20_util/duration/cons/dr974_neg.cc: Same.
* testsuite/20_util/duration/cons/dr974.cc: Same.
* testsuite/20_util/tuple/comparison_operators/35480_neg.cc: Same.
* testsuite/20_util/tuple/comparison_operators/35480.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820.cc: Same.
* testsuite/20_util/unique_ptr/cons/pointer_array_convertible_neg.cc:
Same.
* testsuite/20_util/unique_ptr/cons/pointer_array_convertible.cc: Same.
2010-12-15 Paolo Carlini <paolo.carlini@oracle.com> 2010-12-15 Paolo Carlini <paolo.carlini@oracle.com>
* include/ext/vstring.h (operator+(__versa_string<>&&, * include/ext/vstring.h (operator+(__versa_string<>&&,
......
libstdc++-v3/testsuite/20_util/temporary_buffer.cc
...@@ -28,7 +28,8 @@ int main(void) ...@@ -28,7 +28,8 @@ int main(void)
{ {
bool test __attribute__((unused)) = true; bool test __attribute__((unused)) = true;
std::pair<junk*,ptrdiff_t> results = std::get_temporary_buffer<junk>(5); typedef std::pair<junk*, std::ptrdiff_t> pair_type;
pair_type results = std::get_temporary_buffer<junk>(5);
if (results.second != 0) if (results.second != 0)
{ {
......
libstdc++-v3/testsuite/ext/pb_ds/regression/hash_data_map_rand.cc
// { dg-options "-DPB_DS_REGRESSION" } // { dg-require-time "" }
// This can take long on simulators, timing out the test.
// { dg-options "-DITERATIONS=5" { target simulator } }
// { dg-timeout-factor 2.0 }
// -*- C++ -*- // -*- C++ -*-
// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. // Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
...@@ -35,14 +39,11 @@ ...@@ -35,14 +39,11 @@
* Contains a random-operation test for maps and sets. * Contains a random-operation test for maps and sets.
*/ */
// { dg-require-time "" } #define PB_DS_REGRESSION
#include <regression/rand/assoc/rand_regression_test.hpp> #include <regression/rand/assoc/rand_regression_test.hpp>
#include <regression/common_type.hpp> #include <regression/common_type.hpp>
// This can take long on simulators, timing out the test.
// { dg-options "-DPB_DS_REGRESSION -DITERATIONS=5" { target simulator } }
// { dg-timeout-factor 2.0 }
#ifndef ITERATIONS #ifndef ITERATIONS
#define ITERATIONS 5000 #define ITERATIONS 5000
#endif #endif
......
libstdc++-v3/testsuite/ext/pb_ds/regression/hash_no_data_map_rand.cc
// { dg-options "-DPB_DS_REGRESSION" } // { dg-require-time "" }
// This can take long on simulators, timing out the test.
// { dg-options "-DITERATIONS=5" { target simulator } }
// { dg-timeout-factor 2.0 }
// -*- C++ -*- // -*- C++ -*-
// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. // Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
...@@ -35,14 +39,11 @@ ...@@ -35,14 +39,11 @@
* Contains a random-operation test for maps and sets. * Contains a random-operation test for maps and sets.
*/ */
// { dg-require-time "" } #define PB_DS_REGRESSION
#include <regression/rand/assoc/rand_regression_test.hpp> #include <regression/rand/assoc/rand_regression_test.hpp>
#include <regression/common_type.hpp> #include <regression/common_type.hpp>
// This can take long on simulators, timing out the test.
// { dg-options "-DPB_DS_REGRESSION -DITERATIONS=5" { target simulator } }
// { dg-timeout-factor 2.0 }
#ifndef ITERATIONS #ifndef ITERATIONS
#define ITERATIONS 5000 #define ITERATIONS 5000
#endif #endif
......
libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_data_map_rand.cc
// { dg-options "-DPB_DS_REGRESSION" } // { dg-require-time "" }
// -*- C++ -*- // -*- C++ -*-
// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. // Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
...@@ -35,7 +36,7 @@ ...@@ -35,7 +36,7 @@
* Contains a random-operation test for maps and sets. * Contains a random-operation test for maps and sets.
*/ */
// { dg-require-time "" } #define PB_DS_REGRESSION
#include <regression/rand/assoc/rand_regression_test.hpp> #include <regression/rand/assoc/rand_regression_test.hpp>
#include <regression/common_type.hpp> #include <regression/common_type.hpp>
......
libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_no_data_map_rand.cc
// { dg-options "-DPB_DS_REGRESSION" } // { dg-require-time "" }
// -*- C++ -*- // -*- C++ -*-
// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. // Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
...@@ -35,7 +36,7 @@ ...@@ -35,7 +36,7 @@
* Contains a random-operation test for maps and sets. * Contains a random-operation test for maps and sets.
*/ */
// { dg-require-time "" } #define PB_DS_REGRESSION
#include <regression/rand/assoc/rand_regression_test.hpp> #include <regression/rand/assoc/rand_regression_test.hpp>
#include <regression/common_type.hpp> #include <regression/common_type.hpp>
......
libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queue_rand.cc
// { dg-options "-DPB_DS_REGRESSION" } // { dg-require-time "" }
// This can take long on simulators, timing out the test.
// { dg-options "-DITERATIONS=5" { target simulator } }
// { dg-timeout-factor 2.0 }
// -*- C++ -*- // -*- C++ -*-
// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. // Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
...@@ -35,14 +39,11 @@ ...@@ -35,14 +39,11 @@
* Contains a random-operation test for priority queues. * Contains a random-operation test for priority queues.
*/ */
// { dg-require-time "" } #define PB_DS_REGRESSION
#include <regression/rand/priority_queue/rand_regression_test.hpp> #include <regression/rand/priority_queue/rand_regression_test.hpp>
#include <regression/common_type.hpp> #include <regression/common_type.hpp>
// This can take long on simulators, timing out the test.
// { dg-options "-DPB_DS_REGRESSION -DITERATIONS=5" { target simulator } }
// { dg-timeout-factor 2.0 }
#ifndef ITERATIONS #ifndef ITERATIONS
#define ITERATIONS 5000 #define ITERATIONS 5000
#endif #endif
......
libstdc++-v3/testsuite/ext/pb_ds/regression/tree_data_map_rand.cc
// { dg-options "-DPB_DS_REGRESSION" } // { dg-require-time "" }
// This can take long on simulators, timing out the test.
// { dg-options "-DITERATIONS=5" { target simulator } }
// { dg-timeout-factor 2.0 }
// -*- C++ -*- // -*- C++ -*-
// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. // Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
...@@ -35,14 +39,11 @@ ...@@ -35,14 +39,11 @@
* Contains a random-operation test for maps and sets. * Contains a random-operation test for maps and sets.
*/ */
// { dg-require-time "" } #define PB_DS_REGRESSION
#include <regression/rand/assoc/rand_regression_test.hpp> #include <regression/rand/assoc/rand_regression_test.hpp>
#include <regression/common_type.hpp> #include <regression/common_type.hpp>
// This can take long on simulators, timing out the test.
// { dg-options "-DPB_DS_REGRESSION -DITERATIONS=5" { target simulator } }
// { dg-timeout-factor 2.0 }
#ifndef ITERATIONS #ifndef ITERATIONS
#define ITERATIONS 5000 #define ITERATIONS 5000
#endif #endif
......
libstdc++-v3/testsuite/ext/pb_ds/regression/tree_no_data_map_rand.cc
// { dg-options "-DPB_DS_REGRESSION" } // { dg-require-time "" }
// This can take long on simulators, timing out the test.
// { dg-options "-DITERATIONS=5" { target simulator } }
// { dg-timeout-factor 2.0 }
// -*- C++ -*- // -*- C++ -*-
// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. // Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
...@@ -35,14 +39,11 @@ ...@@ -35,14 +39,11 @@
* Contains a random-operation test for maps and sets. * Contains a random-operation test for maps and sets.
*/ */
// { dg-require-time "" } #define PB_DS_REGRESSION
#include <regression/rand/assoc/rand_regression_test.hpp> #include <regression/rand/assoc/rand_regression_test.hpp>
#include <regression/common_type.hpp> #include <regression/common_type.hpp>
// This can take long on simulators, timing out the test.
// { dg-options "-DPB_DS_REGRESSION -DITERATIONS=5" { target simulator } }
// { dg-timeout-factor 2.0 }
#ifndef ITERATIONS #ifndef ITERATIONS
#define ITERATIONS 5000 #define ITERATIONS 5000
#endif #endif
......
libstdc++-v3/testsuite/ext/pb_ds/regression/trie_data_map_rand.cc
// { dg-options "-DPB_DS_REGRESSION" } // { dg-require-time "" }
// This can take long on simulators, timing out the test.
// { dg-options "-DITERATIONS=5" { target simulator } }
// { dg-timeout-factor 2.0 }
// -*- C++ -*- // -*- C++ -*-
// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. // Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
...@@ -35,14 +39,11 @@ ...@@ -35,14 +39,11 @@
* Contains a random-operation test for maps and sets. * Contains a random-operation test for maps and sets.
*/ */
// { dg-require-time "" } #define PB_DS_REGRESSION
#include <regression/rand/assoc/rand_regression_test.hpp> #include <regression/rand/assoc/rand_regression_test.hpp>
#include <regression/common_type.hpp> #include <regression/common_type.hpp>
// This can take long on simulators, timing out the test.
// { dg-options "-DPB_DS_REGRESSION -DITERATIONS=5" { target simulator } }
// { dg-timeout-factor 2.0 }
#ifndef ITERATIONS #ifndef ITERATIONS
#define ITERATIONS 5000 #define ITERATIONS 5000
#endif #endif
......
libstdc++-v3/testsuite/ext/pb_ds/regression/trie_no_data_map_rand.cc
// { dg-options "-DPB_DS_REGRESSION" } // { dg-require-time "" }
// This can take long on simulators, timing out the test.
// { dg-options "-DITERATIONS=5" { target simulator } }
// { dg-timeout-factor 2.0 }
// -*- C++ -*- // -*- C++ -*-
// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. // Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
// //
// This file is part of the GNU ISO C++ Library. This library is free // 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 terms // software; you can redistribute it and/or modify it under the terms
...@@ -35,14 +39,11 @@ ...@@ -35,14 +39,11 @@
* Contains a random-operation test for maps and sets. * Contains a random-operation test for maps and sets.
*/ */
// { dg-require-time "" } #define PB_DS_REGRESSION
#include <regression/rand/assoc/rand_regression_test.hpp> #include <regression/rand/assoc/rand_regression_test.hpp>
#include <regression/common_type.hpp> #include <regression/common_type.hpp>
// This can take long on simulators, timing out the test.
// { dg-options "-DPB_DS_REGRESSION -DITERATIONS=5" { target simulator } }
// { dg-timeout-factor 2.0 }
#ifndef ITERATIONS #ifndef ITERATIONS
#define ITERATIONS 5000 #define ITERATIONS 5000
#endif #endif
......
libstdc++-v3/testsuite/util/testsuite_allocator.h
...@@ -29,7 +29,10 @@ ...@@ -29,7 +29,10 @@
#include <tr1/unordered_map> #include <tr1/unordered_map>
#include <cassert> #include <cassert>
#ifdef __GXX_EXPERIMENTAL_CXX0X__
#include <bits/move.h> #include <bits/move.h>
#endif
namespace __gnu_test namespace __gnu_test
{ {
......
libstdc++-v3/testsuite/util/testsuite_iterators.h
...@@ -30,7 +30,10 @@ ...@@ -30,7 +30,10 @@
#include <testsuite_hooks.h> #include <testsuite_hooks.h>
#include <bits/stl_iterator_base_types.h> #include <bits/stl_iterator_base_types.h>
#ifdef __GXX_EXPERIMENTAL_CXX0X__
#include <bits/move.h> #include <bits/move.h>
#endif
#ifndef _TESTSUITE_ITERATORS #ifndef _TESTSUITE_ITERATORS
#define _TESTSUITE_ITERATORS #define _TESTSUITE_ITERATORS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment