From b0e5c3b84ef2c477fe797da59a1aadfbed8445fe Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Fri, 16 Oct 2020 11:20:21 +0200 Subject: [PATCH] Adjust 'gfortran.dg/gomp/order-4.f90' for og10 Testcase added in og10 commit 835160b024ce34bc6f258e7df366bb5c15e12a4b "OpenMP: Handle order(concurrent) clause in gfortran" (cherry picked from commit d8140b9ed3c0fed041aedaff3fa4a603984ca10f), but og10 doesn't have commit 4f2ab6b89e170f1343f935761481c3745fe603b1 "[OpenMP, gimplifier] 'inform' after 'error' diagnostic". gcc/testsuite/ * gfortran.dg/gomp/order-4.f90: Adjust. --- gcc/testsuite/ChangeLog.omp | 4 ++++ gcc/testsuite/gfortran.dg/gomp/order-4.f90 | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp index d010ff87307c..97cad18a0692 100644 --- a/gcc/testsuite/ChangeLog.omp +++ b/gcc/testsuite/ChangeLog.omp @@ -1,3 +1,7 @@ +2021-03-25 Thomas Schwinge + + * gfortran.dg/gomp/order-4.f90: Adjust. + 2021-02-25 Tobias Burnus Backport from mainline diff --git a/gcc/testsuite/gfortran.dg/gomp/order-4.f90 b/gcc/testsuite/gfortran.dg/gomp/order-4.f90 index e4580e38b89a..e3863b6805bf 100644 --- a/gcc/testsuite/gfortran.dg/gomp/order-4.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/order-4.f90 @@ -7,7 +7,7 @@ subroutine f1 use m implicit none integer :: i - !$omp simd order(concurrent) ! { dg-message "note: enclosing region" } */ + !$omp simd order(concurrent) ! { dg-error "enclosing region" } do i = 1, 64 t = t + 1 ! { dg-error "threadprivate variable 't' used in a region with 'order\\(concurrent\\)' clause" } */ end do @@ -17,9 +17,10 @@ subroutine f2 use m implicit none integer :: i - !$omp do simd order(concurrent) ! { dg-message "note: enclosing region" } */ + !$omp do simd order(concurrent) ! { dg-error "enclosing region" } do i = 1, 64 t = t + 1 ! { dg-error "threadprivate variable 't' used in a region with 'order\\(concurrent\\)' clause" } */ + ! { dg-error "enclosing region" "" { target *-*-* } .-1 } end do end @@ -27,7 +28,7 @@ subroutine f3 use m implicit none integer :: i - !$omp do order(concurrent) ! { dg-message "note: enclosing region" } */ + !$omp do order(concurrent) ! { dg-error "enclosing region" } do i = 1, 64 t = t + 1 ! { dg-error "threadprivate variable 't' used in a region with 'order\\(concurrent\\)' clause" } */ end do -- 2.30.2