diff options
10 files changed, 92 insertions, 9 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0e36c977831..795146d4557 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,18 @@ +2007-02-07 Hans-Peter Nilsson <hp@axis.com> + + * testsuite/27_io/basic_stringbuf/overflow/char/1.cc: Use only + 10000 iterations for simulator targets. + * testsuite/ext/pb_ds/regression/tree_data_map_rand.cc: Use only 5 + iterations for simulator targets. + * testsuite/ext/pb_ds/regression/tree_no_data_map_rand.cc: Ditto. + * testsuite/ext/pb_ds/regression/trie_data_map_rand.cc: Ditto. + * testsuite/ext/pb_ds/regression/trie_no_data_map_rand.cc: Ditto. + * testsuite/ext/pb_ds/regression/hash_no_data_map_rand.cc: Ditto. + * testsuite/ext/pb_ds/regression/hash_data_map_rand.cc: Ditto. + * testsuite/ext/pb_ds/regression/priority_queue_rand.cc: Ditto. + * testsuite/23_containers/set/modifiers/16728.cc: Use only 10 + iterations for simulator targets. + 2007-02-06 Benjamin Kosnik <bkoz@redhat.com> Marco Trudel <mtrudel@gmx.ch> diff --git a/libstdc++-v3/testsuite/23_containers/set/modifiers/16728.cc b/libstdc++-v3/testsuite/23_containers/set/modifiers/16728.cc index 2120f5bbff7..ad80901e4d6 100644 --- a/libstdc++-v3/testsuite/23_containers/set/modifiers/16728.cc +++ b/libstdc++-v3/testsuite/23_containers/set/modifiers/16728.cc @@ -38,8 +38,14 @@ using namespace std; typedef int test_type; +// This can take extremely long on simulators, timing out the test. +// { dg-options "-DITERATIONS=10" { target simulator } } +#ifndef ITERATIONS +#define ITERATIONS 10000 +#endif + // The number of iterations to be performed. -int iterations = 10000; +int iterations = ITERATIONS; // The number of values to insert in the container, 32 will cause 5 // (re)allocations to be performed (sizes 4, 8, 16, 32 and 64) diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/char/1.cc index 10a35185a12..b07863b18fb 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/char/1.cc @@ -50,8 +50,14 @@ test01(unsigned iter) } } +// This can take long on simulators, timing out the test. +// { dg-options "-DITERATIONS=10000" { target simulator } } +#ifndef ITERATIONS +#define ITERATIONS 10000000 +#endif + int main() { - test01(10000000); + test01(ITERATIONS); return 0; } 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 d9814830b7e..d82813e729a 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 @@ -48,13 +48,21 @@ #include <regression/rand/assoc/rand_regression_test.hpp> #include <regression/assoc/common_type.hpp> +// This can take long on simulators, timing out the test. +// { dg-options "-DPB_DS_REGRESSION -DITERATIONS=5" { target simulator } } +#ifndef ITERATIONS +#define ITERATIONS 5000 +#endif +#ifndef KEYS +#define KEYS 10000 +#endif int main(int argc, char* a_p_argv[]) { using namespace pb_ds::test; typedef hash_map_tl_t map_tl_t; - return rand_regression_test(5000, 10000, + return rand_regression_test(ITERATIONS, KEYS, "hash_data_map_rand_regression_test", map_tl_t()); } 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 76753ad0114..652774a39aa 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 @@ -48,13 +48,21 @@ #include <regression/rand/assoc/rand_regression_test.hpp> #include <regression/assoc/common_type.hpp> +// This can take long on simulators, timing out the test. +// { dg-options "-DPB_DS_REGRESSION -DITERATIONS=5" { target simulator } } +#ifndef ITERATIONS +#define ITERATIONS 5000 +#endif +#ifndef KEYS +#define KEYS 10000 +#endif int main(int argc, char* a_p_argv[]) { using namespace pb_ds::test; typedef hash_set_tl_t map_tl_t; - return rand_regression_test(5000, 10000, + return rand_regression_test(ITERATIONS, KEYS, "hash_no_data_map_rand_regression_test", map_tl_t()); } 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 aae3971fa2d..67e5b6f455a 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 @@ -48,11 +48,19 @@ #include <regression/rand/priority_queue/rand_regression_test.hpp> #include <regression/priority_queue/common_type.hpp> +// This can take long on simulators, timing out the test. +// { dg-options "-DPB_DS_REGRESSION -DITERATIONS=5" { target simulator } } +#ifndef ITERATIONS +#define ITERATIONS 5000 +#endif +#ifndef KEYS +#define KEYS 10000 +#endif int main(int argc, char* a_p_argv[]) { using namespace pb_ds::test; - return rand_regression_test(5000, 10000, + return rand_regression_test(ITERATIONS, KEYS, "tree_no_data_map_rand_regression_test", pq_tl_t()); } 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 8ffabd22a53..645d2eecd05 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 @@ -48,13 +48,21 @@ #include <regression/rand/assoc/rand_regression_test.hpp> #include <regression/assoc/common_type.hpp> +// This can take long on simulators, timing out the test. +// { dg-options "-DPB_DS_REGRESSION -DITERATIONS=5" { target simulator } } +#ifndef ITERATIONS +#define ITERATIONS 5000 +#endif +#ifndef KEYS +#define KEYS 10000 +#endif int main(int argc, char* a_p_argv[]) { using namespace pb_ds::test; typedef tree_map_tl_t map_tl_t; - return rand_regression_test(5000, 10000, + return rand_regression_test(ITERATIONS, KEYS, "tree_data_map_rand_regression_test", map_tl_t()); } 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 57fe8dcff9f..1e3a3dbe05e 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 @@ -48,13 +48,21 @@ #include <regression/rand/assoc/rand_regression_test.hpp> #include <regression/assoc/common_type.hpp> +// This can take long on simulators, timing out the test. +// { dg-options "-DPB_DS_REGRESSION -DITERATIONS=5" { target simulator } } +#ifndef ITERATIONS +#define ITERATIONS 5000 +#endif +#ifndef KEYS +#define KEYS 10000 +#endif int main(int argc, char* a_p_argv[]) { using namespace pb_ds::test; typedef tree_set_tl_t map_tl_t; - return rand_regression_test(5000, 10000, + return rand_regression_test(ITERATIONS, KEYS, "tree_no_data_map_rand_regression_test", map_tl_t()); } 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 fa64607d1a3..90e4fc6129f 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 @@ -48,13 +48,21 @@ #include <regression/rand/assoc/rand_regression_test.hpp> #include <regression/assoc/common_type.hpp> +// This can take long on simulators, timing out the test. +// { dg-options "-DPB_DS_REGRESSION -DITERATIONS=5" { target simulator } } +#ifndef ITERATIONS +#define ITERATIONS 5000 +#endif +#ifndef KEYS +#define KEYS 10000 +#endif int main(int argc, char* a_p_argv[]) { using namespace pb_ds::test; typedef trie_map_tl_t map_tl_t; - return rand_regression_test(5000, 10000, + return rand_regression_test(ITERATIONS, KEYS, "trie_data_map_rand_regression_test", map_tl_t()); } 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 eec51dfa017..cd1991e73c5 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 @@ -48,13 +48,21 @@ #include <regression/rand/assoc/rand_regression_test.hpp> #include <regression/assoc/common_type.hpp> +// This can take long on simulators, timing out the test. +// { dg-options "-DPB_DS_REGRESSION -DITERATIONS=5" { target simulator } } +#ifndef ITERATIONS +#define ITERATIONS 5000 +#endif +#ifndef KEYS +#define KEYS 10000 +#endif int main(int argc, char* a_p_argv[]) { using namespace pb_ds::test; typedef trie_set_tl_t map_tl_t; - return rand_regression_test(5000, 10000, + return rand_regression_test(ITERATIONS, KEYS, "trie_no_data_map_rand_regression_test", map_tl_t()); } |