From 0450dd6c7b7f104bc1768f63edf7446f77c8a5ff Mon Sep 17 00:00:00 2001 From: bkoz Date: Thu, 16 Dec 2010 22:02:38 +0000 Subject: [PATCH] 2010-11-16 Benjamin Kosnik * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@167956 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 52 ++++++++++++++++++++++ .../duration/cons/{dr974.cc => dr974_neg.cc} | 0 .../shared_ptr/cons/{43820.cc => 43820_neg.cc} | 0 libstdc++-v3/testsuite/20_util/temporary_buffer.cc | 3 +- .../{35480.cc => 35480_neg.cc} | 0 ...ertible.cc => pointer_array_convertible_neg.cc} | 0 .../21_strings/c_strings/char/{3.cc => 3_neg.cc} | 0 .../c_strings/wchar_t/{3.cc => 3_neg.cc} | 0 .../23_containers/list/{23781.cc => 23781_neg.cc} | 0 .../23_containers/map/{23781.cc => 23781_neg.cc} | 0 .../multimap/{23781.cc => 23781_neg.cc} | 0 .../multiset/{23781.cc => 23781_neg.cc} | 0 .../23_containers/set/{23781.cc => 23781_neg.cc} | 0 .../ext/pb_ds/regression/hash_data_map_rand.cc | 11 ++--- .../ext/pb_ds/regression/hash_no_data_map_rand.cc | 11 ++--- .../pb_ds/regression/list_update_data_map_rand.cc | 5 ++- .../regression/list_update_no_data_map_rand.cc | 5 ++- .../ext/pb_ds/regression/priority_queue_rand.cc | 11 ++--- .../ext/pb_ds/regression/tree_data_map_rand.cc | 11 ++--- .../ext/pb_ds/regression/tree_no_data_map_rand.cc | 11 ++--- .../ext/pb_ds/regression/trie_data_map_rand.cc | 11 ++--- .../ext/pb_ds/regression/trie_no_data_map_rand.cc | 13 +++--- ...mutex_extensions.cc => mutex_extensions_neg.cc} | 0 .../testsuite/ext/slist/{23781.cc => 23781_neg.cc} | 0 .../shared_ptr/cons/{43820.cc => 43820_neg.cc} | 0 .../{35480.cc => 35480_neg.cc} | 0 libstdc++-v3/testsuite/util/testsuite_allocator.h | 3 ++ libstdc++-v3/testsuite/util/testsuite_iterators.h | 3 ++ 28 files changed, 109 insertions(+), 41 deletions(-) rename libstdc++-v3/testsuite/20_util/duration/cons/{dr974.cc => dr974_neg.cc} (100%) rename libstdc++-v3/testsuite/20_util/shared_ptr/cons/{43820.cc => 43820_neg.cc} (100%) rename libstdc++-v3/testsuite/20_util/tuple/comparison_operators/{35480.cc => 35480_neg.cc} (100%) rename libstdc++-v3/testsuite/20_util/unique_ptr/cons/{pointer_array_convertible.cc => pointer_array_convertible_neg.cc} (100%) rename libstdc++-v3/testsuite/21_strings/c_strings/char/{3.cc => 3_neg.cc} (100%) rename libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/{3.cc => 3_neg.cc} (100%) rename libstdc++-v3/testsuite/23_containers/list/{23781.cc => 23781_neg.cc} (100%) rename libstdc++-v3/testsuite/23_containers/map/{23781.cc => 23781_neg.cc} (100%) rename libstdc++-v3/testsuite/23_containers/multimap/{23781.cc => 23781_neg.cc} (100%) rename libstdc++-v3/testsuite/23_containers/multiset/{23781.cc => 23781_neg.cc} (100%) rename libstdc++-v3/testsuite/23_containers/set/{23781.cc => 23781_neg.cc} (100%) rename libstdc++-v3/testsuite/ext/profile/{mutex_extensions.cc => mutex_extensions_neg.cc} (100%) rename libstdc++-v3/testsuite/ext/slist/{23781.cc => 23781_neg.cc} (100%) rename libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/{43820.cc => 43820_neg.cc} (100%) rename libstdc++-v3/testsuite/tr1/6_containers/tuple/comparison_operators/{35480.cc => 35480_neg.cc} (100%) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 08fdfa369ed..4a0bcdd62cf 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,55 @@ +2010-11-16 Benjamin Kosnik + + * 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 * include/ext/vstring.h (operator+(__versa_string<>&&, diff --git a/libstdc++-v3/testsuite/20_util/duration/cons/dr974.cc b/libstdc++-v3/testsuite/20_util/duration/cons/dr974_neg.cc similarity index 100% rename from libstdc++-v3/testsuite/20_util/duration/cons/dr974.cc rename to libstdc++-v3/testsuite/20_util/duration/cons/dr974_neg.cc diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/43820.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/43820_neg.cc similarity index 100% rename from libstdc++-v3/testsuite/20_util/shared_ptr/cons/43820.cc rename to libstdc++-v3/testsuite/20_util/shared_ptr/cons/43820_neg.cc diff --git a/libstdc++-v3/testsuite/20_util/temporary_buffer.cc b/libstdc++-v3/testsuite/20_util/temporary_buffer.cc index 7266f9e2da2..b6e3d448a95 100644 --- a/libstdc++-v3/testsuite/20_util/temporary_buffer.cc +++ b/libstdc++-v3/testsuite/20_util/temporary_buffer.cc @@ -28,7 +28,8 @@ int main(void) { bool test __attribute__((unused)) = true; - std::pair results = std::get_temporary_buffer(5); + typedef std::pair pair_type; + pair_type results = std::get_temporary_buffer(5); if (results.second != 0) { diff --git a/libstdc++-v3/testsuite/20_util/tuple/comparison_operators/35480.cc b/libstdc++-v3/testsuite/20_util/tuple/comparison_operators/35480_neg.cc similarity index 100% rename from libstdc++-v3/testsuite/20_util/tuple/comparison_operators/35480.cc rename to libstdc++-v3/testsuite/20_util/tuple/comparison_operators/35480_neg.cc diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/cons/pointer_array_convertible.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/cons/pointer_array_convertible_neg.cc similarity index 100% rename from libstdc++-v3/testsuite/20_util/unique_ptr/cons/pointer_array_convertible.cc rename to libstdc++-v3/testsuite/20_util/unique_ptr/cons/pointer_array_convertible_neg.cc diff --git a/libstdc++-v3/testsuite/21_strings/c_strings/char/3.cc b/libstdc++-v3/testsuite/21_strings/c_strings/char/3_neg.cc similarity index 100% rename from libstdc++-v3/testsuite/21_strings/c_strings/char/3.cc rename to libstdc++-v3/testsuite/21_strings/c_strings/char/3_neg.cc diff --git a/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3.cc b/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3_neg.cc similarity index 100% rename from libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3.cc rename to libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3_neg.cc diff --git a/libstdc++-v3/testsuite/23_containers/list/23781.cc b/libstdc++-v3/testsuite/23_containers/list/23781_neg.cc similarity index 100% rename from libstdc++-v3/testsuite/23_containers/list/23781.cc rename to libstdc++-v3/testsuite/23_containers/list/23781_neg.cc diff --git a/libstdc++-v3/testsuite/23_containers/map/23781.cc b/libstdc++-v3/testsuite/23_containers/map/23781_neg.cc similarity index 100% rename from libstdc++-v3/testsuite/23_containers/map/23781.cc rename to libstdc++-v3/testsuite/23_containers/map/23781_neg.cc diff --git a/libstdc++-v3/testsuite/23_containers/multimap/23781.cc b/libstdc++-v3/testsuite/23_containers/multimap/23781_neg.cc similarity index 100% rename from libstdc++-v3/testsuite/23_containers/multimap/23781.cc rename to libstdc++-v3/testsuite/23_containers/multimap/23781_neg.cc diff --git a/libstdc++-v3/testsuite/23_containers/multiset/23781.cc b/libstdc++-v3/testsuite/23_containers/multiset/23781_neg.cc similarity index 100% rename from libstdc++-v3/testsuite/23_containers/multiset/23781.cc rename to libstdc++-v3/testsuite/23_containers/multiset/23781_neg.cc diff --git a/libstdc++-v3/testsuite/23_containers/set/23781.cc b/libstdc++-v3/testsuite/23_containers/set/23781_neg.cc similarity index 100% rename from libstdc++-v3/testsuite/23_containers/set/23781.cc rename to libstdc++-v3/testsuite/23_containers/set/23781_neg.cc diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_data_map_rand.cc index bdbeb806716..4e48bd85fd6 100644 --- a/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_data_map_rand.cc +++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_data_map_rand.cc @@ -1,4 +1,8 @@ -// { 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++ -*- // Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. @@ -35,14 +39,11 @@ * Contains a random-operation test for maps and sets. */ -// { dg-require-time "" } +#define PB_DS_REGRESSION #include #include -// 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 #define ITERATIONS 5000 #endif diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_no_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_no_data_map_rand.cc index 20908404f6a..ef4352716a6 100644 --- a/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_no_data_map_rand.cc +++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_no_data_map_rand.cc @@ -1,4 +1,8 @@ -// { 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++ -*- // Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. @@ -35,14 +39,11 @@ * Contains a random-operation test for maps and sets. */ -// { dg-require-time "" } +#define PB_DS_REGRESSION #include #include -// 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 #define ITERATIONS 5000 #endif diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_data_map_rand.cc index b9761b9ad32..8bd77816c02 100644 --- a/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_data_map_rand.cc +++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_data_map_rand.cc @@ -1,4 +1,5 @@ -// { dg-options "-DPB_DS_REGRESSION" } +// { dg-require-time "" } + // -*- C++ -*- // Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. @@ -35,7 +36,7 @@ * Contains a random-operation test for maps and sets. */ -// { dg-require-time "" } +#define PB_DS_REGRESSION #include #include diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_no_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_no_data_map_rand.cc index dea56152127..72273a8bc37 100644 --- a/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_no_data_map_rand.cc +++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_no_data_map_rand.cc @@ -1,4 +1,5 @@ -// { dg-options "-DPB_DS_REGRESSION" } +// { dg-require-time "" } + // -*- C++ -*- // Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. @@ -35,7 +36,7 @@ * Contains a random-operation test for maps and sets. */ -// { dg-require-time "" } +#define PB_DS_REGRESSION #include #include diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queue_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queue_rand.cc index c8ec66ce366..b21f486d6d7 100644 --- a/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queue_rand.cc +++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queue_rand.cc @@ -1,4 +1,8 @@ -// { 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++ -*- // Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. @@ -35,14 +39,11 @@ * Contains a random-operation test for priority queues. */ -// { dg-require-time "" } +#define PB_DS_REGRESSION #include #include -// 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 #define ITERATIONS 5000 #endif diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_data_map_rand.cc index 81b46fe6362..8d5869a2047 100644 --- a/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_data_map_rand.cc +++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_data_map_rand.cc @@ -1,4 +1,8 @@ -// { 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++ -*- // Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. @@ -35,14 +39,11 @@ * Contains a random-operation test for maps and sets. */ -// { dg-require-time "" } +#define PB_DS_REGRESSION #include #include -// 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 #define ITERATIONS 5000 #endif diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_no_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_no_data_map_rand.cc index 7e3cbedbecc..8af31e0a265 100644 --- a/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_no_data_map_rand.cc +++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_no_data_map_rand.cc @@ -1,4 +1,8 @@ -// { 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++ -*- // Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. @@ -35,14 +39,11 @@ * Contains a random-operation test for maps and sets. */ -// { dg-require-time "" } +#define PB_DS_REGRESSION #include #include -// 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 #define ITERATIONS 5000 #endif diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_data_map_rand.cc index 64fcb665f42..26f4325c62e 100644 --- a/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_data_map_rand.cc +++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_data_map_rand.cc @@ -1,4 +1,8 @@ -// { 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++ -*- // Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. @@ -35,14 +39,11 @@ * Contains a random-operation test for maps and sets. */ -// { dg-require-time "" } +#define PB_DS_REGRESSION #include #include -// 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 #define ITERATIONS 5000 #endif diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_no_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_no_data_map_rand.cc index 714b43730a0..a0e1b5f281a 100644 --- a/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_no_data_map_rand.cc +++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_no_data_map_rand.cc @@ -1,7 +1,11 @@ -// { 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++ -*- -// 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 // software; you can redistribute it and/or modify it under the terms @@ -35,14 +39,11 @@ * Contains a random-operation test for maps and sets. */ -// { dg-require-time "" } +#define PB_DS_REGRESSION #include #include -// 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 #define ITERATIONS 5000 #endif diff --git a/libstdc++-v3/testsuite/ext/profile/mutex_extensions.cc b/libstdc++-v3/testsuite/ext/profile/mutex_extensions_neg.cc similarity index 100% rename from libstdc++-v3/testsuite/ext/profile/mutex_extensions.cc rename to libstdc++-v3/testsuite/ext/profile/mutex_extensions_neg.cc diff --git a/libstdc++-v3/testsuite/ext/slist/23781.cc b/libstdc++-v3/testsuite/ext/slist/23781_neg.cc similarity index 100% rename from libstdc++-v3/testsuite/ext/slist/23781.cc rename to libstdc++-v3/testsuite/ext/slist/23781_neg.cc diff --git a/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/43820.cc b/libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc similarity index 100% rename from libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/43820.cc rename to libstdc++-v3/testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc diff --git a/libstdc++-v3/testsuite/tr1/6_containers/tuple/comparison_operators/35480.cc b/libstdc++-v3/testsuite/tr1/6_containers/tuple/comparison_operators/35480_neg.cc similarity index 100% rename from libstdc++-v3/testsuite/tr1/6_containers/tuple/comparison_operators/35480.cc rename to libstdc++-v3/testsuite/tr1/6_containers/tuple/comparison_operators/35480_neg.cc diff --git a/libstdc++-v3/testsuite/util/testsuite_allocator.h b/libstdc++-v3/testsuite/util/testsuite_allocator.h index cb481b2a7f9..a534d85845d 100644 --- a/libstdc++-v3/testsuite/util/testsuite_allocator.h +++ b/libstdc++-v3/testsuite/util/testsuite_allocator.h @@ -29,7 +29,10 @@ #include #include + +#ifdef __GXX_EXPERIMENTAL_CXX0X__ #include +#endif namespace __gnu_test { diff --git a/libstdc++-v3/testsuite/util/testsuite_iterators.h b/libstdc++-v3/testsuite/util/testsuite_iterators.h index e7a068d208d..d815b6c570f 100644 --- a/libstdc++-v3/testsuite/util/testsuite_iterators.h +++ b/libstdc++-v3/testsuite/util/testsuite_iterators.h @@ -30,7 +30,10 @@ #include #include + +#ifdef __GXX_EXPERIMENTAL_CXX0X__ #include +#endif #ifndef _TESTSUITE_ITERATORS #define _TESTSUITE_ITERATORS -- 2.11.0