From 01f4c821945d7f96f5f24cde63fce64ca0ef88a9 Mon Sep 17 00:00:00 2001
From: Steve Ellcey <sellcey@mips.com>
Date: Thu, 13 Dec 2012 19:55:13 +0000
Subject: [PATCH] 18654.cc: Shrink memory usage under simulator.
2012-12-13 Steve Ellcey <sellcey@mips.com>
* testsuite/21_strings/basic_string/capacity/char/18654.cc: Shrink
memory usage under simulator.
* testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc: Ditto.
* testsuite/22_locale/collate/transform/char/28277.cc: Ditto.
* testsuite/22_locale/collate/transform/wchar_t/28277.cc: Ditto.
From-SVN: r194488
---
libstdc++-v3/ChangeLog | 8 ++++++++
.../21_strings/basic_string/capacity/char/18654.cc | 8 +++++++-
.../21_strings/basic_string/capacity/wchar_t/18654.cc | 8 +++++++-
.../testsuite/22_locale/collate/transform/char/28277.cc | 8 +++++++-
.../22_locale/collate/transform/wchar_t/28277.cc | 8 +++++++-
5 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bde112313576..84034d31b285 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2012-12-13 Steve Ellcey <sellcey@mips.com>
+
+ * testsuite/21_strings/basic_string/capacity/char/18654.cc: Shrink
+ memory usage under simulator.
+ * testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc: Ditto.
+ * testsuite/22_locale/collate/transform/char/28277.cc: Ditto.
+ * testsuite/22_locale/collate/transform/wchar_t/28277.cc: Ditto.
+
2012-12-12 Benjamin Kosnik <bkoz@redhat.com>
* doc/xml/manual/documentation_hacking.xml: Fix validation issue.
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/18654.cc b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/18654.cc
index e9fa200a5ce2..78af79ad4969 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/18654.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/char/18654.cc
@@ -19,6 +19,12 @@
// 21.3.3 string capacity
+// { dg-options "-DMAX_SIZE=16" { target simulator } }
+
+#ifndef MAX_SIZE
+#define MAX_SIZE 20
+#endif
+
#include <string>
#include <testsuite_hooks.h>
@@ -34,7 +40,7 @@ void test01()
// and shrink-to-fit (in the future, maybe this will change
// for short strings).
const size_type minsize = 2 << 0;
- const size_type maxsize = 2 << 20;
+ const size_type maxsize = 2 << MAX_SIZE;
for (size_type i = minsize; i <= maxsize; i *= 2)
{
string str(i, 'x');
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc
index fd5117576290..df75f091340d 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/wchar_t/18654.cc
@@ -19,6 +19,12 @@
// 21.3.3 string capacity
+// { dg-options "-DMAX_SIZE=16" { target simulator } }
+
+#ifndef MAX_SIZE
+#define MAX_SIZE 20
+#endif
+
#include <string>
#include <testsuite_hooks.h>
@@ -34,7 +40,7 @@ void test01()
// and shrink-to-fit (in the future, maybe this will change
// for short strings).
const size_type minsize = 2 << 0;
- const size_type maxsize = 2 << 20;
+ const size_type maxsize = 2 << MAX_SIZE;
for (size_type i = minsize; i <= maxsize; i *= 2)
{
wstring str(i, L'x');
diff --git a/libstdc++-v3/testsuite/22_locale/collate/transform/char/28277.cc b/libstdc++-v3/testsuite/22_locale/collate/transform/char/28277.cc
index bf8c494dd6ee..7b94c7dd109b 100644
--- a/libstdc++-v3/testsuite/22_locale/collate/transform/char/28277.cc
+++ b/libstdc++-v3/testsuite/22_locale/collate/transform/char/28277.cc
@@ -19,6 +19,12 @@
// 22.2.4.1.1 collate members
+// { dg-options "-DMAX_SIZE=1000000" { target simulator } }
+
+#ifndef MAX_SIZE
+#define MAX_SIZE 10000000
+#endif
+
#include <locale>
#include <testsuite_hooks.h>
@@ -36,7 +42,7 @@ void test01()
// cache the collate facets
const collate<char>& coll_c = use_facet<collate<char> >(loc_c);
- const string_type sstr(10000000, 'a');
+ const string_type sstr(MAX_SIZE, 'a');
const string_type dstr = coll_c.transform(sstr.data(),
sstr.data() + sstr.size());
diff --git a/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/28277.cc b/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/28277.cc
index 4f211695cb7d..56ad605e8b0c 100644
--- a/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/28277.cc
+++ b/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/28277.cc
@@ -19,6 +19,12 @@
// 22.2.4.1.1 collate members
+// { dg-options "-DMAX_SIZE=100000" { target simulator } }
+
+#ifndef MAX_SIZE
+#define MAX_SIZE 10000000
+#endif
+
#include <locale>
#include <testsuite_hooks.h>
@@ -36,7 +42,7 @@ void test01()
// cache the collate facets
const collate<wchar_t>& coll_c = use_facet<collate<wchar_t> >(loc_c);
- const string_type sstr(10000000, L'a');
+ const string_type sstr(MAX_SIZE, L'a');
const string_type dstr = coll_c.transform(sstr.data(),
sstr.data() + sstr.size());
--
GitLab