From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 82664 invoked by alias); 2 Oct 2015 23:43:25 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 82647 invoked by uid 89); 2 Oct 2015 23:43:25 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Fri, 02 Oct 2015 23:43:19 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 24EEFC0B64DF; Fri, 2 Oct 2015 23:43:18 +0000 (UTC) Received: from localhost (ovpn-116-138.ams2.redhat.com [10.36.116.138]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t92NhHHf005803; Fri, 2 Oct 2015 19:43:17 -0400 Date: Fri, 02 Oct 2015 23:43:00 -0000 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [patch] Fix testsuite failures with --disable-wchar_t Message-ID: <20151002234317.GB12094@redhat.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="jn/MQTzma+jNUHFC" Content-Disposition: inline X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.5.23 (2014-03-12) X-SW-Source: 2015-10/txt/msg00295.txt.bz2 --jn/MQTzma+jNUHFC Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline Content-length: 142 This fixes some FAILs seen with --disable-wchar_t, and for targets where that's the default. Tested powerpc64le-linux, committed to trunk. --jn/MQTzma+jNUHFC Content-Type: text/x-patch; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" Content-length: 5587 commit e559cc2e962b0d7ec394d38c767f7d212da276aa Author: Jonathan Wakely Date: Sat Oct 3 00:28:00 2015 +0100 Fix testsuite failures with --disable-wchar_t * testsuite/21_strings/basic_string/literals/types.cc: Guard use of wchar_t with _GLIBCXX_USE_WCHAR_T. * testsuite/21_strings/basic_string/literals/values.cc: Likewise. * testsuite/21_strings/basic_string/requirements/citerators.cc: Likewise. * testsuite/22_locale/messages/13631.cc: Likewise. * testsuite/experimental/string_view/literals/types.cc: Likewise. * testsuite/experimental/string_view/literals/values.cc: Likewise. diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/literals/types.cc b/libstdc++-v3/testsuite/21_strings/basic_string/literals/types.cc index 5a31acf..8922bf2 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/literals/types.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/literals/types.cc @@ -32,8 +32,10 @@ test01() static_assert(std::is_same::value, "u8\"Hello\"s is std::string"); +#ifdef _GLIBCXX_USE_WCHAR_T static_assert(std::is_same::value, "L\"Hello\"s is std::wstring"); +#endif static_assert(std::is_same::value, "u\"Hello\"s is std::u16string"); diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/literals/values.cc b/libstdc++-v3/testsuite/21_strings/basic_string/literals/values.cc index b8dc7d9..bf60b9e 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/literals/values.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/literals/values.cc @@ -27,15 +27,19 @@ test01() using namespace std::literals::string_literals; std::string planet = "Mercury"s; +#ifdef _GLIBCXX_USE_WCHAR_T std::wstring wplanet = L"Venus"s; +#endif std::string u8planet = u8"Mars"s; - std::u16string u16planet = u"Juiter"s; + std::u16string u16planet = u"Jupiter"s; std::u32string u32planet = U"Saturn"s; VERIFY( planet == std::string("Mercury") ); +#ifdef _GLIBCXX_USE_WCHAR_T VERIFY( wplanet == std::wstring(L"Venus") ); +#endif VERIFY( u8planet == std::string(u8"Mars") ); - VERIFY( u16planet == std::u16string(u"Juiter") ); + VERIFY( u16planet == std::u16string(u"Jupiter") ); VERIFY( u32planet == std::u32string(U"Saturn") ); } diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/requirements/citerators.cc b/libstdc++-v3/testsuite/21_strings/basic_string/requirements/citerators.cc index f1dfff1..533b3a6 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/requirements/citerators.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/requirements/citerators.cc @@ -24,6 +24,8 @@ int main() { __gnu_test::citerator test1; +#ifdef _GLIBCXX_USE_WCHAR_T __gnu_test::citerator test2; +#endif return 0; } diff --git a/libstdc++-v3/testsuite/22_locale/messages/13631.cc b/libstdc++-v3/testsuite/22_locale/messages/13631.cc index 9feb42c..fb93c00 100644 --- a/libstdc++-v3/testsuite/22_locale/messages/13631.cc +++ b/libstdc++-v3/testsuite/22_locale/messages/13631.cc @@ -57,6 +57,7 @@ void test01() void test02() { +#ifdef _GLIBCXX_USE_WCHAR_T bool test __attribute__((unused)) = true; // This is defined through CXXFLAGS in scripts/testsuite_flags[.in]. @@ -89,6 +90,7 @@ void test02() msgs_facet.close(msgs); VERIFY( translation1 == translation2 ); +#endif } int main() diff --git a/libstdc++-v3/testsuite/experimental/string_view/literals/types.cc b/libstdc++-v3/testsuite/experimental/string_view/literals/types.cc index 8b91c99..bc2b2fc 100644 --- a/libstdc++-v3/testsuite/experimental/string_view/literals/types.cc +++ b/libstdc++-v3/testsuite/experimental/string_view/literals/types.cc @@ -32,8 +32,10 @@ test01() static_assert(std::is_same::value, "u8\"Hello\"s is std::string_view"); +#ifdef _GLIBCXX_USE_WCHAR_T static_assert(std::is_same::value, "L\"Hello\"s is std::wstring_view"); +#endif static_assert(std::is_same::value, "u\"Hello\"s is std::u16string_view"); diff --git a/libstdc++-v3/testsuite/experimental/string_view/literals/values.cc b/libstdc++-v3/testsuite/experimental/string_view/literals/values.cc index d96383b..3dd6b78 100644 --- a/libstdc++-v3/testsuite/experimental/string_view/literals/values.cc +++ b/libstdc++-v3/testsuite/experimental/string_view/literals/values.cc @@ -27,15 +27,19 @@ test01() using namespace std::experimental::literals::string_view_literals; std::experimental::string_view planet = "Mercury"sv; +#ifdef _GLIBCXX_USE_WCHAR_T std::experimental::wstring_view wplanet = L"Venus"sv; +#endif std::experimental::string_view u8planet = u8"Mars"sv; - std::experimental::u16string_view u16planet = u"Juiter"sv; + std::experimental::u16string_view u16planet = u"Jupiter"sv; std::experimental::u32string_view u32planet = U"Saturn"sv; VERIFY( planet == std::experimental::string_view("Mercury") ); +#ifdef _GLIBCXX_USE_WCHAR_T VERIFY( wplanet == std::experimental::wstring_view(L"Venus") ); +#endif VERIFY( u8planet == std::experimental::string_view(u8"Mars") ); - VERIFY( u16planet == std::experimental::u16string_view(u"Juiter") ); + VERIFY( u16planet == std::experimental::u16string_view(u"Jupiter") ); VERIFY( u32planet == std::experimental::u32string_view(U"Saturn") ); } --jn/MQTzma+jNUHFC--