testsuite: Windows paths use \ and not /

Message ID 20221025151512.1791109-1-torbjorn.svensson@foss.st.com
State Accepted
Headers
Series testsuite: Windows paths use \ and not / |

Checks

Context Check Description
snail/gcc-patch-check success Github commit url

Commit Message

Torbjorn SVENSSON Oct. 25, 2022, 3:15 p.m. UTC
  Without this patch, the following error is reported on Windows:

In file included from t:\build\arm-none-eabi\include\c++\11.3.1\string:54,
                  from t:\build\arm-none-eabi\include\c++\11.3.1\bits\locale_classes.h:40,
                  from t:\build\arm-none-eabi\include\c++\11.3.1\bits\ios_base.h:41,
                  from t:\build\arm-none-eabi\include\c++\11.3.1\ios:42,
                  from t:\build\arm-none-eabi\include\c++\11.3.1\ostream:38,
                  from t:\build\arm-none-eabi\include\c++\11.3.1\iostream:39:
t:\build\arm-none-eabi\include\c++\11.3.1\bits\range_access.h:36:10: note: include 't:\build\arm-none-eabi\include\c++\11.3.1\initializer_list' translated to import
arm-none-eabi-g++.exe: warning: .../gcc/testsuite/g++.dg/modules/pr99023_b.X: linker input file unused because linking not done
FAIL: g++.dg/modules/pr99023_b.X -std=c++2a  dg-regexp 6 not found: "[^\n]*: note: include '[^\n]*/initializer_list' translated to import\n"

gcc/testsuite/ChangeLog:

	* g++.dg/modules/pr99023_b.X: Match Windows paths too.

Co-Authored-By: Yvan ROUX <yvan.roux@foss.st.com>
Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com>
---
 gcc/testsuite/g++.dg/modules/pr99023_b.X | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Torbjorn SVENSSON Nov. 2, 2022, 6:16 p.m. UTC | #1
Hi,

Ping, https://gcc.gnu.org/pipermail/gcc-patches/2022-October/604312.html

Ok for trunk?

Kind regards,
Torbjörn

On 2022-10-25 17:15, Torbjörn SVENSSON wrote:
> Without this patch, the following error is reported on Windows:
> 
> In file included from t:\build\arm-none-eabi\include\c++\11.3.1\string:54,
>                    from t:\build\arm-none-eabi\include\c++\11.3.1\bits\locale_classes.h:40,
>                    from t:\build\arm-none-eabi\include\c++\11.3.1\bits\ios_base.h:41,
>                    from t:\build\arm-none-eabi\include\c++\11.3.1\ios:42,
>                    from t:\build\arm-none-eabi\include\c++\11.3.1\ostream:38,
>                    from t:\build\arm-none-eabi\include\c++\11.3.1\iostream:39:
> t:\build\arm-none-eabi\include\c++\11.3.1\bits\range_access.h:36:10: note: include 't:\build\arm-none-eabi\include\c++\11.3.1\initializer_list' translated to import
> arm-none-eabi-g++.exe: warning: .../gcc/testsuite/g++.dg/modules/pr99023_b.X: linker input file unused because linking not done
> FAIL: g++.dg/modules/pr99023_b.X -std=c++2a  dg-regexp 6 not found: "[^\n]*: note: include '[^\n]*/initializer_list' translated to import\n"
> 
> gcc/testsuite/ChangeLog:
> 
> 	* g++.dg/modules/pr99023_b.X: Match Windows paths too.
> 
> Co-Authored-By: Yvan ROUX <yvan.roux@foss.st.com>
> Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com>
> ---
>   gcc/testsuite/g++.dg/modules/pr99023_b.X | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/gcc/testsuite/g++.dg/modules/pr99023_b.X b/gcc/testsuite/g++.dg/modules/pr99023_b.X
> index 3d82f34868b..ca5f32e5bcc 100644
> --- a/gcc/testsuite/g++.dg/modules/pr99023_b.X
> +++ b/gcc/testsuite/g++.dg/modules/pr99023_b.X
> @@ -3,5 +3,5 @@
>   
>   // { dg-prune-output {linker input file unused} }
>   
> -// { dg-regexp {[^\n]*: note: include '[^\n]*/initializer_list' translated to import\n} }
> +// { dg-regexp {[^\n]*: note: include '[^\n]*[/\\]initializer_list' translated to import\n} }
>   NO DO NOT COMPILE
  
Torbjorn SVENSSON Nov. 17, 2022, 4:44 p.m. UTC | #2
Hi,

Ping, https://gcc.gnu.org/pipermail/gcc-patches/2022-November/604896.html

Ok for trunk?

Kind regards,
Torbjörn

On 2022-11-02 19:16, Torbjorn SVENSSON wrote:
> Hi,
> 
> Ping, https://gcc.gnu.org/pipermail/gcc-patches/2022-October/604312.html
> 
> Ok for trunk?
> 
> Kind regards,
> Torbjörn
> 
> On 2022-10-25 17:15, Torbjörn SVENSSON wrote:
>> Without this patch, the following error is reported on Windows:
>>
>> In file included from 
>> t:\build\arm-none-eabi\include\c++\11.3.1\string:54,
>>                    from 
>> t:\build\arm-none-eabi\include\c++\11.3.1\bits\locale_classes.h:40,
>>                    from 
>> t:\build\arm-none-eabi\include\c++\11.3.1\bits\ios_base.h:41,
>>                    from t:\build\arm-none-eabi\include\c++\11.3.1\ios:42,
>>                    from 
>> t:\build\arm-none-eabi\include\c++\11.3.1\ostream:38,
>>                    from 
>> t:\build\arm-none-eabi\include\c++\11.3.1\iostream:39:
>> t:\build\arm-none-eabi\include\c++\11.3.1\bits\range_access.h:36:10: 
>> note: include 
>> 't:\build\arm-none-eabi\include\c++\11.3.1\initializer_list' 
>> translated to import
>> arm-none-eabi-g++.exe: warning: 
>> .../gcc/testsuite/g++.dg/modules/pr99023_b.X: linker input file unused 
>> because linking not done
>> FAIL: g++.dg/modules/pr99023_b.X -std=c++2a  dg-regexp 6 not found: 
>> "[^\n]*: note: include '[^\n]*/initializer_list' translated to import\n"
>>
>> gcc/testsuite/ChangeLog:
>>
>>     * g++.dg/modules/pr99023_b.X: Match Windows paths too.
>>
>> Co-Authored-By: Yvan ROUX <yvan.roux@foss.st.com>
>> Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com>
>> ---
>>   gcc/testsuite/g++.dg/modules/pr99023_b.X | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/gcc/testsuite/g++.dg/modules/pr99023_b.X 
>> b/gcc/testsuite/g++.dg/modules/pr99023_b.X
>> index 3d82f34868b..ca5f32e5bcc 100644
>> --- a/gcc/testsuite/g++.dg/modules/pr99023_b.X
>> +++ b/gcc/testsuite/g++.dg/modules/pr99023_b.X
>> @@ -3,5 +3,5 @@
>>   // { dg-prune-output {linker input file unused} }
>> -// { dg-regexp {[^\n]*: note: include '[^\n]*/initializer_list' 
>> translated to import\n} }
>> +// { dg-regexp {[^\n]*: note: include '[^\n]*[/\\]initializer_list' 
>> translated to import\n} }
>>   NO DO NOT COMPILE
  
Torbjorn SVENSSON Nov. 21, 2022, 3:38 p.m. UTC | #3
Pushed after off-list approval from Jeff Law.

On 2022-11-17 17:44, Torbjorn SVENSSON via Gcc-patches wrote:
> Hi,
> 
> Ping, https://gcc.gnu.org/pipermail/gcc-patches/2022-November/604896.html
> 
> Ok for trunk?
> 
> Kind regards,
> Torbjörn
> 
> On 2022-11-02 19:16, Torbjorn SVENSSON wrote:
>> Hi,
>>
>> Ping, https://gcc.gnu.org/pipermail/gcc-patches/2022-October/604312.html
>>
>> Ok for trunk?
>>
>> Kind regards,
>> Torbjörn
>>
>> On 2022-10-25 17:15, Torbjörn SVENSSON wrote:
>>> Without this patch, the following error is reported on Windows:
>>>
>>> In file included from 
>>> t:\build\arm-none-eabi\include\c++\11.3.1\string:54,
>>>                    from 
>>> t:\build\arm-none-eabi\include\c++\11.3.1\bits\locale_classes.h:40,
>>>                    from 
>>> t:\build\arm-none-eabi\include\c++\11.3.1\bits\ios_base.h:41,
>>>                    from 
>>> t:\build\arm-none-eabi\include\c++\11.3.1\ios:42,
>>>                    from 
>>> t:\build\arm-none-eabi\include\c++\11.3.1\ostream:38,
>>>                    from 
>>> t:\build\arm-none-eabi\include\c++\11.3.1\iostream:39:
>>> t:\build\arm-none-eabi\include\c++\11.3.1\bits\range_access.h:36:10: 
>>> note: include 
>>> 't:\build\arm-none-eabi\include\c++\11.3.1\initializer_list' 
>>> translated to import
>>> arm-none-eabi-g++.exe: warning: 
>>> .../gcc/testsuite/g++.dg/modules/pr99023_b.X: linker input file 
>>> unused because linking not done
>>> FAIL: g++.dg/modules/pr99023_b.X -std=c++2a  dg-regexp 6 not found: 
>>> "[^\n]*: note: include '[^\n]*/initializer_list' translated to import\n"
>>>
>>> gcc/testsuite/ChangeLog:
>>>
>>>     * g++.dg/modules/pr99023_b.X: Match Windows paths too.
>>>
>>> Co-Authored-By: Yvan ROUX <yvan.roux@foss.st.com>
>>> Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com>
>>> ---
>>>   gcc/testsuite/g++.dg/modules/pr99023_b.X | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/gcc/testsuite/g++.dg/modules/pr99023_b.X 
>>> b/gcc/testsuite/g++.dg/modules/pr99023_b.X
>>> index 3d82f34868b..ca5f32e5bcc 100644
>>> --- a/gcc/testsuite/g++.dg/modules/pr99023_b.X
>>> +++ b/gcc/testsuite/g++.dg/modules/pr99023_b.X
>>> @@ -3,5 +3,5 @@
>>>   // { dg-prune-output {linker input file unused} }
>>> -// { dg-regexp {[^\n]*: note: include '[^\n]*/initializer_list' 
>>> translated to import\n} }
>>> +// { dg-regexp {[^\n]*: note: include '[^\n]*[/\\]initializer_list' 
>>> translated to import\n} }
>>>   NO DO NOT COMPILE
  

Patch

diff --git a/gcc/testsuite/g++.dg/modules/pr99023_b.X b/gcc/testsuite/g++.dg/modules/pr99023_b.X
index 3d82f34868b..ca5f32e5bcc 100644
--- a/gcc/testsuite/g++.dg/modules/pr99023_b.X
+++ b/gcc/testsuite/g++.dg/modules/pr99023_b.X
@@ -3,5 +3,5 @@ 
 
 // { dg-prune-output {linker input file unused} }
 
-// { dg-regexp {[^\n]*: note: include '[^\n]*/initializer_list' translated to import\n} }
+// { dg-regexp {[^\n]*: note: include '[^\n]*[/\\]initializer_list' translated to import\n} }
 NO DO NOT COMPILE