* 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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121682 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0e36c97..795146d 100644 (file)
--- 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 2120f5b..ad80901 100644 (file)
--- 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 10a3518..b07863b 100644 (file)
--- 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 d981483..d82813e 100644 (file)
--- 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 76753ad..652774a 100644 (file)
--- 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 aae3971..67e5b6f 100644 (file)
--- 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 8ffabd2..645d2ee 100644 (file)
--- 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 57fe8dc..1e3a3db 100644 (file)
--- 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 fa64607..90e4fc6 100644 (file)
--- 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 eec51df..cd1991e 100644 (file)
--- 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());
 }