Re: [PATCH][_GLIBCXX_INLINE_VERSION] Adapt dg error messages
On 28/11/22 14:39, Jonathan Wakely wrote:
On Mon, 28 Nov 2022 at 10:08, Jonathan Wakely wrote:
On Mon, 28 Nov 2022 at 10:06, Jonathan Wakely
wrote:
On Mon, 28 Nov 2022 at 06:02, François Dumont via Libstdc++
mailto:libstdc%2b...@gcc.gnu.org>> wrote:
libstdc++: [_GLIBCXX_INLINE_VERSION] Adapt dg error messages
libstdc++-v3/ChangeLog
* testsuite/20_util/bind/ref_neg.cc: Adapt
dg-prune-output message.
* testsuite/20_util/function/cons/70692.cc: Adapt
dg-error message.
Ok to commit ?
OK, thanks.
Actually wait, can you test this instead?
--- a/libstdc++-v3/testsuite/lib/prune.exp
+++ b/libstdc++-v3/testsuite/lib/prune.exp
@@ -37,6 +37,8 @@ proc libstdc++-dg-prune { system text } {
return "::unsupported::hosted C++ headers not supported"
}
+ regsub -all "std::__8::" $text "std::" text
+
# Ignore caret diagnostics. Unfortunately dejaGNU trims leading
# spaces, so one cannot rely on them being present.
regsub -all "(^|\n)\[^\n\]+\n *\\^\n" $text "\n" text
This should mean we can stop needing to make these changes to
every test, and just write the tests naturally.
That only helps for dg-prune-output but we still need to (__8::)? for
dg-error.
Please push your change to 20_util/function/cons/70692.cc but not the
change to 20_util/bind/ref_neg.cc (the latter will get fixed after I
pushed the prune.expo change).
Done as requested and I confirm that prune.exp enhancement fixed
20_util/bind/ref_neg.cc.
Thanks
Re: [PATCH][_GLIBCXX_INLINE_VERSION] Adapt dg error messages
On Mon, 28 Nov 2022 at 10:08, Jonathan Wakely wrote:
>
>
> On Mon, 28 Nov 2022 at 10:06, Jonathan Wakely wrote:
>
>>
>>
>> On Mon, 28 Nov 2022 at 06:02, François Dumont via Libstdc++ <
>> libstd...@gcc.gnu.org> wrote:
>>
>>> libstdc++: [_GLIBCXX_INLINE_VERSION] Adapt dg error messages
>>>
>>> libstdc++-v3/ChangeLog
>>>
>>> * testsuite/20_util/bind/ref_neg.cc: Adapt dg-prune-output
>>> message.
>>> * testsuite/20_util/function/cons/70692.cc: Adapt dg-error
>>> message.
>>>
>>> Ok to commit ?
>>>
>>>
>> OK, thanks.
>>
>>
>>
> Actually wait, can you test this instead?
>
> --- a/libstdc++-v3/testsuite/lib/prune.exp
> +++ b/libstdc++-v3/testsuite/lib/prune.exp
> @@ -37,6 +37,8 @@ proc libstdc++-dg-prune { system text } {
> return "::unsupported::hosted C++ headers not supported"
> }
>
> +regsub -all "std::__8::" $text "std::" text
> +
> # Ignore caret diagnostics. Unfortunately dejaGNU trims leading
> # spaces, so one cannot rely on them being present.
> regsub -all "(^|\n)\[^\n\]+\n *\\^\n" $text "\n" text
>
> This should mean we can stop needing to make these changes to every test,
> and just write the tests naturally.
>
That only helps for dg-prune-output but we still need to (__8::)? for
dg-error.
Please push your change to 20_util/function/cons/70692.cc but not the
change to 20_util/bind/ref_neg.cc (the latter will get fixed after I pushed
the prune.expo change).
Re: [PATCH][_GLIBCXX_INLINE_VERSION] Adapt dg error messages
On Mon, 28 Nov 2022 at 10:06, Jonathan Wakely wrote:
>
>
> On Mon, 28 Nov 2022 at 06:02, François Dumont via Libstdc++ <
> libstd...@gcc.gnu.org> wrote:
>
>> libstdc++: [_GLIBCXX_INLINE_VERSION] Adapt dg error messages
>>
>> libstdc++-v3/ChangeLog
>>
>> * testsuite/20_util/bind/ref_neg.cc: Adapt dg-prune-output
>> message.
>> * testsuite/20_util/function/cons/70692.cc: Adapt dg-error
>> message.
>>
>> Ok to commit ?
>>
>>
> OK, thanks.
>
>
>
Actually wait, can you test this instead?
--- a/libstdc++-v3/testsuite/lib/prune.exp
+++ b/libstdc++-v3/testsuite/lib/prune.exp
@@ -37,6 +37,8 @@ proc libstdc++-dg-prune { system text } {
return "::unsupported::hosted C++ headers not supported"
}
+regsub -all "std::__8::" $text "std::" text
+
# Ignore caret diagnostics. Unfortunately dejaGNU trims leading
# spaces, so one cannot rely on them being present.
regsub -all "(^|\n)\[^\n\]+\n *\\^\n" $text "\n" text
This should mean we can stop needing to make these changes to every test,
and just write the tests naturally.
Re: [PATCH][_GLIBCXX_INLINE_VERSION] Adapt dg error messages
On Mon, 28 Nov 2022 at 06:02, François Dumont via Libstdc++ < libstd...@gcc.gnu.org> wrote: > libstdc++: [_GLIBCXX_INLINE_VERSION] Adapt dg error messages > > libstdc++-v3/ChangeLog > > * testsuite/20_util/bind/ref_neg.cc: Adapt dg-prune-output > message. > * testsuite/20_util/function/cons/70692.cc: Adapt dg-error > message. > > Ok to commit ? > > OK, thanks.
