[gcc/devel/omp/gcc-13] libgomp.c/target-51.c: Accept more error-msg variants in dg-output

[gcc/devel/omp/gcc-13] libgomp.c/target-51.c: Accept more error-msg variants in dg-output

[Tobias Burnus]

https://gcc.gnu.org/g:180b5fe60a8c70d4f4aac1be9e2b34f6ac5cfa4b

commit 180b5fe60a8c70d4f4aac1be9e2b34f6ac5cfa4b
Author: Tobias Burnus <tobias@codesourcery.com>
Date:   Mon Jun 19 11:21:04 2023 +0200

    libgomp.c/target-51.c: Accept more error-msg variants in dg-output
    
    Depending on the details, the testcase can fail with different but
    related messages; all of the following all could be observed for this
    testcase:
    
      libgomp: OMP_TARGET_OFFLOAD is set to MANDATORY, but device cannot be used for offloading
      libgomp: OMP_TARGET_OFFLOAD is set to MANDATORY, but device not found
      libgomp: OMP_TARGET_OFFLOAD is set to MANDATORY, but only the host device is available
    
    Before, the last two were tested for with 'target offload_device' and
    '! offload_device', respectively. Now, all three are accepted by matching
    '.*' already after 'but' and without distinguishing whether the effective
    target is an offload_device or not.
    
    (For completeness, there is a fourth error that follows this pattern:
    'OMP_TARGET_OFFLOAD is set to MANDATORY, but device is finalized'.)
    
    libgomp/
    
            * testsuite/libgomp.c/target-51.c: Accept more error msg variants
            as expected dg-output.
    
    (cherry picked from commit 01fe115ba7eafebcf97bbac9e157038a003d0c85)

Diff:
---
 libgomp/ChangeLog.omp                   | 8 ++++++++
 libgomp/testsuite/libgomp.c/target-51.c | 3 +--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index 74e0bfe5079..f9f821bd172 100644
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,3 +1,11 @@
+2023-06-19  Tobias Burnus  <tobias@codesourcery.com>
+
+	Backported from mainline:
+	2023-06-19  Tobias Burnus  <tobias@codesourcery.com>
+
+	* testsuite/libgomp.c/target-51.c: Accept more error msg variants
+	as expected dg-output.
+
 2023-06-19  Tobias Burnus  <tobias@codesourcery.com>
 
 	Backported from mainline:
diff --git a/libgomp/testsuite/libgomp.c/target-51.c b/libgomp/testsuite/libgomp.c/target-51.c
index bbe9ade6e24..db0363bfc14 100644
--- a/libgomp/testsuite/libgomp.c/target-51.c
+++ b/libgomp/testsuite/libgomp.c/target-51.c
@@ -9,8 +9,7 @@
 
 /* See comment in target-50.c/target-50.c for why the output differs.  */
 
-/* { dg-output ".*libgomp: OMP_TARGET_OFFLOAD is set to MANDATORY, but only the host device is available.*" { target { ! offload_device } } } */
-/* { dg-output ".*libgomp: OMP_TARGET_OFFLOAD is set to MANDATORY, but device not found.*" { target offload_device } } */
+/* { dg-output ".*libgomp: OMP_TARGET_OFFLOAD is set to MANDATORY, but .*" } } */
 
 int
 main ()