This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: RFA: Avoid simulator timeouts on more libstdc++ tests
Paolo Carlini wrote:
>> I didn't notice them because the simulator I was using didn't have that
>> enabled, but I agree that it makes sense. Is it pre-approved to make
>> the corresponding changes to the corresponding wchar_t tests?
>>
> Of course.
Here are those changes, now committed.
Thanks,
--
Mark Mitchell
CodeSourcery
mark@codesourcery.com
(650) 331-3385 x713
2009-03-22 Mark Mitchell <mark@codesourcery.com>
* testsuite/21_strings/basic_string/inserters_extractors/wchar_t/28277.cc:
Likewise.
* testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-3.cc:
Likewise.
* testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-4.cc:
Likewise.
* testsuite/ext/vstring/inserters_extractors/wchar_t/28277.cc:
Likewise.
Index: testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-3.cc
===================================================================
--- testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-3.cc (revision 145026)
+++ testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-3.cc (working copy)
@@ -18,12 +18,18 @@
// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// USA.
+// { dg-options "-DWIDTH=500000" { target simulator } }
+
// 27.6.2.5.4 basic_ostream character inserters
#include <ostream>
#include <sstream>
#include <testsuite_hooks.h>
+#ifndef WIDTH
+#define WIDTH 50000000
+#endif
+
// libstdc++/28277
void test01()
{
@@ -32,7 +38,7 @@ void test01()
wostringstream oss_01;
- oss_01.width(5000000);
+ oss_01.width(WIDTH);
const streamsize width = oss_01.width();
oss_01 << L'a';
Index: testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-4.cc
===================================================================
--- testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-4.cc (revision 145026)
+++ testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-4.cc (working copy)
@@ -1,6 +1,6 @@
// 2006-10-12 Paolo Carlini <pcarlini@suse.de>
-// Copyright (C) 2006, 2007 Free Software Foundation
+// Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -18,12 +18,18 @@
// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// USA.
+// { dg-options "-DWIDTH=500000" { target simulator } }
+
// 27.6.2.5.4 basic_ostream character inserters
#include <ostream>
#include <sstream>
#include <testsuite_hooks.h>
+#ifndef WIDTH
+#define WIDTH 50000000
+#endif
+
// libstdc++/28277
void test01()
{
@@ -33,7 +39,7 @@ void test01()
wostringstream oss_01;
const wstring str_01(50, L'a');
- oss_01.width(5000000);
+ oss_01.width(WIDTH);
const streamsize width = oss_01.width();
oss_01 << str_01.c_str();
Index: testsuite/21_strings/basic_string/inserters_extractors/wchar_t/28277.cc
===================================================================
--- testsuite/21_strings/basic_string/inserters_extractors/wchar_t/28277.cc (revision 145026)
+++ testsuite/21_strings/basic_string/inserters_extractors/wchar_t/28277.cc (working copy)
@@ -1,6 +1,6 @@
// 2006-10-12 Paolo Carlini <pcarlini@suse.de>
-// Copyright (C) 2006, 2007 Free Software Foundation
+// Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -18,12 +18,18 @@
// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// USA.
+// { dg-options "-DWIDTH=500000" { target simulator } }
+
// 21.3.7.9 inserters and extractors
#include <ostream>
#include <sstream>
#include <testsuite_hooks.h>
+#ifndef WIDTH
+#define WIDTH 50000000
+#endif
+
// libstdc++/28277
void test01()
{
@@ -33,7 +39,7 @@ void test01()
wostringstream oss_01;
const wstring str_01(50, L'a');
- oss_01.width(5000000);
+ oss_01.width(WIDTH);
const streamsize width = oss_01.width();
oss_01 << str_01;
Index: testsuite/ext/vstring/inserters_extractors/wchar_t/28277.cc
===================================================================
--- testsuite/ext/vstring/inserters_extractors/wchar_t/28277.cc (revision 145026)
+++ testsuite/ext/vstring/inserters_extractors/wchar_t/28277.cc (working copy)
@@ -1,6 +1,6 @@
// 2007-04-09 Paolo Carlini <pcarlini@suse.de>
-// Copyright (C) 2007 Free Software Foundation
+// Copyright (C) 2007, 2008, 2009 Free Software Foundation
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -18,11 +18,17 @@
// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// USA.
+// { dg-options "-DWIDTH=500000" { target simulator } }
+
#include <ostream>
#include <sstream>
#include <ext/vstring.h>
#include <testsuite_hooks.h>
+#ifndef WIDTH
+#define WIDTH 50000000
+#endif
+
// libstdc++/28277
void test01()
{
@@ -32,7 +38,7 @@ void test01()
wostringstream oss_01;
const __gnu_cxx::__wvstring str_01(50, L'a');
- oss_01.width(5000000);
+ oss_01.width(WIDTH);
const streamsize width = oss_01.width();
oss_01 << str_01;