3.cc: Shrink memory usage under simulator.

2012-12-14  Steve Ellcey  <sellcey@mips.com>

	* testsuite/21_strings/basic_string/append/wchar_t/3.cc: Shrink
	memory usage under simulator.
	* testsuite/21_strings/basic_string/cons/wchar_t/6.cc: Ditto.
	* testsuite/21_strings/basic_string/inserters_extractors/wchar_t/10.cc:
	Ditto.
	* testsuite/21_strings/basic_string/inserters_extractors/wchar_t/11.cc:
	Ditto.

From-SVN: r194510

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 84034d31b28543e90fc2ff8e50c30b4f1d21bb3f..4016c171c9dd02191cf9af4884736327e47c3431 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,13 @@
+2012-12-14  Steve Ellcey  <sellcey@mips.com>
+
+       * testsuite/21_strings/basic_string/append/wchar_t/3.cc: Shrink
+       memory usage under simulator.
+       * testsuite/21_strings/basic_string/cons/wchar_t/6.cc: Ditto.
+       * testsuite/21_strings/basic_string/inserters_extractors/wchar_t/10.cc:
+       Ditto.
+       * testsuite/21_strings/basic_string/inserters_extractors/wchar_t/11.cc:
+       Ditto.
+
 2012-12-13  Steve Ellcey  <sellcey@mips.com>
 
        * testsuite/21_strings/basic_string/capacity/char/18654.cc: Shrink

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/append/wchar_t/3.cc b/libstdc++-v3/testsuite/21_strings/basic_string/append/wchar_t/3.cc
index dca5dbdaf3f81313180732d1be2b3a9724d4f955..d20b994bf526693f614a6588395f42ca2139b2c1 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/append/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/append/wchar_t/3.cc
@@ -19,6 +19,12 @@
 
 // 21.3.5 string modifiers
 
+// { dg-options "-DITERATIONS=14" { target simulator } }
+
+#ifndef ITERATIONS
+#define ITERATIONS 18
+#endif
+
 #include <string>
 #include <testsuite_hooks.h>
 
@@ -37,7 +43,7 @@ test03()
     {
       wstring one(source);
       wstring two(source);
-      for (unsigned j = 0; j < 18; ++j)
+      for (unsigned j = 0; j < ITERATIONS; ++j)
        {
          VERIFY( one == two );
          one.append(one);

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/6.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/6.cc
index 82ed764ddc22534f56e420d19dcf74a7eb97406f..95acdd03e379a6a840d69fa0220d31b6752dbcb9 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/6.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/6.cc
@@ -19,6 +19,12 @@
 
 // 21.3.1 basic_string constructors.
 
+// { dg-options "-DITERATIONS=11" { target simulator } }
+
+#ifndef ITERATIONS
+#define ITERATIONS 13
+#endif
+
 #include <iterator>
 #include <sstream>
 #include <cstdlib>
@@ -50,6 +56,6 @@ void test01(int iter)
 
 int main()
 {
-  test01(13);
+  test01(ITERATIONS);
   return 0;
 }

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/10.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/10.cc
index 0883e13c383f69dd7dc261d4c82574f826600e4d..a647c390a332c3f61713935bfe890d669c5b6cac 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/10.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/10.cc
@@ -17,6 +17,12 @@
 
 // 21.3.7.9 inserters and extractors
 
+// { dg-options "-DMAX_SIZE=505" { target simulator } }
+
+#ifndef MAX_SIZE
+#define MAX_SIZE 777
+#endif
+
 #include <istream>
 #include <string>
 #include <fstream>
@@ -64,7 +70,7 @@ void test01()
 
   const wchar_t delim = L'|';
   const unsigned nchunks = 10;
-  const wstring data = prepare(777, nchunks, delim);
+  const wstring data = prepare(MAX_SIZE, nchunks, delim);
 
   wofstream ofstrm;
   ofstrm.open(filename);

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/11.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/11.cc
index 2f174cad467209268bdfda5a4db541f92aeede3c..a0a822ffe16728fe8445eeb92eeaf7f8abdba34b 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/11.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/11.cc
@@ -17,6 +17,12 @@
 
 // 21.3.7.9 inserters and extractors
 
+// { dg-options "-DMAX_SIZE=466" { target simulator } }
+
+#ifndef MAX_SIZE
+#define MAX_SIZE 666
+#endif
+
 #include <istream>
 #include <string>
 #include <fstream>
@@ -63,7 +69,7 @@ void test01()
   const char filename[] = "inserters_extractors-3.txt";
 
   const unsigned nchunks = 10;
-  const wstring data = prepare(666, nchunks);
+  const wstring data = prepare(MAX_SIZE, nchunks);
 
   wofstream ofstrm;
   ofstrm.open(filename);