From b57c6b13e0d950ba0771b1688cf6e57e3a5beae6 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Mon, 26 Jul 2010 20:54:57 +0000 Subject: [PATCH] 14220.cc: XFAIL on Solaris 9/x86, 32-bit Solaris 10/x86 and 64-bit Solaris 10/SPARC. * testsuite/22_locale/num_put/put/char/14220.cc: XFAIL on Solaris 9/x86, 32-bit Solaris 10/x86 and 64-bit Solaris 10/SPARC. * testsuite/22_locale/num_put/put/wchar_t/14220.cc: XFAIL on Solaris 9/x86 and 32-bit Solaris 10/x86. * testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc: Only XFAIL on Solaris 8 and 9. * testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/12.cc: Likewise. * testsuite/ext/enc_filebuf/char/13598.cc: XFAIL before Solaris 11. From-SVN: r162545 --- libstdc++-v3/ChangeLog | 14 ++++++++++++++ .../testsuite/22_locale/num_put/put/char/14220.cc | 10 ++++++---- .../22_locale/num_put/put/wchar_t/14220.cc | 8 ++++---- .../basic_istream/extractors_arithmetic/char/12.cc | 7 ++++--- .../extractors_arithmetic/wchar_t/12.cc | 7 ++++--- .../testsuite/ext/enc_filebuf/char/13598.cc | 6 +++++- 6 files changed, 37 insertions(+), 15 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 64fc3e6b2c4..433d84fd248 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,17 @@ +2010-07-26 Rainer Orth + + * testsuite/22_locale/num_put/put/char/14220.cc: XFAIL on Solaris + 9/x86, 32-bit Solaris 10/x86 and 64-bit Solaris 10/SPARC. + * testsuite/22_locale/num_put/put/wchar_t/14220.cc: XFAIL on + Solaris 9/x86 and 32-bit Solaris 10/x86. + + * testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc: + Only XFAIL on Solaris 8 and 9. + * testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/12.cc: + Likewise. + + * testsuite/ext/enc_filebuf/char/13598.cc: XFAIL before Solaris 11. + 2010-07-25 Jonathan Wakely PR libstdc++/45060 diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/char/14220.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/char/14220.cc index 714a8e8d60c..fe649a7b03f 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put/put/char/14220.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put/put/char/14220.cc @@ -1,6 +1,6 @@ // 2004-04-30 Paolo Carlini -// Copyright (C) 2004, 2009 Free Software Foundation +// Copyright (C) 2004, 2009, 2010 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 @@ -19,11 +19,13 @@ // 22.2.2.2.1 num_put members -// On Solaris 10 x86, this test crashes in libc. Inside libstdc++, -// we call sprintf like so: +// On Solaris 9/x86, 32-bit Solaris 10/x86 and 64-bit Solaris 10/SPARC, this +// test crashes in libc. Inside libstdc++, we call sprintf like so: // sprintf (buffer, "%.*f", 1000, 1.0) // which crashes. -// { dg-do run { xfail { i?86*-*-solaris2.10 } } } +// { dg-xfail-run-if "" i?86-*-solaris2.9 } +// { dg-xfail-run-if "" { i?86-*-solaris2.10 && ilp32 } } +// { dg-xfail-run-if "" { sparc*-sun-solaris2.10 && lp64 } } #include #include diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/14220.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/14220.cc index 552f049e61c..5b830154018 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/14220.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/14220.cc @@ -1,6 +1,6 @@ // 2004-04-30 Paolo Carlini -// Copyright (C) 2004, 2009 Free Software Foundation +// Copyright (C) 2004, 2009, 2010 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 @@ -23,11 +23,11 @@ #include #include -// On Solaris 10 x86, this test crashes in libc. Inside libstdc++, -// we call sprintf like so: +// On Solaris 9 and 32-bit Solaris 10/x86, this test crashes in libc. Inside +// libstdc++, we call sprintf like so: // sprintf (buffer, "%.*f", 1000, 1.0) // which crashes. -// { dg-do run { xfail { i?86*-*-solaris2.10 } } } +// { dg-do run { xfail { i?86-*-solaris2.9 || { i?86-*-solaris2.10 && ilp32 } } } } // libstdc++/14220 void test01() diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc index 8bf9bd35396..70f74fd7a91 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc @@ -1,6 +1,7 @@ // 1999-04-12 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, +// 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -20,10 +21,10 @@ // 27.6.1.2.2 arithmetic extractors -// XXX This test fails on sparc-solaris2 because of a bug in libc +// XXX This test fails on Solaris 8 and 9 because of a bug in libc // XXX sscanf for very long input. See: // XXX http://gcc.gnu.org/ml/gcc/2002-12/msg01422.html -// { dg-do run { xfail { { sparc*-*-solaris2* } || lax_strtofp } } } +// { dg-do run { xfail { { *-*-solaris2.[89] } || lax_strtofp } } } #include #include diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/12.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/12.cc index 6e3b0888e73..dcadf8669a2 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/12.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/wchar_t/12.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc. +// Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 +// Free Software Foundation, Inc. // // 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 @@ -17,10 +18,10 @@ // 27.6.1.2.2 arithmetic extractors -// XXX This test fails on sparc-solaris2 because of a bug in libc +// XXX This test fails on Solaris 8 and 9 because of a bug in libc // XXX sscanf for very long input. See: // XXX http://gcc.gnu.org/ml/gcc/2002-12/msg01422.html -// { dg-do run { xfail { { sparc*-*-solaris2* } || lax_strtofp } } } +// { dg-do run { xfail { { *-*-solaris2.[89] } || lax_strtofp } } } #include #include diff --git a/libstdc++-v3/testsuite/ext/enc_filebuf/char/13598.cc b/libstdc++-v3/testsuite/ext/enc_filebuf/char/13598.cc index 3e503df4710..0030000f7b6 100644 --- a/libstdc++-v3/testsuite/ext/enc_filebuf/char/13598.cc +++ b/libstdc++-v3/testsuite/ext/enc_filebuf/char/13598.cc @@ -1,6 +1,10 @@ +// Before Solaris 11, iconv -f ISO-8859-1 -t ISO-8859-1 fails with +// Not supported ISO-8859-1 to ISO-8859-1 +// +// { dg-do run { xfail *-*-solaris2.[89] *-*-solaris2.10 } } // { dg-require-iconv "ISO-8859-1" } -// Copyright (C) 2004, 2005, 2006, 2007, 2009 Free Software Foundation +// Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 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