Fortran: Fix testcases from [PR32365]

	PR fortran/32365

gcc/testsuite/ChangeLog:

	* gfortran.dg/goacc/routine-1.f90: Adjust dg-error format.
	* gfortran.dg/goacc/routine-2.f90: Adjust dg-error format.
	* gfortran.dg/gomp/declare-variant-17.f90: Adjust dg-error format.
	* gfortran.dg/gomp/order-2.f90: Adjust dg-error format.
	* gfortran.dg/gomp/pr78026.f03: Adjust dg-error format.
	* gfortran.dg/gomp/requires-4.f90: Adjust dg-error format.
	* gfortran.dg/gomp/requires-6.f90: Adjust dg-error format.

diff --git a/gcc/testsuite/gfortran.dg/goacc/routine-1.f90 b/gcc/testsuite/gfortran.dg/goacc/routine-1.f90
index 6378c31309fb20f50fc9442418c8f9529ab38e6d..14617ade285a9e467fde286a2335baa5aa8de616 100644 (file)
--- a/gcc/testsuite/gfortran.dg/goacc/routine-1.f90
+++ b/gcc/testsuite/gfortran.dg/goacc/routine-1.f90
@@ -4,7 +4,7 @@
   integer :: a(n), i
   integer, external :: fact
   i = 1
-  !$acc routine (fact)  ! { dg-error "\\!\\$ACC ROUTINE statement at \\(1\\) cannot appear after executable statements" }
+  !$acc routine (fact)  ! { dg-error "\\!\\\$ACC ROUTINE statement at \\(1\\) cannot appear after executable statements" }
   !$acc routine ()  ! { dg-error "Syntax error in \\\!\\\$ACC ROUTINE \\\( NAME \\\)" }
   !$acc parallel
   !$acc loop
@@ -21,7 +21,7 @@ recursive function fact (x) result (res)
   integer, intent(in) :: x
   integer :: res
   res = 1
-  !$acc routine  ! { dg-error "\\!\\$ACC ROUTINE statement at \\(1\\) cannot appear after executable statements" }
+  !$acc routine  ! { dg-error "\\!\\\$ACC ROUTINE statement at \\(1\\) cannot appear after executable statements" }
   if (x < 1) then
      res = 1
   else
@@ -32,6 +32,6 @@ subroutine incr (x)
   integer, intent(inout) :: x
   integer i
   i = 0
-  !$acc routine  ! { dg-error "\\!\\$ACC ROUTINE statement at \\(1\\) cannot appear after executable statements" }
+  !$acc routine  ! { dg-error "\\!\\\$ACC ROUTINE statement at \\(1\\) cannot appear after executable statements" }
   x = x + 1
 end subroutine incr

diff --git a/gcc/testsuite/gfortran.dg/goacc/routine-2.f90 b/gcc/testsuite/gfortran.dg/goacc/routine-2.f90
index 28d3205f4a77a1ca3c3fc398d76ef5d1616d68b9..6188bd8967dcc254647c1fc6a6f6c31035388212 100644 (file)
--- a/gcc/testsuite/gfortran.dg/goacc/routine-2.f90
+++ b/gcc/testsuite/gfortran.dg/goacc/routine-2.f90
@@ -7,7 +7,7 @@
       integer :: res
       integer i
       i = 0
-      !$acc routine  ! { dg-error "\\!\\$ACC ROUTINE statement at \\(1\\) cannot appear after executable statements" }
+      !$acc routine  ! { dg-error "\\!\\\$ACC ROUTINE statement at \\(1\\) cannot appear after executable statements" }
       if (x < 1) then
          res = 1
       else

diff --git a/gcc/testsuite/gfortran.dg/gomp/declare-variant-17.f90 b/gcc/testsuite/gfortran.dg/gomp/declare-variant-17.f90
index 9010a2369a8813ff53f022d25adb6091a43ef14b..ae5ca9529a01369da1d693f8e61105d333011ecf 100644 (file)
--- a/gcc/testsuite/gfortran.dg/gomp/declare-variant-17.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/declare-variant-17.f90
@@ -7,11 +7,11 @@ program main
 
   continue
 
-  !$omp declare variant (base: variant) match (construct={parallel})  ! { dg-error "\\!\\$OMP DECLARE VARIANT statement at \\(1\\) cannot appear after executable statements" }
+  !$omp declare variant (base: variant) match (construct={parallel})  ! { dg-error "\\!\\\$OMP DECLARE VARIANT statement at \\(1\\) cannot appear after executable statements" }
 contains
   subroutine base ()
     continue
 
-    !$omp declare variant (variant) match (construct={parallel})  ! { dg-error "\\!\\$OMP DECLARE VARIANT statement at \\(1\\) cannot appear after executable statements" }
+    !$omp declare variant (variant) match (construct={parallel})  ! { dg-error "\\!\\\$OMP DECLARE VARIANT statement at \\(1\\) cannot appear after executable statements" }
   end subroutine
 end program

diff --git a/gcc/testsuite/gfortran.dg/gomp/order-2.f90 b/gcc/testsuite/gfortran.dg/gomp/order-2.f90
index d1fb310f90f52c884dd2d746ae38a239dd3285f3..8938cacc110f08394f52a2eb2e889dff2e4d3e6d 100644 (file)
--- a/gcc/testsuite/gfortran.dg/gomp/order-2.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/order-2.f90
@@ -11,14 +11,14 @@ contains
     implicit none
     integer, save :: t
     t = 1
-    !$omp threadprivate (t1)   ! { dg-error "\\!\\$OMP THREADPRIVATE statement at \\(1\\) cannot appear after executable statements" }
+    !$omp threadprivate (t1)   ! { dg-error "\\!\\\$OMP THREADPRIVATE statement at \\(1\\) cannot appear after executable statements" }
   end subroutine f2
   subroutine f3
     use m
     implicit none
     integer :: j
     j = 1
-    !$omp declare reduction (foo:real:omp_out = omp_out + omp_in)      ! { dg-error "\\!\\$OMP DECLARE REDUCTION statement at \\(1\\) cannot appear after executable statements" }
+    !$omp declare reduction (foo:real:omp_out = omp_out + omp_in)      ! { dg-error "\\!\\\$OMP DECLARE REDUCTION statement at \\(1\\) cannot appear after executable statements" }
   end subroutine f3
   subroutine f4
     use m
@@ -26,12 +26,12 @@ contains
     !$omp declare target
     integer, save :: f4_1
     f4_1 = 1
-    !$omp declare target (f4_1)        ! { dg-error "\\!\\$OMP DECLARE TARGET statement at \\(1\\) cannot appear after executable statements" }
-    !$omp declare target       ! { dg-error "\\!\\$OMP DECLARE TARGET statement at \\(1\\) cannot appear after executable statements" }
+    !$omp declare target (f4_1)        ! { dg-error "\\!\\\$OMP DECLARE TARGET statement at \\(1\\) cannot appear after executable statements" }
+    !$omp declare target       ! { dg-error "\\!\\\$OMP DECLARE TARGET statement at \\(1\\) cannot appear after executable statements" }
   end subroutine f4
   integer function f5 (a, b)
     integer :: a, b
     a = 1; b = 2
-    !$omp declare simd (f5) notinbranch        ! { dg-error "\\!\\$OMP DECLARE SIMD statement at \\(1\\) cannot appear after executable statements" }
+    !$omp declare simd (f5) notinbranch        ! { dg-error "\\!\\\$OMP DECLARE SIMD statement at \\(1\\) cannot appear after executable statements" }
   end function f5
 end subroutine f1

diff --git a/gcc/testsuite/gfortran.dg/gomp/pr78026.f03 b/gcc/testsuite/gfortran.dg/gomp/pr78026.f03
index 6995abc83672076ab02db325e4a9cf4b3b72debb..8278d69335cc13c1e7714bf204ab8f0bc16c3fb2 100644 (file)
--- a/gcc/testsuite/gfortran.dg/gomp/pr78026.f03
+++ b/gcc/testsuite/gfortran.dg/gomp/pr78026.f03
@@ -1,5 +1,5 @@
 ! PR fortran/78026
 select type (a)                ! { dg-error "Selector shall be polymorphic in SELECT TYPE statement" }
 end select
-!$omp declare simd(b)  ! { dg-error "\\!\\$OMP DECLARE SIMD statement at \\(1\\) cannot appear after executable statements" }
+!$omp declare simd(b)  ! { dg-error "\\!\\\$OMP DECLARE SIMD statement at \\(1\\) cannot appear after executable statements" }
 end                    ! { dg-error "should refer to containing procedure" "" { target *-*-* } .-1 }

diff --git a/gcc/testsuite/gfortran.dg/gomp/requires-4.f90 b/gcc/testsuite/gfortran.dg/gomp/requires-4.f90
index fd4d0a8d7c30deb92bd56383f3c220c51f712313..0b7d4b8b0e8475d417e812ec4b6c62550f15ccf4 100644 (file)
--- a/gcc/testsuite/gfortran.dg/gomp/requires-4.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/requires-4.f90
@@ -16,7 +16,7 @@ end
 
 subroutine foobar
 i = 5  ! < execution statement
-!$omp requires atomic_default_mem_order(seq_cst) ! { dg-error "\\!\\$OMP REQUIRES statement at \\(1\\) cannot appear after executable statements" }
+!$omp requires atomic_default_mem_order(seq_cst) ! { dg-error "\\!\\\$OMP REQUIRES statement at \\(1\\) cannot appear after executable statements" }
 end
 
 program main

diff --git a/gcc/testsuite/gfortran.dg/gomp/requires-6.f90 b/gcc/testsuite/gfortran.dg/gomp/requires-6.f90
index 10a6e6960910052a63d0f45cfe046dbc44c47a3e..dd55f9386f5a86a42a19b48a470d2b8946c0d85f 100644 (file)
--- a/gcc/testsuite/gfortran.dg/gomp/requires-6.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/requires-6.f90
@@ -10,5 +10,5 @@ end
 subroutine foobar
 !$omp atomic
  i = i + 5
-!$omp requires atomic_default_mem_order(acq_rel) ! { dg-error "\\!\\$OMP REQUIRES statement at \\(1\\) cannot appear after executable statements" }
+!$omp requires atomic_default_mem_order(acq_rel) ! { dg-error "\\!\\\$OMP REQUIRES statement at \\(1\\) cannot appear after executable statements" }
 end