procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libgomp testsuite: Have each '*.exp' file specify the compiler to use [PR91884]

Browse source 
..., which is still 'GCC_UNDER_TEST' for all of them; no change in behavior.

	PR testsuite/91884
	libgomp/
	* testsuite/lib/libgomp.exp (libgomp_target_compile): Don't
	specify compiler.
	* testsuite/libgomp.c++/c++.exp (ALWAYS_CFLAGS): Specify compiler.
	* testsuite/libgomp.c/c.exp (ALWAYS_CFLAGS): Likewise.
	* testsuite/libgomp.fortran/fortran.exp (ALWAYS_CFLAGS): Likewise.
	* testsuite/libgomp.graphite/graphite.exp (ALWAYS_CFLAGS):
	Likewise.
	* testsuite/libgomp.oacc-c++/c++.exp (ALWAYS_CFLAGS): Likewise.
	* testsuite/libgomp.oacc-c/c.exp (ALWAYS_CFLAGS): Likewise.
	* testsuite/libgomp.oacc-fortran/fortran.exp (ALWAYS_CFLAGS):
	Likewise.
This commit is contained in:
Thomas Schwinge 2023-05-10 14:43:21 +02:00
parent 9be9be828d
commit 30e42bb66d
8 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libgomp/testsuite/lib/libgomp.exp
View file

@ -46,10 +46,6 @@ load_file libgomp-test-support.exp
set dg-do-what-default run
#
# GCC_UNDER_TEST is the compiler under test.
#
set libgomp_compile_options ""
#
@ -262,7 +258,6 @@ proc libgomp_target_compile { source dest type options } {
lappend options "additional_flags=[libio_include_flags]"
lappend options "timeout=[timeout_value]"
lappend options "compiler=$GCC_UNDER_TEST"
set options [concat $libgomp_compile_options $options]

10
libgomp/testsuite/libgomp.c++/c++.exp
View file

@ -16,6 +16,11 @@ if { $blddir != "" } {
return
}
set lang_link_flags "-lstdc++"
# Switch into C++ mode. Otherwise, the 'libgomp.c-c++-common/*.c'
# files would be compiled as C files.
set SAVE_GCC_UNDER_TEST "$GCC_UNDER_TEST"
set GCC_UNDER_TEST "$GCC_UNDER_TEST -x c++"
lappend ALWAYS_CFLAGS "compiler=$GCC_UNDER_TEST"
# If a testcase doesn't have special options, use these.
if ![info exists DEFAULT_CFLAGS] then {
@ -28,11 +33,6 @@ dg-init
# Turn on OpenMP.
lappend ALWAYS_CFLAGS "additional_flags=-fopenmp"
# Switch into C++ mode. Otherwise, the libgomp.c-c++-common/*.c
# files would be compiled as C files.
set SAVE_GCC_UNDER_TEST "$GCC_UNDER_TEST"
set GCC_UNDER_TEST "$GCC_UNDER_TEST -x c++"
# Gather a list of all tests.
set tests [lsort [concat \
[find $srcdir/$subdir *.C] \

2
libgomp/testsuite/libgomp.c/c.exp
View file

@ -1,6 +1,8 @@
load_lib libgomp-dg.exp
load_gcc_lib gcc-dg.exp
lappend ALWAYS_CFLAGS "compiler=$GCC_UNDER_TEST"
# If a testcase doesn't have special options, use these.
if ![info exists DEFAULT_CFLAGS] then {
set DEFAULT_CFLAGS "-O2"

1
libgomp/testsuite/libgomp.fortran/fortran.exp
View file

@ -29,6 +29,7 @@ if { $blddir != "" } {
set lang_include_flags "-fintrinsic-modules-path=${blddir}"
}
set lang_link_flags "-lgfortran -foffload=-lgfortran"
lappend ALWAYS_CFLAGS "compiler=$GCC_UNDER_TEST"
# Initialize dg.
dg-init

1
libgomp/testsuite/libgomp.graphite/graphite.exp
View file

@ -25,6 +25,7 @@ if ![check_effective_target_fgraphite] {
return
}
lappend ALWAYS_CFLAGS "compiler=$GCC_UNDER_TEST"
# Flags for force-parallel-*.c testcases.
set PARALLEL_CFLAGS "-ansi -pedantic-errors -O2 \
-ftree-parallelize-loops=4 -floop-parallelize-all \

10
libgomp/testsuite/libgomp.oacc-c++/c++.exp
View file

@ -26,6 +26,11 @@ if { $blddir != "" } {
return
}
set lang_link_flags "-lstdc++"
# Switch into C++ mode. Otherwise, the 'libgomp.oacc-c-c++-common/*.c'
# files would be compiled as C files.
set SAVE_GCC_UNDER_TEST "$GCC_UNDER_TEST"
set GCC_UNDER_TEST "$GCC_UNDER_TEST -x c++"
lappend ALWAYS_CFLAGS "compiler=$GCC_UNDER_TEST"
# Initialize dg.
dg-init
@ -34,11 +39,6 @@ torture-init
# Turn on OpenACC.
lappend ALWAYS_CFLAGS "additional_flags=-fopenacc"
# Switch into C++ mode. Otherwise, the libgomp.oacc-c-c++-common/*.c
# files would be compiled as C files.
set SAVE_GCC_UNDER_TEST "$GCC_UNDER_TEST"
set GCC_UNDER_TEST "$GCC_UNDER_TEST -x c++"
# Gather a list of all tests.
set tests [lsort [concat \
[find $srcdir/$subdir *.C] \

2
libgomp/testsuite/libgomp.oacc-c/c.exp
View file

@ -15,6 +15,8 @@ proc check_effective_target_c++ { } {
dg-init
torture-init
lappend ALWAYS_CFLAGS "compiler=$GCC_UNDER_TEST"
# Turn on OpenACC.
lappend ALWAYS_CFLAGS "additional_flags=-fopenacc"

1
libgomp/testsuite/libgomp.oacc-fortran/fortran.exp
View file

@ -31,6 +31,7 @@ if { $blddir != "" } {
set lang_include_flags "-fintrinsic-modules-path=${blddir}"
}
set lang_link_flags "-lgfortran -foffload=-lgfortran"
lappend ALWAYS_CFLAGS "compiler=$GCC_UNDER_TEST"
# Initialize dg.
dg-init