diff options
| author | Steve Ellcey <sellcey@mips.com> | 2012-12-14 22:03:40 +0000 |
|---|---|---|
| committer | Steve Ellcey <sje@gcc.gnu.org> | 2012-12-14 22:03:40 +0000 |
| commit | 2993114da51f06bae9a836e9401128916033ddfb (patch) | |
| tree | 0a328725f156e5c96fdb1aaeb6604cf9c68aa49f | |
| parent | 8b299be64a9f9ba67a33c16f16302e77917afa62 (diff) | |
| download | gcc-2993114da51f06bae9a836e9401128916033ddfb.zip gcc-2993114da51f06bae9a836e9401128916033ddfb.tar.gz gcc-2993114da51f06bae9a836e9401128916033ddfb.tar.bz2 | |
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
5 files changed, 38 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 84034d3..4016c17 100644 --- 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 dca5dbd..d20b994 100644 --- 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 82ed764..95acdd0 100644 --- 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 0883e13..a647c39 100644 --- 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 2f174ca..a0a822f 100644 --- 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); |