testsuite: Windows reports errors with CreateProcess

Message ID 20220929180710.2235253-1-torbjorn.svensson@foss.st.com
State Accepted, archived
Headers
Series testsuite: Windows reports errors with CreateProcess |

Checks

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

Commit Message

Torbjorn SVENSSON Sept. 29, 2022, 6:07 p.m. UTC
  When the mapper can't be executed, Windows report the error like:
.../bad-mapper-1.C: error: failed CreateProcess mapper 'this-will-not-work'

On Linux, the same error is reported this way:
.../bad-mapper-1.C: error: failed execvp mapper 'this-will-not-work'

This patch allows both output forms to be accepted.

Patch has been verified on Windows and Linux.

gcc/testsuite:

	* g++.dg/modules/bad-mapper-1.C: Also accept CreateProcess.

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/bad-mapper-1.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Torbjorn SVENSSON Oct. 5, 2022, 9:15 a.m. UTC | #1
Hi,

Ping, https://gcc.gnu.org/pipermail/gcc-patches/2022-September/602541.html

Kind regards,
Torbjörn

On 2022-09-29 20:07, Torbjörn SVENSSON wrote:
> When the mapper can't be executed, Windows report the error like:
> .../bad-mapper-1.C: error: failed CreateProcess mapper 'this-will-not-work'
> 
> On Linux, the same error is reported this way:
> .../bad-mapper-1.C: error: failed execvp mapper 'this-will-not-work'
> 
> This patch allows both output forms to be accepted.
> 
> Patch has been verified on Windows and Linux.
> 
> gcc/testsuite:
> 
> 	* g++.dg/modules/bad-mapper-1.C: Also accept CreateProcess.
> 
> 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/bad-mapper-1.C | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/gcc/testsuite/g++.dg/modules/bad-mapper-1.C b/gcc/testsuite/g++.dg/modules/bad-mapper-1.C
> index 6d0ed4b5895..4b2312885d8 100644
> --- a/gcc/testsuite/g++.dg/modules/bad-mapper-1.C
> +++ b/gcc/testsuite/g++.dg/modules/bad-mapper-1.C
> @@ -1,6 +1,6 @@
>   //  { dg-additional-options "-fmodules-ts -fmodule-mapper=|this-will-not-work" }
>   import unique1.bob;
> -// { dg-error "-:failed exec.*mapper.* .*this-will-not-work" "" { target { ! { *-*-darwin[89]* *-*-darwin10* } } } 0 }
> +// { dg-error "-:failed (exec|CreateProcess).*mapper.* .*this-will-not-work" "" { target { ! { *-*-darwin[89]* *-*-darwin10* } } } 0 }
>   // { dg-prune-output "fatal error:" }
>   // { dg-prune-output "failed to read" }
>   // { dg-prune-output "compilation terminated" }
  
Jonathan Yong Oct. 5, 2022, 9:48 a.m. UTC | #2
On 10/5/22 09:15, Torbjorn SVENSSON via Gcc-patches wrote:
> Hi,
> 
> Ping, https://gcc.gnu.org/pipermail/gcc-patches/2022-September/602541.html
> 
> Kind regards,
> Torbjörn
> 

Looks good to me, pushed to master branch as 
fa8e3a055a082e38aeab2561a5016b01ebfd6ebd.
  

Patch

diff --git a/gcc/testsuite/g++.dg/modules/bad-mapper-1.C b/gcc/testsuite/g++.dg/modules/bad-mapper-1.C
index 6d0ed4b5895..4b2312885d8 100644
--- a/gcc/testsuite/g++.dg/modules/bad-mapper-1.C
+++ b/gcc/testsuite/g++.dg/modules/bad-mapper-1.C
@@ -1,6 +1,6 @@ 
 //  { dg-additional-options "-fmodules-ts -fmodule-mapper=|this-will-not-work" }
 import unique1.bob;
-// { dg-error "-:failed exec.*mapper.* .*this-will-not-work" "" { target { ! { *-*-darwin[89]* *-*-darwin10* } } } 0 }
+// { dg-error "-:failed (exec|CreateProcess).*mapper.* .*this-will-not-work" "" { target { ! { *-*-darwin[89]* *-*-darwin10* } } } 0 }
 // { dg-prune-output "fatal error:" }
 // { dg-prune-output "failed to read" }
 // { dg-prune-output "compilation terminated" }