diff options
7 files changed, 53 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d029913f59e..5166ceb8229 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,16 @@ +2009-03-22 Mark Mitchell <mark@codesourcery.com> + + * testsuite/25_algorithms/search_n/iterator.cc: Condition + iterations for simulators. + * testsuite/25_algorithms/heap/moveable.cc: Likewise. + * testsuite/21_strings/basic_string/inserters_extractors/char/28277.cc + Condition stream width for simulators. + * testsuite/27_io/basic_ostream/inserters_character/char/28277-3.cc: + Likewise. + * testsuite/27_io/basic_ostream/inserters_character/char/28277-4.cc: + Likewise. + * testsuite/ext/vstring/inserters_extractors/char/28277.cc: Likewise. + 2009-03-17 Benjamin Kosnik <bkoz@redhat.com> * doc/xml/manual/appendix_contributing.xml: Add docbook style diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/28277.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/28277.cc index 5f60c2ff627..b584fd2af62 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/28277.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/char/28277.cc @@ -18,12 +18,18 @@ // Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, // USA. +// { dg-options "-DWIDTH=200000" { target simulator } } + // 21.3.7.9 inserters and extractors #include <ostream> #include <sstream> #include <testsuite_hooks.h> +#ifndef WIDTH +#define WIDTH 20000000 +#endif + // libstdc++/28277 void test01() { @@ -33,7 +39,7 @@ void test01() ostringstream oss_01; const string str_01(50, 'a'); - oss_01.width(20000000); + oss_01.width(WIDTH); const streamsize width = oss_01.width(); oss_01 << str_01; diff --git a/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc index ee04793e66e..55bb1b55ba4 100644 --- a/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc +++ b/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc @@ -18,6 +18,8 @@ // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, // USA. +// { dg-options "-std=gnu++0x -DITERATIONS=5" { target simulator } } + // 25.3.6 Heap operations [lib.alg.heap.operations] #undef _GLIBCXX_CONCEPT_CHECKS @@ -28,6 +30,10 @@ #include <testsuite_iterators.h> #include <testsuite_rvalref.h> +#ifndef ITERATIONS +#define ITERATIONS 9 +#endif + using __gnu_test::test_container; using __gnu_test::random_access_iterator_wrapper; using __gnu_test::rvalstruct; @@ -115,7 +121,7 @@ void test01() { int array[9]; - for (int i = 1; i < 9; ++i) + for (int i = 1; i < ITERATIONS; ++i) { for(int z = 0; z < i; ++z) array[z] = z; diff --git a/libstdc++-v3/testsuite/25_algorithms/search_n/iterator.cc b/libstdc++-v3/testsuite/25_algorithms/search_n/iterator.cc index 2a9b0f42a09..1cc8e875a04 100644 --- a/libstdc++-v3/testsuite/25_algorithms/search_n/iterator.cc +++ b/libstdc++-v3/testsuite/25_algorithms/search_n/iterator.cc @@ -16,6 +16,8 @@ // Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, // USA. +// { dg-options "-DTEST_DEPTH=10" { target simulator } } + // 25 algorithms, search_n #include <algorithm> @@ -23,7 +25,10 @@ #include <testsuite_hooks.h> #include <testsuite_iterators.h> +#ifndef TEST_DEPTH #define TEST_DEPTH 14 +#endif + int array1[11] = {0, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0}; int array2[TEST_DEPTH]; diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/28277-3.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/28277-3.cc index 9c68320bf17..19ec9286309 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/28277-3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/28277-3.cc @@ -18,12 +18,18 @@ // Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, // USA. +// { dg-options "-DWIDTH=200000" { target simulator } } + // 27.6.2.5.4 basic_ostream character inserters #include <ostream> #include <sstream> #include <testsuite_hooks.h> +#ifndef WIDTH +#define WIDTH 20000000 +#endif + // libstdc++/28277 void test01() { @@ -32,7 +38,7 @@ void test01() ostringstream oss_01; - oss_01.width(20000000); + oss_01.width(WIDTH); const streamsize width = oss_01.width(); oss_01 << 'a'; diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/28277-4.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/28277-4.cc index 3ef1f8c4362..1b15d83ae2b 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/28277-4.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/28277-4.cc @@ -18,12 +18,18 @@ // Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, // USA. +// { dg-options "-DWIDTH=200000" { target simulator } } + // 27.6.2.5.4 basic_ostream character inserters #include <ostream> #include <sstream> #include <testsuite_hooks.h> +#ifndef WIDTH +#define WIDTH 20000000 +#endif + // libstdc++/28277 void test01() { @@ -33,7 +39,7 @@ void test01() ostringstream oss_01; const string str_01(50, 'a'); - oss_01.width(20000000); + oss_01.width(WIDTH); const streamsize width = oss_01.width(); oss_01 << str_01.c_str(); diff --git a/libstdc++-v3/testsuite/ext/vstring/inserters_extractors/char/28277.cc b/libstdc++-v3/testsuite/ext/vstring/inserters_extractors/char/28277.cc index eb506b0c81d..e666699567b 100644 --- a/libstdc++-v3/testsuite/ext/vstring/inserters_extractors/char/28277.cc +++ b/libstdc++-v3/testsuite/ext/vstring/inserters_extractors/char/28277.cc @@ -18,11 +18,17 @@ // Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, // USA. +// { dg-options "-DWIDTH=200000" { target simulator } } + #include <ostream> #include <sstream> #include <ext/vstring.h> #include <testsuite_hooks.h> +#ifndef WIDTH +#define WIDTH 20000000 +#endif + // libstdc++/28277 void test01() { @@ -32,7 +38,7 @@ void test01() ostringstream oss_01; const __gnu_cxx::__vstring str_01(50, 'a'); - oss_01.width(20000000); + oss_01.width(WIDTH); const streamsize width = oss_01.width(); oss_01 << str_01; |