Re: [PATCH] Move effective target check after other directives in c-c++-common/cpp/openmp-define-3.c

[Thomas Schwinge]

Hi!

On Wed, 16 Oct 2013 10:54:48 +0100, Kyrill Tkachov <kyrylo.tkac...@arm.com> 
wrote:
> >> --- a/gcc/testsuite/c-c++-common/cpp/openmp-define-3.c
> >> +++ b/gcc/testsuite/c-c++-common/cpp/openmp-define-3.c
> >> @@ -1,6 +1,6 @@
> >> -/* { dg-require-effective-target fopenmp } */
> >>   /* { dg-options "-fopenmp" } */
> >>   /* { dg-do preprocess } */
> >> +/* { dg-require-effective-target fopenmp } */
> > The other testsuite files that I added in r203417 should also be adapted
> > accordingly.  Do you want to do that, or want me to do it?
> I'll leave the honors to you :)

Sure.  ;-)

Pushed to trunk, r203697:

gcc/testsuite/
        * c-c++-common/cpp/openmp-define-1.c: Move
        dg-require-effective-target fopenmp after dg-do directive.
        * c-c++-common/cpp/openmp-define-2.c: Likewise.
        * gfortran.dg/openmp-define-1.f90: Likewise.
        * gfortran.dg/openmp-define-2.f90: Likewise.
        * gfortran.dg/openmp-define-3.f90: Likewise.

Completion of r203588, fix-up for r203417.

diff --git gcc/testsuite/c-c++-common/cpp/openmp-define-1.c 
gcc/testsuite/c-c++-common/cpp/openmp-define-1.c
index 0e7943a..c537922 100644
--- gcc/testsuite/c-c++-common/cpp/openmp-define-1.c
+++ gcc/testsuite/c-c++-common/cpp/openmp-define-1.c
@@ -1,5 +1,5 @@
-/* { dg-require-effective-target fopenmp } */
 /* { dg-do preprocess } */
+/* { dg-require-effective-target fopenmp } */
 
 #ifdef _OPENMP
 # error _OPENMP defined
diff --git gcc/testsuite/c-c++-common/cpp/openmp-define-2.c 
gcc/testsuite/c-c++-common/cpp/openmp-define-2.c
index f777789..8823e29 100644
--- gcc/testsuite/c-c++-common/cpp/openmp-define-2.c
+++ gcc/testsuite/c-c++-common/cpp/openmp-define-2.c
@@ -1,6 +1,6 @@
-/* { dg-require-effective-target fopenmp } */
 /* { dg-options "-fno-openmp" } */
 /* { dg-do preprocess } */
+/* { dg-require-effective-target fopenmp } */
 
 #ifdef _OPENMP
 # error _OPENMP defined
diff --git gcc/testsuite/gfortran.dg/openmp-define-1.f90 
gcc/testsuite/gfortran.dg/openmp-define-1.f90
index d4ef1d1..4e1c076 100644
--- gcc/testsuite/gfortran.dg/openmp-define-1.f90
+++ gcc/testsuite/gfortran.dg/openmp-define-1.f90
@@ -1,6 +1,6 @@
-! { dg-require-effective-target fopenmp }
 ! { dg-options "-cpp" }
 ! { dg-do preprocess }
+! { dg-require-effective-target fopenmp }
 
 #ifdef _OPENMP
 # error _OPENMP defined
diff --git gcc/testsuite/gfortran.dg/openmp-define-2.f90 
gcc/testsuite/gfortran.dg/openmp-define-2.f90
index 651dae7..cd167ea 100644
--- gcc/testsuite/gfortran.dg/openmp-define-2.f90
+++ gcc/testsuite/gfortran.dg/openmp-define-2.f90
@@ -1,6 +1,6 @@
-! { dg-require-effective-target fopenmp }
 ! { dg-options "-cpp -fno-openmp" }
 ! { dg-do preprocess }
+! { dg-require-effective-target fopenmp }
 
 #ifdef _OPENMP
 # error _OPENMP defined
diff --git gcc/testsuite/gfortran.dg/openmp-define-3.f90 
gcc/testsuite/gfortran.dg/openmp-define-3.f90
index dfc45b1..3d55986 100644
--- gcc/testsuite/gfortran.dg/openmp-define-3.f90
+++ gcc/testsuite/gfortran.dg/openmp-define-3.f90
@@ -1,6 +1,6 @@
-! { dg-require-effective-target fopenmp }
 ! { dg-options "-cpp -fopenmp" }
 ! { dg-do preprocess }
+! { dg-require-effective-target fopenmp }
 
 #ifndef _OPENMP
 # error _OPENMP not defined


Grüße,
 Thomas

pgp0HJQRNg51x.pgp
Description: PGP signature