public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
* [PATCH, libstdc++]: Fix testsuite FAILs related to missing de_DE.UTF-8 locale
@ 2016-08-30 11:19 Uros Bizjak
  2016-08-30 11:22 ` Rainer Orth
  2016-08-30 11:45 ` Jonathan Wakely
  0 siblings, 2 replies; 3+ messages in thread
From: Uros Bizjak @ 2016-08-30 11:19 UTC (permalink / raw)
  To: gcc-patches; +Cc: libstdc++, Jonathan Wakely

[-- Attachment #1: Type: text/plain, Size: 882 bytes --]

Hello!

There are several libstdc++ testsuite FAILs on systems where
de_DE.UTF-8 locale is missing.

Apparently, following "dg-do run" directive overrides
dg-require-namedlocale requirement.

Attached patch fixes testsuite failures by moving
dg-require-namedlocale directive after dg-do run.

2016-08-30  Uros Bizjak  <ubizjak@gmail.com>

    * testsuite/22_locale/time_get/get/char/2.cc: Move dg-do run
    directive above dg-require-namedlocale directive.
    * testsuite/22_locale/time_get/get/wchar_t/2.cc: Ditto.
    * testsuite/27_io/manipulators/extended/get_time/char/2.cc: Ditto.
    * testsuite/27_io/manipulators/extended/get_time/wchar_t/2.cc: Ditto.
    * testsuite/27_io/manipulators/extended/put_time/char/2.cc: Ditto.
    * testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc: Ditto.

Tested on x86_64-linux-gnu {,-m32} CentOS 5.11.

OK for mainline?

Uros.

[-- Attachment #2: l.diff.txt --]
[-- Type: text/plain, Size: 3173 bytes --]

diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get/char/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get/char/2.cc
index 35ec627..a6eed49 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get/char/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get/char/2.cc
@@ -1,5 +1,5 @@
+// { dg-do-run { target c++11 } }
 // { dg-require-namedlocale "de_DE.UTF-8" }
-// { dg-do run { target c++11 } }
 
 // 2014-04-14 Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get/wchar_t/2.cc
index 63b70d8..48ddb39 100644
--- a/libstdc++-v3/testsuite/22_locale/time_get/get/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/time_get/get/wchar_t/2.cc
@@ -1,5 +1,5 @@
-// { dg-require-namedlocale "de_DE.UTF-8" }
 // { dg-do run { target c++11 } }
+// { dg-require-namedlocale "de_DE.UTF-8" }
 
 // 2014-04-14 Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/char/2.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/char/2.cc
index 3ba6017..42168f2 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/char/2.cc
@@ -1,5 +1,5 @@
-// { dg-require-namedlocale "de_DE.UTF-8" }
 // { dg-do run { target c++11 } }
+// { dg-require-namedlocale "de_DE.UTF-8" }
 
 // 2014-04-14 Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/wchar_t/2.cc
index 4adba53..a465650 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/wchar_t/2.cc
@@ -1,5 +1,5 @@
-// { dg-require-namedlocale "de_DE.UTF-8" }
 // { dg-do run { target c++11 } }
+// { dg-require-namedlocale "de_DE.UTF-8" }
 
 // 2014-04-14 Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/char/2.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/char/2.cc
index 3a1d2c4..ac74472 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/char/2.cc
@@ -1,5 +1,5 @@
-// { dg-require-namedlocale "de_DE.UTF-8" }
 // { dg-do run { target c++11 } }
+// { dg-require-namedlocale "de_DE.UTF-8" }
 
 // 2014-04-14 Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc
index c0d5869..4c32b067 100644
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc
@@ -1,5 +1,5 @@
-// { dg-require-namedlocale "de_DE.UTF-8" }
 // { dg-do run { target c++11 } }
+// { dg-require-namedlocale "de_DE.UTF-8" }
 
 // 2014-04-14 Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH, libstdc++]: Fix testsuite FAILs related to missing de_DE.UTF-8 locale
  2016-08-30 11:19 [PATCH, libstdc++]: Fix testsuite FAILs related to missing de_DE.UTF-8 locale Uros Bizjak
@ 2016-08-30 11:22 ` Rainer Orth
  2016-08-30 11:45 ` Jonathan Wakely
  1 sibling, 0 replies; 3+ messages in thread
From: Rainer Orth @ 2016-08-30 11:22 UTC (permalink / raw)
  To: Uros Bizjak; +Cc: gcc-patches, libstdc++, Jonathan Wakely

Hi Uros,

> There are several libstdc++ testsuite FAILs on systems where
> de_DE.UTF-8 locale is missing.
>
> Apparently, following "dg-do run" directive overrides
> dg-require-namedlocale requirement.
>
> Attached patch fixes testsuite failures by moving
> dg-require-namedlocale directive after dg-do run.
>
> 2016-08-30  Uros Bizjak  <ubizjak@gmail.com>
>
>     * testsuite/22_locale/time_get/get/char/2.cc: Move dg-do run
>     directive above dg-require-namedlocale directive.
>     * testsuite/22_locale/time_get/get/wchar_t/2.cc: Ditto.
>     * testsuite/27_io/manipulators/extended/get_time/char/2.cc: Ditto.
>     * testsuite/27_io/manipulators/extended/get_time/wchar_t/2.cc: Ditto.
>     * testsuite/27_io/manipulators/extended/put_time/char/2.cc: Ditto.
>     * testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc: Ditto.
>
> Tested on x86_64-linux-gnu {,-m32} CentOS 5.11.
>
> OK for mainline?

ok, thanks for fixing this.

	Rainer

-- 
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH, libstdc++]: Fix testsuite FAILs related to missing de_DE.UTF-8 locale
  2016-08-30 11:19 [PATCH, libstdc++]: Fix testsuite FAILs related to missing de_DE.UTF-8 locale Uros Bizjak
  2016-08-30 11:22 ` Rainer Orth
@ 2016-08-30 11:45 ` Jonathan Wakely
  1 sibling, 0 replies; 3+ messages in thread
From: Jonathan Wakely @ 2016-08-30 11:45 UTC (permalink / raw)
  To: Uros Bizjak; +Cc: gcc-patches, libstdc++

On 30/08/16 13:19 +0200, Uros Bizjak wrote:
>Hello!
>
>There are several libstdc++ testsuite FAILs on systems where
>de_DE.UTF-8 locale is missing.
>
>Apparently, following "dg-do run" directive overrides
>dg-require-namedlocale requirement.

Yes, a dg-do with a target selector will decide whether to run the
test or not based on the target, and ignore any previous dg-require-*

This is documented at
https://gcc.gnu.org/onlinedocs/gccint/Directives.html and I noticed
some incorrect tests while adding the { target c++11 } selectors but
didn't get around to fixing them.

Thanks for fixing these.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2016-08-30 11:45 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-30 11:19 [PATCH, libstdc++]: Fix testsuite FAILs related to missing de_DE.UTF-8 locale Uros Bizjak
2016-08-30 11:22 ` Rainer Orth
2016-08-30 11:45 ` Jonathan Wakely

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).