iterator.cc: Condition iterations for simulators.

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

From-SVN: r144999

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d029913f59e62cdc42727616e4edbb3e2e8eebb4..5166ceb8229744e36ad11647c9070e670f80f19f 100644 (file)
--- 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 5f60c2ff62729bd3860e623263285a5608254094..b584fd2af6277353470d3a22c5b9273c897e9aad 100644 (file)
--- 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 ee04793e66e483b4c180258dfbfd16722d59bb12..55bb1b55ba4ec464e1435dfb46af422ae1ff8a5f 100644 (file)
--- 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 2a9b0f42a0929baf3d15333ae0c6faf2afee3410..1cc8e875a0423a3eecb7b6a62866593fc66852f0 100644 (file)
--- 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 9c68320bf1717ef797e59ae8975f036393f7eae1..19ec928630939a6867299ee825a234423d84e5c6 100644 (file)
--- 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 3ef1f8c43624f6e2c50901f621c5a180a045d0b4..1b15d83ae2b14555944daa67294366f4b2a64e59 100644 (file)
--- 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 eb506b0c81d689b8be60463c6465fbbb40bf19e6..e666699567b39deae1abc772edf115391d1dea33 100644 (file)
--- 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;