public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/omp/gcc-12] '{c-c++-common, gfortran.dg}/gomp/uses_allocators-*' -> 'libgomp.{c-c++-common, fortran}/uses_allocato
@ 2023-02-09 11:25 Thomas Schwinge
  0 siblings, 0 replies; only message in thread
From: Thomas Schwinge @ 2023-02-09 11:25 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:6e0ba07ff1859bc822c7220bfff18e7e9a147206

commit 6e0ba07ff1859bc822c7220bfff18e7e9a147206
Author: Thomas Schwinge <thomas@codesourcery.com>
Date:   Mon Jan 30 17:55:13 2023 +0100

    '{c-c++-common,gfortran.dg}/gomp/uses_allocators-*' -> 'libgomp.{c-c++-common,fortran}/uses_allocators-*'
    
    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:
---
 gcc/testsuite/ChangeLog.omp                                   |  7 +++++++
 libgomp/ChangeLog.omp                                         | 11 +++++++++++
 libgomp/testsuite/libgomp.c++/c++.exp                         |  7 +++++++
 .../testsuite/libgomp.c-c++-common}/uses_allocators-1.c       |  0
 .../testsuite/libgomp.c-c++-common}/uses_allocators-2.c       |  0
 .../testsuite/libgomp.c-c++-common}/uses_allocators-3.c       |  0
 libgomp/testsuite/libgomp.c/c.exp                             |  7 +++++++
 .../testsuite/libgomp.fortran}/uses_allocators-1.f90          |  0
 .../testsuite/libgomp.fortran}/uses_allocators-2.f90          |  0
 .../testsuite/libgomp.fortran}/uses_allocators-3.f90          |  0
 10 files changed, 32 insertions(+)

diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index 9f9d5a10ac3..936e7af0945 100644
--- 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 39165173884..0a3d53602da 100644
--- 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 f4884e2ffa7..1bcf21f034e 100644
--- 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 31bdd5795dc..3b4cdd05ac5 100644
--- 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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2023-02-09 11:25 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-09 11:25 [gcc/devel/omp/gcc-12] '{c-c++-common, gfortran.dg}/gomp/uses_allocators-*' -> 'libgomp.{c-c++-common, fortran}/uses_allocato Thomas Schwinge

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).