Currently because all the standard OpenMP/OpenACC headers and modules (omp.h,
openacc.h, omp_lib, etc.) are all part of libgomp, the compiler scan tests in
gcc/testsuite/*/gomp or gcc/testsuite/*/goacc cannot use them.
This became somewhat pronounced when several Fortran uses_allocators tests that
had "use omp_lib" but were only compiler scan tests, had to be placed in
libgomp/testsuite.
I am trying to place all scan-only tests inside gcc/testsuite/*, so came up
with the attached patch.
This adjusts gomp.exp, goacc.exp, and gomp-goacc.exp in gcc/testsuite/* to add
-I<libgomp-build-directory> to the test compiler options. So far it works as
expected.
Okay for mainline?
Thanks,
Chung-Lin
gcc/testsuite/ChangeLog:
* g++.dg/goacc-gomp/goacc-gomp.exp:
Add -I${objdir}/../../../${target_triplet}/libgomp to default extra
flags.
* g++.dg/goacc/goacc.exp: Likewise.
* g++.dg/gomp/gomp.exp: Likewise.
* gcc.dg/goacc-gomp/goacc-gomp.exp: Likewise.
* gcc.dg/goacc/goacc.exp: Likewise.
* gcc.dg/gomp/gomp.exp: Likewise.
* gfortran.dg/goacc-gomp/goacc-gomp.exp: Likewise.
* gfortran.dg/goacc/goacc.exp: Likewise.
* gfortran.dg/gomp/gomp.exp: Likewise.
diff --git a/gcc/testsuite/g++.dg/goacc-gomp/goacc-gomp.exp
b/gcc/testsuite/g++.dg/goacc-gomp/goacc-gomp.exp
index 3de612257ad..ea6cf73dfd6 100644
--- a/gcc/testsuite/g++.dg/goacc-gomp/goacc-gomp.exp
+++ b/gcc/testsuite/g++.dg/goacc-gomp/goacc-gomp.exp
@@ -30,7 +30,8 @@ dg-init
# Main loop.
g++-dg-runtest [lsort [concat \
[find $srcdir/$subdir *.C] \
- [find $srcdir/c-c++-common/goacc-gomp *.c]]] "" "-fopenacc -fopenmp"
+ [find $srcdir/c-c++-common/goacc-gomp *.c]]] "" \
+ "-fopenacc -fopenmp -I${objdir}/../../../${target_triplet}/libgomp"
# All done.
dg-finish
diff --git a/gcc/testsuite/g++.dg/goacc/goacc.exp
b/gcc/testsuite/g++.dg/goacc/goacc.exp
index 5dee7b52603..7e75ba39206 100644
--- a/gcc/testsuite/g++.dg/goacc/goacc.exp
+++ b/gcc/testsuite/g++.dg/goacc/goacc.exp
@@ -29,7 +29,8 @@ dg-init
# Main loop.
g++-dg-runtest [lsort [concat \
[find $srcdir/$subdir *.C] \
- [find $srcdir/c-c++-common/goacc *.c]]] "" "-fopenacc"
+ [find $srcdir/c-c++-common/goacc *.c]]] "" \
+ "-fopenacc -I${objdir}/../../../${target_triplet}/libgomp"
# All done.
dg-finish
diff --git a/gcc/testsuite/g++.dg/gomp/gomp.exp
b/gcc/testsuite/g++.dg/gomp/gomp.exp
index 0969533b5fd..5d1f4f7b3b2 100644
--- a/gcc/testsuite/g++.dg/gomp/gomp.exp
+++ b/gcc/testsuite/g++.dg/gomp/gomp.exp
@@ -29,7 +29,8 @@ dg-init
# Main loop.
g++-dg-runtest [lsort [concat \
[find $srcdir/$subdir *.C] \
- [find $srcdir/c-c++-common/gomp *.c]]] "" "-fopenmp"
+ [find $srcdir/c-c++-common/gomp *.c]]] "" \
+ "-fopenmp -I${objdir}/../../../${target_triplet}/libgomp"
# All done.
dg-finish
diff --git a/gcc/testsuite/gcc.dg/goacc-gomp/goacc-gomp.exp
b/gcc/testsuite/gcc.dg/goacc-gomp/goacc-gomp.exp
index c8f4c084b32..7cf2293b285 100644
--- a/gcc/testsuite/gcc.dg/goacc-gomp/goacc-gomp.exp
+++ b/gcc/testsuite/gcc.dg/goacc-gomp/goacc-gomp.exp
@@ -32,7 +32,8 @@ dg-init
# Main loop.
dg-runtest [lsort [concat \
[find $srcdir/$subdir *.c] \
- [find $srcdir/c-c++-common/goacc-gomp *.c]]] "" "-fopenacc -fopenmp"
+ [find $srcdir/c-c++-common/goacc-gomp *.c]]] "" \
+ "-fopenacc -fopenmp -I${objdir}/../../../${target_triplet}/libgomp"
# All done.
dg-finish
diff --git a/gcc/testsuite/gcc.dg/goacc/goacc.exp
b/gcc/testsuite/gcc.dg/goacc/goacc.exp
index 882b8aefd7f..a153fec63e8 100644
--- a/gcc/testsuite/gcc.dg/goacc/goacc.exp
+++ b/gcc/testsuite/gcc.dg/goacc/goacc.exp
@@ -31,7 +31,8 @@ dg-init
# Main loop.
dg-runtest [lsort [concat \
[find $srcdir/$subdir *.c] \
- [find $srcdir/c-c++-common/goacc *.c]]] "" "-fopenacc"
+ [find $srcdir/c-c++-common/goacc *.c]]] "" \
+ "-fopenacc -I${objdir}/../../../${target_triplet}/libgomp"
# All done.
dg-finish
diff --git a/gcc/testsuite/gcc.dg/gomp/gomp.exp
b/gcc/testsuite/gcc.dg/gomp/gomp.exp
index d92ff4b1b15..f5feb66b389 100644
--- a/gcc/testsuite/gcc.dg/gomp/gomp.exp
+++ b/gcc/testsuite/gcc.dg/gomp/gomp.exp
@@ -31,7 +31,8 @@ dg-init
# Main loop.
dg-runtest [lsort [concat \
[find $srcdir/$subdir *.c] \
- [find $srcdir/c-c++-common/gomp *.c]]] "" "-fopenmp"
+ [find $srcdir/c-c++-common/gomp *.c]]] "" \
+ "-fopenmp -I${objdir}/../../../${target_triplet}/libgomp"
# All done.
dg-finish
diff --git a/gcc/testsuite/gfortran.dg/goacc-gomp/goacc-gomp.exp
b/gcc/testsuite/gfortran.dg/goacc-gomp/goacc-gomp.exp
index 49513832252..417c0c27b3a 100644
--- a/gcc/testsuite/gfortran.dg/goacc-gomp/goacc-gomp.exp
+++ b/gcc/testsuite/gfortran.dg/goacc-gomp/goacc-gomp.exp
@@ -31,7 +31,8 @@ dg-init
# Main loop.
gfortran-dg-runtest [lsort \
- [find $srcdir/$subdir *.\[fF\]{,90,95,03,08} ] ] "" "-fopenacc -fopenmp"
+ [find $srcdir/$subdir *.\[fF\]{,90,95,03,08} ] ] "" \
+ "-fopenacc -fopenmp -I${objdir}/../../../${target_triplet}/libgomp"
# All done.
dg-finish
diff --git a/gcc/testsuite/gfortran.dg/goacc/goacc.exp
b/gcc/testsuite/gfortran.dg/goacc/goacc.exp
index da35c9cc349..0d7cdc6c878 100644
--- a/gcc/testsuite/gfortran.dg/goacc/goacc.exp
+++ b/gcc/testsuite/gfortran.dg/goacc/goacc.exp
@@ -55,7 +55,8 @@ proc dg-compile-aux-modules { args } {
# Main loop.
gfortran-dg-runtest [lsort \
- [find $srcdir/$subdir *.\[fF\]{,90,95,03,08} ] ] "" "-fopenacc"
+ [find $srcdir/$subdir *.\[fF\]{,90,95,03,08} ] ] "" \
+ "-fopenacc -I${objdir}/../../../${target_triplet}/libgomp"
# All done.
dg-finish
diff --git a/gcc/testsuite/gfortran.dg/gomp/gomp.exp
b/gcc/testsuite/gfortran.dg/gomp/gomp.exp
index 1a957f5a13d..a89fecdef6b 100644
--- a/gcc/testsuite/gfortran.dg/gomp/gomp.exp
+++ b/gcc/testsuite/gfortran.dg/gomp/gomp.exp
@@ -30,7 +30,8 @@ dg-init
# Main loop.
gfortran-dg-runtest [lsort \
- [find $srcdir/$subdir *.\[fF\]{,90,95,03,08} ] ] "" "-fopenmp"
+ [find $srcdir/$subdir *.\[fF\]{,90,95,03,08} ] ] "" \
+ "-fopenmp -I${objdir}/../../../${target_triplet}/libgomp"
# All done.
dg-finish
