From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from rock.gnat.com (rock.gnat.com [IPv6:2620:20:4000:0:a9e:1ff:fe9b:1d1]) by sourceware.org (Postfix) with ESMTP id 3B1C4387084D; Tue, 22 Dec 2020 21:12:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 3B1C4387084D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=oliva@adacore.com Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id C7CFA116D18; Tue, 22 Dec 2020 16:12:34 -0500 (EST) X-Virus-Scanned: Debian amavisd-new at gnat.com Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 4efqHk5TB5vG; Tue, 22 Dec 2020 16:12:34 -0500 (EST) Received: from free.home (tron.gnat.com [IPv6:2620:20:4000:0:46a8:42ff:fe0e:e294]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPS id 68C641169EE; Tue, 22 Dec 2020 16:12:34 -0500 (EST) Received: from livre (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTPS id 0BMLCPbo055826 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 22 Dec 2020 18:12:26 -0300 From: Alexandre Oliva To: libstdc++@gcc.gnu.org Cc: Corentin Gay , gcc-patches@gcc.gnu.org Subject: Add dg-require-wchars to libstdc++ testsuite Organization: Free thinker, does not speak for AdaCore Errors-To: aoliva@lxoliva.fsfla.org Date: Tue, 22 Dec 2020 18:12:25 -0300 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 2.84 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_SHORT, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Dec 2020 21:12:37 -0000 Some tests uses structures from the libstdc++ that are present only if the target has a wchar.h header. However, those tests do not check that the target supports those constructs before executing the tests. The function dg-require-wchars checks that "_GLIBCXX_USE_WCHAR_T" is defined by the configure of the libstdc++. If it is not the case, the test is not executed. Regstrapped on x86_64-linux-gnu, and tested with -x-arm-wrs-vxworks7r2. Ok to install? from Corentin Gay for libstdc++-v3/ChangeLog * testsuite/lib/dg-options.exp: Add dg-require-wchars function. * testsuite/lib/libstdc++.exp: Add check_v3_target_wchars function. * testsuite/22_locale/codecvt/codecvt_utf16/79980.cc: Add requirement. * testsuite/22_locale/codecvt/codecvt_utf16/misaligned.cc: Likewise. * testsuite/22_locale/codecvt/codecvt_utf8/79980.cc: Likewise. * testsuite/22_locale/codecvt/codecvt_utf8_utf16/79511.cc: Likewise. * testsuite/22_locale/conversions/buffer/1.cc: Likewise. * testsuite/22_locale/conversions/buffer/2.cc: Likewise. * testsuite/22_locale/conversions/buffer/3.cc: Likewise. * testsuite/22_locale/conversions/buffer/requirements/typedefs.cc: Likewise. * testsuite/22_locale/conversions/string/1.cc: Likewise. * testsuite/22_locale/conversions/string/2.cc: Likewise. * testsuite/22_locale/conversions/string/3.cc: Likewise. * testsuite/22_locale/conversions/string/66441.cc: Likewise. * testsuite/22_locale/conversions/string/requirements/typedefs.cc: Likewise. * testsuite/22_locale/conversions/string/requirements/typedefs-2.cc: Likewise. --- .../22_locale/codecvt/codecvt_utf16/79980.cc | 1 .../22_locale/codecvt/codecvt_utf16/misaligned.cc | 1 .../22_locale/codecvt/codecvt_utf8/79980.cc | 1 .../22_locale/codecvt/codecvt_utf8_utf16/79511.cc | 1 .../testsuite/22_locale/conversions/buffer/1.cc | 1 .../testsuite/22_locale/conversions/buffer/2.cc | 1 .../testsuite/22_locale/conversions/buffer/3.cc | 1 .../conversions/buffer/requirements/typedefs.cc | 1 .../testsuite/22_locale/conversions/string/1.cc | 1 .../testsuite/22_locale/conversions/string/2.cc | 1 .../testsuite/22_locale/conversions/string/3.cc | 1 .../22_locale/conversions/string/66441.cc | 1 .../conversions/string/requirements/typedefs-2.cc | 1 .../conversions/string/requirements/typedefs.cc | 1 libstdc++-v3/testsuite/lib/dg-options.exp | 9 ++++ libstdc++-v3/testsuite/lib/libstdc++.exp | 47 ++++++++++++++++++++ 16 files changed, 70 insertions(+) diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf16/79980.cc b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf16/79980.cc index 8a092913a4c92..039bdd0322907 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf16/79980.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf16/79980.cc @@ -16,6 +16,7 @@ // . // { dg-do run { target c++11 } } +// { dg-require-wchars "" } #include #include diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf16/misaligned.cc b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf16/misaligned.cc index 04cfc8d744bdd..3496e0e819e98 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf16/misaligned.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf16/misaligned.cc @@ -16,6 +16,7 @@ // . // { dg-do run { target c++11 } } +// { dg-require-wchars "" } #include #include diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8/79980.cc b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8/79980.cc index 68ae5af234ae5..fd69dd5c04de0 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8/79980.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8/79980.cc @@ -16,6 +16,7 @@ // . // { dg-do run { target c++11 } } +// { dg-require-wchars "" } #include #include diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8_utf16/79511.cc b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8_utf16/79511.cc index 1f63e7218e7d2..590a3b73bfc41 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8_utf16/79511.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_utf8_utf16/79511.cc @@ -16,6 +16,7 @@ // . // { dg-do run { target c++11 } } +// { dg-require-wchars "" } #include #include diff --git a/libstdc++-v3/testsuite/22_locale/conversions/buffer/1.cc b/libstdc++-v3/testsuite/22_locale/conversions/buffer/1.cc index 2855f7432d464..91bf2bf22160d 100644 --- a/libstdc++-v3/testsuite/22_locale/conversions/buffer/1.cc +++ b/libstdc++-v3/testsuite/22_locale/conversions/buffer/1.cc @@ -1,4 +1,5 @@ // { dg-do run { target c++11 } } +// { dg-require-wchars "" } // Copyright (C) 2015-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/22_locale/conversions/buffer/2.cc b/libstdc++-v3/testsuite/22_locale/conversions/buffer/2.cc index 2cf320fc13cca..a03a16a02ed0b 100644 --- a/libstdc++-v3/testsuite/22_locale/conversions/buffer/2.cc +++ b/libstdc++-v3/testsuite/22_locale/conversions/buffer/2.cc @@ -16,6 +16,7 @@ // . // { dg-do run { target c++11 } } +// { dg-require-wchars "" } #include #include diff --git a/libstdc++-v3/testsuite/22_locale/conversions/buffer/3.cc b/libstdc++-v3/testsuite/22_locale/conversions/buffer/3.cc index de43e0a95b2b7..84d5358f4999c 100644 --- a/libstdc++-v3/testsuite/22_locale/conversions/buffer/3.cc +++ b/libstdc++-v3/testsuite/22_locale/conversions/buffer/3.cc @@ -16,6 +16,7 @@ // . // { dg-do run { target c++11 } } +// { dg-require-wchars "" } #include #include diff --git a/libstdc++-v3/testsuite/22_locale/conversions/buffer/requirements/typedefs.cc b/libstdc++-v3/testsuite/22_locale/conversions/buffer/requirements/typedefs.cc index e88799dbec750..8efe203e87398 100644 --- a/libstdc++-v3/testsuite/22_locale/conversions/buffer/requirements/typedefs.cc +++ b/libstdc++-v3/testsuite/22_locale/conversions/buffer/requirements/typedefs.cc @@ -1,4 +1,5 @@ // { dg-do compile { target c++11 } } +// { dg-require-wchars "" } // Copyright (C) 2015-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/22_locale/conversions/string/1.cc b/libstdc++-v3/testsuite/22_locale/conversions/string/1.cc index 41d6594fe1320..d491e6c52709e 100644 --- a/libstdc++-v3/testsuite/22_locale/conversions/string/1.cc +++ b/libstdc++-v3/testsuite/22_locale/conversions/string/1.cc @@ -1,4 +1,5 @@ // { dg-do run { target c++11 } } +// { dg-require-wchars "" } // Copyright (C) 2015-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/22_locale/conversions/string/2.cc b/libstdc++-v3/testsuite/22_locale/conversions/string/2.cc index bc26e328a6039..b4867053f3c85 100644 --- a/libstdc++-v3/testsuite/22_locale/conversions/string/2.cc +++ b/libstdc++-v3/testsuite/22_locale/conversions/string/2.cc @@ -1,4 +1,5 @@ // { dg-do run { target c++11 } } +// { dg-require-wchars "" } // Copyright (C) 2015-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/22_locale/conversions/string/3.cc b/libstdc++-v3/testsuite/22_locale/conversions/string/3.cc index b7793cdca49ea..023897c9307b5 100644 --- a/libstdc++-v3/testsuite/22_locale/conversions/string/3.cc +++ b/libstdc++-v3/testsuite/22_locale/conversions/string/3.cc @@ -1,4 +1,5 @@ // { dg-do run { target c++11 } } +// { dg-require-wchars "" } // Copyright (C) 2015-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/22_locale/conversions/string/66441.cc b/libstdc++-v3/testsuite/22_locale/conversions/string/66441.cc index 07136aec1179e..b78c31fbb9b1b 100644 --- a/libstdc++-v3/testsuite/22_locale/conversions/string/66441.cc +++ b/libstdc++-v3/testsuite/22_locale/conversions/string/66441.cc @@ -16,6 +16,7 @@ // . // { dg-do run { target c++11 } } +// { dg-require-wchars "" } // libstdc++/66441 diff --git a/libstdc++-v3/testsuite/22_locale/conversions/string/requirements/typedefs-2.cc b/libstdc++-v3/testsuite/22_locale/conversions/string/requirements/typedefs-2.cc index 91b47c449a16a..4cd254a40da57 100644 --- a/libstdc++-v3/testsuite/22_locale/conversions/string/requirements/typedefs-2.cc +++ b/libstdc++-v3/testsuite/22_locale/conversions/string/requirements/typedefs-2.cc @@ -1,4 +1,5 @@ // { dg-do compile { target c++11 } } +// { dg-require-wchars "" } // Copyright (C) 2015-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/22_locale/conversions/string/requirements/typedefs.cc b/libstdc++-v3/testsuite/22_locale/conversions/string/requirements/typedefs.cc index 023caa69a6e3a..30e49b2ff893b 100644 --- a/libstdc++-v3/testsuite/22_locale/conversions/string/requirements/typedefs.cc +++ b/libstdc++-v3/testsuite/22_locale/conversions/string/requirements/typedefs.cc @@ -1,4 +1,5 @@ // { dg-do compile { target c++11 } } +// { dg-require-wchars "" } // Copyright (C) 2015-2020 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/testsuite/lib/dg-options.exp b/libstdc++-v3/testsuite/lib/dg-options.exp index 0102acf65a282..17306a0eb0205 100644 --- a/libstdc++-v3/testsuite/lib/dg-options.exp +++ b/libstdc++-v3/testsuite/lib/dg-options.exp @@ -16,6 +16,15 @@ # along with this program; see the file COPYING3. If not see # . +proc dg-require-wchars { args } { + if { ![ check_v3_target_wchars ] } { + upvar dg-do-what dg-do-what + set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"] + return + } + return +} + proc dg-require-c-std { args } { if { ![ check_v3_target_c_std ] } { upvar dg-do-what dg-do-what diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index b7d7b906de41c..2c22bcc0f0c94 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -702,6 +702,53 @@ proc v3-build_support { } { } } +proc check_v3_target_wchars { } { + global et_wchars + global et_wchars_target_name + global tool + + if { ![info exists et_wchars_target_name] } { + set et_wchars_target_name "" + } + + # If the target has changed since we set the cached value, clear it. + set current_target [current_target_name] + if { $current_target != $et_wchars_target_name } { + verbose "check_v3_target_wchars: `$et_wchars_target_name'" 2 + set et_wchars_target_name $current_target + if [info exists et_wchars] { + verbose "check_v3_target_wchars: removing cached result" 2 + unset et_wchars + } + } + + if [info exists et_wchars] { + verbose "check_v3_target_wchars: using cached result" 2 + } else { + set et_wchars 0 + + # Set up and preprocess a C++ test program that depends + # on wchars support being configured in the libstdc++. + set src wchars[pid].cc + + set f [open $src "w"] + puts $f "#ifndef _GLIBCXX_USE_WCHAR_T" + puts $f "# error No wchar header." + puts $f "#endif" + close $f + + set lines [v3_target_compile $src /dev/null preprocess ""] + file delete $src + + if [string match "" $lines] { + # No error message, preprocessing succeeded. + set et_wchars 1 + } + } + verbose "check_v3_target_wchars: $et_wchars" 2 + return $et_wchars +} + # Implement an target check for property PROP by invoking # the Tcl command ARGS and seeing if it returns true. -- Alexandre Oliva, happy hacker https://FSFLA.org/blogs/lxo/ Free Software Activist GNU Toolchain Engineer Vim, Vi, Voltei pro Emacs -- GNUlius Caesar