[gcc/devel/omp/gcc-11] Fortran: Add OpenMP's nothing directive support (con't)

[gcc/devel/omp/gcc-11] Fortran: Add OpenMP's nothing directive support (con't)

[Tobias Burnus]

https://gcc.gnu.org/g:a8c53aeac4a0c10aa738a482d8610e797df36a03

commit a8c53aeac4a0c10aa738a482d8610e797df36a03
Author: Tobias Burnus <tobias@codesourcery.com>
Date:   Thu Aug 19 12:02:17 2021 +0200

    Fortran: Add OpenMP's nothing directive support (con't)
    
    Fix directory to enable -fopenmp processing.
    
    gcc/testsuite/
            PR testsuite/101963
            * gfortran.dg/nothing-1.f90: Moved to ...
            * gfortran.dg/gomp/nothing-1.f90: ... here.
            * gfortran.dg/nothing-2.f90: Moved to ...
            * gfortran.dg/gomp/nothing-2.f90: ... here;
            avoid $ issue in $OMP in dg-error.
    
    (cherry picked from commit f0fca213bc52644ba896da622b35842a6157bd98)

Diff:
---
 gcc/testsuite/ChangeLog.omp                        | 12 ++++++++++++
 gcc/testsuite/gfortran.dg/{ => gomp}/nothing-1.f90 |  0
 gcc/testsuite/gfortran.dg/{ => gomp}/nothing-2.f90 |  2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index 1a3c8e65783..888162ba077 100644
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,3 +1,15 @@
+2021-08-19  Tobias Burnus  <tobias@codesourcery.com>
+
+	Backported from master:
+	2021-08-18  Tobias Burnus  <tobias@codesourcery.com>
+
+	PR testsuite/101963
+	* gfortran.dg/nothing-1.f90: Moved to ...
+	* gfortran.dg/gomp/nothing-1.f90: ... here.
+	* gfortran.dg/nothing-2.f90: Moved to ...
+	* gfortran.dg/gomp/nothing-2.f90: ... here;
+	avoid $ issue in $OMP in dg-error.
+
 2021-08-18  Tobias Burnus  <tobias@codesourcery.com>
 
 	Backported from master:
diff --git a/gcc/testsuite/gfortran.dg/nothing-1.f90 b/gcc/testsuite/gfortran.dg/gomp/nothing-1.f90
similarity index 100%
rename from gcc/testsuite/gfortran.dg/nothing-1.f90
rename to gcc/testsuite/gfortran.dg/gomp/nothing-1.f90
diff --git a/gcc/testsuite/gfortran.dg/nothing-2.f90 b/gcc/testsuite/gfortran.dg/gomp/nothing-2.f90
similarity index 75%
rename from gcc/testsuite/gfortran.dg/nothing-2.f90
rename to gcc/testsuite/gfortran.dg/gomp/nothing-2.f90
index 74a4a5a22b0..554d4ef99ca 100644
--- a/gcc/testsuite/gfortran.dg/nothing-2.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/nothing-2.f90
@@ -3,5 +3,5 @@ pure subroutine foo
 end subroutine
 
 subroutine bar
-  !$omp nothing foo  ! { dg-error "Unexpected junk after $OMP NOTHING statement" }
+  !$omp nothing foo  ! { dg-error "Unexpected junk after .OMP NOTHING statement" }
 end