'{c-c++-common,gfortran.dg}/gomp/uses_allocators-*' -> 'libgomp.{c-c++-common,fortran...

Otherwise, for build-tree testing:

    [...]/gcc/testsuite/c-c++-common/gomp/uses_allocators-1.c:4:10: fatal error: omp.h: No such file or directory

    [...]/gcc/testsuite/c-c++-common/gomp/uses_allocators-2.c:3:10: fatal error: omp.h: No such file or directory

    [...]/gcc/testsuite/c-c++-common/gomp/uses_allocators-3.c:4:10: fatal error: omp.h: No such file or directory

    [...]/gcc/testsuite/gfortran.dg/gomp/uses_allocators-1.f90:5:7: Fatal Error: Cannot open module file 'omp_lib.mod' for reading at (1): No such file or directory

    [...]/gcc/testsuite/gfortran.dg/gomp/uses_allocators-2.f90:4:7: Fatal Error: Cannot open module file 'omp_lib.mod' for reading at (1): No such file or directory

    [...]/gcc/testsuite/gfortran.dg/gomp/uses_allocators-3.f90:4:7: Fatal Error: Cannot open module file 'omp_lib.mod' for reading at (1): No such file or directory

..., and thus corresponding FAILs, UNRESOLVEDs.

Fix-up for og12 commit dbc770c4351c8824e8083f8aff6117a6b4ba3c0d
"openmp: Implement uses_allocators clause".

	gcc/testsuite/
	* c-c++-common/gomp/uses_allocators-1.c: Cut.
	* c-c++-common/gomp/uses_allocators-2.c: Likewise.
	* c-c++-common/gomp/uses_allocators-3.c: Likewise.
	* gfortran.dg/gomp/uses_allocators-1.f90: Likewise.
	* gfortran.dg/gomp/uses_allocators-2.f90: Likewise.
	* gfortran.dg/gomp/uses_allocators-3.f90: Likewise.
	libgomp/
	* testsuite/libgomp.c++/c++.exp (check_effective_target_c)
	(check_effective_target_c++): New.
	* testsuite/libgomp.c/c.exp (check_effective_target_c)
	(check_effective_target_c++): Likewise.
	* testsuite/libgomp.c-c++-common/uses_allocators-1.c: Paste.
	* testsuite/libgomp.c-c++-common/uses_allocators-2.c: Likewise.
	* testsuite/libgomp.c-c++-common/uses_allocators-3.c: Likewise.
	* testsuite/libgomp.fortran/uses_allocators-1.f90: Likewise.
	* testsuite/libgomp.fortran/uses_allocators-2.f90: Likewise.
	* testsuite/libgomp.fortran/uses_allocators-3.f90: Likewise.

diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index 9f9d5a10ac3529ad79f11655047e55400fcb69e8..936e7af0945876fcbd37e3440192b28c451a1196 100644 (file)
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,5 +1,12 @@
 2023-02-09  Thomas Schwinge  <thomas@codesourcery.com>
 
+       * c-c++-common/gomp/uses_allocators-1.c: Cut.
+       * c-c++-common/gomp/uses_allocators-2.c: Likewise.
+       * c-c++-common/gomp/uses_allocators-3.c: Likewise.
+       * gfortran.dg/gomp/uses_allocators-1.f90: Likewise.
+       * gfortran.dg/gomp/uses_allocators-2.f90: Likewise.
+       * gfortran.dg/gomp/uses_allocators-3.f90: Likewise.
+
        * c-c++-common/gomp/alloc-pinned-1.c: Cut.
 
        * gfortran.dg/gomp/allocate-4.f90: Fix 'omp_allocator_handle_kind'

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index 39165173884b90ce73f9b191e6ba79dbd6c6571b..0a3d53602da8ab6f443f699f896fdee2a87a73d4 100644 (file)
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,5 +1,16 @@
 2023-02-09  Thomas Schwinge  <thomas@codesourcery.com>
 
+       * testsuite/libgomp.c++/c++.exp (check_effective_target_c)
+       (check_effective_target_c++): New.
+       * testsuite/libgomp.c/c.exp (check_effective_target_c)
+       (check_effective_target_c++): Likewise.
+       * testsuite/libgomp.c-c++-common/uses_allocators-1.c: Paste.
+       * testsuite/libgomp.c-c++-common/uses_allocators-2.c: Likewise.
+       * testsuite/libgomp.c-c++-common/uses_allocators-3.c: Likewise.
+       * testsuite/libgomp.fortran/uses_allocators-1.f90: Likewise.
+       * testsuite/libgomp.fortran/uses_allocators-2.f90: Likewise.
+       * testsuite/libgomp.fortran/uses_allocators-3.f90: Likewise.
+
        * testsuite/libgomp.c-c++-common/alloc-pinned-1.c: Paste.
 
 2023-02-08  Tobias Burnus  <tobias@codesourcery.com>

diff --git a/libgomp/testsuite/libgomp.c++/c++.exp b/libgomp/testsuite/libgomp.c++/c++.exp
index f4884e2ffa7a85932fc769cd90357da4040d522f..1bcf21f034eab9e6688ddbb809f7ae6716ae61af 100644 (file)
--- a/libgomp/testsuite/libgomp.c++/c++.exp
+++ b/libgomp/testsuite/libgomp.c++/c++.exp
@@ -1,6 +1,13 @@
 load_lib libgomp-dg.exp
 load_gcc_lib gcc-dg.exp
 
+proc check_effective_target_c { } {
+    return 0
+}
+proc check_effective_target_c++ { } {
+    return 1
+}
+
 global shlib_ext
 
 set shlib_ext [get_shlib_extension]

diff --git a/gcc/testsuite/c-c++-common/gomp/uses_allocators-1.c b/libgomp/testsuite/libgomp.c-c++-common/uses_allocators-1.c
similarity index 100%
rename from gcc/testsuite/c-c++-common/gomp/uses_allocators-1.c
rename to libgomp/testsuite/libgomp.c-c++-common/uses_allocators-1.c

diff --git a/gcc/testsuite/c-c++-common/gomp/uses_allocators-2.c b/libgomp/testsuite/libgomp.c-c++-common/uses_allocators-2.c
similarity index 100%
rename from gcc/testsuite/c-c++-common/gomp/uses_allocators-2.c
rename to libgomp/testsuite/libgomp.c-c++-common/uses_allocators-2.c

diff --git a/gcc/testsuite/c-c++-common/gomp/uses_allocators-3.c b/libgomp/testsuite/libgomp.c-c++-common/uses_allocators-3.c
similarity index 100%
rename from gcc/testsuite/c-c++-common/gomp/uses_allocators-3.c
rename to libgomp/testsuite/libgomp.c-c++-common/uses_allocators-3.c

diff --git a/libgomp/testsuite/libgomp.c/c.exp b/libgomp/testsuite/libgomp.c/c.exp
index 31bdd5795dc27cb159fd74700b277a8d69311c30..3b4cdd05ac50730cf1a62321f3ee7c1557e9e28b 100644 (file)
--- a/libgomp/testsuite/libgomp.c/c.exp
+++ b/libgomp/testsuite/libgomp.c/c.exp
@@ -12,6 +12,13 @@ if [info exists lang_include_flags] then {
 load_lib libgomp-dg.exp
 load_gcc_lib gcc-dg.exp
 
+proc check_effective_target_c { } {
+    return 1
+}
+proc check_effective_target_c++ { } {
+    return 0
+}
+
 # If a testcase doesn't have special options, use these.
 if ![info exists DEFAULT_CFLAGS] then {
     set DEFAULT_CFLAGS "-O2"

diff --git a/gcc/testsuite/gfortran.dg/gomp/uses_allocators-1.f90 b/libgomp/testsuite/libgomp.fortran/uses_allocators-1.f90
similarity index 100%
rename from gcc/testsuite/gfortran.dg/gomp/uses_allocators-1.f90
rename to libgomp/testsuite/libgomp.fortran/uses_allocators-1.f90

diff --git a/gcc/testsuite/gfortran.dg/gomp/uses_allocators-2.f90 b/libgomp/testsuite/libgomp.fortran/uses_allocators-2.f90
similarity index 100%
rename from gcc/testsuite/gfortran.dg/gomp/uses_allocators-2.f90
rename to libgomp/testsuite/libgomp.fortran/uses_allocators-2.f90

diff --git a/gcc/testsuite/gfortran.dg/gomp/uses_allocators-3.f90 b/libgomp/testsuite/libgomp.fortran/uses_allocators-3.f90
similarity index 100%
rename from gcc/testsuite/gfortran.dg/gomp/uses_allocators-3.f90
rename to libgomp/testsuite/libgomp.fortran/uses_allocators-3.f90