diff options
| -rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/cpp/openmp-define-1.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/cpp/openmp-define-2.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/cpp/openmp-define-3.c | 11 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/openmp-define-1.f90 | 7 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/openmp-define-2.f90 | 7 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/openmp-define-3.f90 | 11 | ||||
| -rw-r--r-- | libgomp/ChangeLog | 3 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.fortran/openmp_version-1.f | 9 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.fortran/openmp_version-2.f90 | 9 |
10 files changed, 77 insertions, 0 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b06697bfe99..f182ad704b5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,12 @@ 2013-10-11 Thomas Schwinge <thomas@codesourcery.com> + * c-c++-common/cpp/openmp-define-1.c: New file. + * c-c++-common/cpp/openmp-define-2.c: Likewise. + * c-c++-common/cpp/openmp-define-3.c: Likewise. + * gfortran.dg/openmp-define-1.f90: Likewise. + * gfortran.dg/openmp-define-2.f90: Likewise. + * gfortran.dg/openmp-define-3.f90: Likewise. + * g++.dg/gomp/gomp.exp: Recurse into subdirectories when looking for test source files. * gcc.dg/gomp/gomp.exp: Likewise. diff --git a/gcc/testsuite/c-c++-common/cpp/openmp-define-1.c b/gcc/testsuite/c-c++-common/cpp/openmp-define-1.c new file mode 100644 index 00000000000..0e7943aa0b4 --- /dev/null +++ b/gcc/testsuite/c-c++-common/cpp/openmp-define-1.c @@ -0,0 +1,6 @@ +/* { dg-require-effective-target fopenmp } */ +/* { dg-do preprocess } */ + +#ifdef _OPENMP +# error _OPENMP defined +#endif diff --git a/gcc/testsuite/c-c++-common/cpp/openmp-define-2.c b/gcc/testsuite/c-c++-common/cpp/openmp-define-2.c new file mode 100644 index 00000000000..f7777892fe6 --- /dev/null +++ b/gcc/testsuite/c-c++-common/cpp/openmp-define-2.c @@ -0,0 +1,7 @@ +/* { dg-require-effective-target fopenmp } */ +/* { dg-options "-fno-openmp" } */ +/* { dg-do preprocess } */ + +#ifdef _OPENMP +# error _OPENMP defined +#endif diff --git a/gcc/testsuite/c-c++-common/cpp/openmp-define-3.c b/gcc/testsuite/c-c++-common/cpp/openmp-define-3.c new file mode 100644 index 00000000000..601a1c3623e --- /dev/null +++ b/gcc/testsuite/c-c++-common/cpp/openmp-define-3.c @@ -0,0 +1,11 @@ +/* { dg-require-effective-target fopenmp } */ +/* { dg-options "-fopenmp" } */ +/* { dg-do preprocess } */ + +#ifndef _OPENMP +# error _OPENMP not defined +#endif + +#if _OPENMP != 201307 +# error _OPENMP defined to wrong value +#endif diff --git a/gcc/testsuite/gfortran.dg/openmp-define-1.f90 b/gcc/testsuite/gfortran.dg/openmp-define-1.f90 new file mode 100644 index 00000000000..d4ef1d1eafb --- /dev/null +++ b/gcc/testsuite/gfortran.dg/openmp-define-1.f90 @@ -0,0 +1,7 @@ +! { dg-require-effective-target fopenmp } +! { dg-options "-cpp" } +! { dg-do preprocess } + +#ifdef _OPENMP +# error _OPENMP defined +#endif diff --git a/gcc/testsuite/gfortran.dg/openmp-define-2.f90 b/gcc/testsuite/gfortran.dg/openmp-define-2.f90 new file mode 100644 index 00000000000..651dae77f6f --- /dev/null +++ b/gcc/testsuite/gfortran.dg/openmp-define-2.f90 @@ -0,0 +1,7 @@ +! { dg-require-effective-target fopenmp } +! { dg-options "-cpp -fno-openmp" } +! { dg-do preprocess } + +#ifdef _OPENMP +# error _OPENMP defined +#endif diff --git a/gcc/testsuite/gfortran.dg/openmp-define-3.f90 b/gcc/testsuite/gfortran.dg/openmp-define-3.f90 new file mode 100644 index 00000000000..dfc45b1d1e1 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/openmp-define-3.f90 @@ -0,0 +1,11 @@ +! { dg-require-effective-target fopenmp } +! { dg-options "-cpp -fopenmp" } +! { dg-do preprocess } + +#ifndef _OPENMP +# error _OPENMP not defined +#endif + +#if _OPENMP != 201107 +# error _OPENMP defined to wrong value +#endif diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 9cc0df28e49..01df81d7966 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,5 +1,8 @@ 2013-10-11 Thomas Schwinge <thomas@codesourcery.com> + * testsuite/libgomp.fortran/openmp_version-1.f: New file. + * testsuite/libgomp.fortran/openmp_version-2.f90: Likewise. + * omp.h.in: Don't touch the user's namespace. 2013-10-11 Jakub Jelinek <jakub@redhat.com> diff --git a/libgomp/testsuite/libgomp.fortran/openmp_version-1.f b/libgomp/testsuite/libgomp.fortran/openmp_version-1.f new file mode 100644 index 00000000000..aaa888189b1 --- /dev/null +++ b/libgomp/testsuite/libgomp.fortran/openmp_version-1.f @@ -0,0 +1,9 @@ +! { dg-do run } + + program main + implicit none + include "omp_lib.h" + + if (openmp_version .ne. 201107) call abort; + + end program main diff --git a/libgomp/testsuite/libgomp.fortran/openmp_version-2.f90 b/libgomp/testsuite/libgomp.fortran/openmp_version-2.f90 new file mode 100644 index 00000000000..b2d1d261f27 --- /dev/null +++ b/libgomp/testsuite/libgomp.fortran/openmp_version-2.f90 @@ -0,0 +1,9 @@ +! { dg-do run } + +program main + use omp_lib + implicit none + + if (openmp_version .ne. 201107) call abort; + +end program main |