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

libgomp testsuite: Localize 'lang_[...]' etc.

Browse source 
..., instead of letting them bleed into the next '*.exp' file, requiring
clean-up there.

	libgomp/
	* testsuite/libgomp.c++/c++.exp: Localize 'lang_[...]' etc.
	* testsuite/libgomp.c/c.exp: Likewise.
	* testsuite/libgomp.fortran/fortran.exp: Likewise.
	* testsuite/libgomp.graphite/graphite.exp: Likewise.
	* testsuite/libgomp.oacc-c++/c++.exp: Likewise.
	* testsuite/libgomp.oacc-c/c.exp: Likewise.
	* testsuite/libgomp.oacc-fortran/fortran.exp: Likewise.
This commit is contained in:
Thomas Schwinge 2023-05-09 10:09:35 +02:00
parent 4f67400b84
commit b1cdda9f36
7 changed files with 36 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,9 +7,6 @@ set shlib_ext [get_shlib_extension]
set lang_link_flags "-lstdc++"
set lang_test_file_found 0
set lang_library_path "../libstdc++-v3/src/.libs"
if [info exists lang_include_flags] then {
unset lang_include_flags
}
# If a testcase doesn't have special options, use these.
if ![info exists DEFAULT_CFLAGS] then {
@ -71,5 +68,13 @@ if { $lang_test_file_found } {
# See above.
set GCC_UNDER_TEST "$SAVE_GCC_UNDER_TEST"
if [info exists lang_include_flags] then {
unset lang_source_re
unset lang_include_flags
}
unset lang_library_path
unset lang_link_flags
unset lang_test_file_found
# All done.
dg-finish

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

@ -1,14 +1,3 @@
if [info exists lang_library_path] then {
unset lang_library_path
unset lang_link_flags
}
if [info exists lang_test_file_found] then {
unset lang_test_file_found
}
if [info exists lang_include_flags] then {
unset lang_include_flags
}
load_lib libgomp-dg.exp
load_gcc_lib gcc-dg.exp

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

@ -8,12 +8,7 @@ global ALWAYS_CFLAGS
set shlib_ext [get_shlib_extension]
set lang_library_path "../libgfortran/.libs"
set lang_link_flags "-lgfortran -foffload=-lgfortran"
if [info exists lang_include_flags] then {
unset lang_include_flags
}
set lang_test_file_found 0
set quadmath_library_path "../libquadmath/.libs"
# Initialize dg.
dg-init
@ -44,6 +39,7 @@ if { $lang_test_file_found } {
set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95,03,08}]]
if { $blddir != "" } {
set quadmath_library_path "../libquadmath/.libs"
if { [file exists "${blddir}/${quadmath_library_path}/libquadmath.a"]
|| [file exists "${blddir}/${quadmath_library_path}/libquadmath.${shlib_ext}"] } {
lappend ALWAYS_CFLAGS "ldflags=-L${blddir}/${quadmath_library_path}/"
@ -54,6 +50,7 @@ if { $lang_test_file_found } {
} else {
set ld_library_path "$always_ld_library_path:${blddir}/${lang_library_path}"
}
unset quadmath_library_path
} else {
set ld_library_path "$always_ld_library_path"
if { [check_no_compiler_messages has_libquadmath executable {
@ -71,5 +68,13 @@ if { $lang_test_file_found } {
gfortran-dg-runtest $tests "" ""
}
if { $blddir != "" } {
unset lang_source_re
unset lang_include_flags
}
unset lang_library_path
unset lang_link_flags
unset lang_test_file_found
# All done.
dg-finish

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

@ -14,17 +14,6 @@
# along with GCC; see the file COPYING3. If not see
# <http://www.gnu.org/licenses/>.
if [info exists lang_library_path] then {
unset lang_library_path
unset lang_link_flags
}
if [info exists lang_test_file_found] then {
unset lang_test_file_found
}
if [info exists lang_include_flags] then {
unset lang_include_flags
}
load_lib libgomp-dg.exp
load_gcc_lib gcc-dg.exp

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

@ -17,9 +17,6 @@ set shlib_ext [get_shlib_extension]
set lang_link_flags "-lstdc++"
set lang_test_file_found 0
set lang_library_path "../libstdc++-v3/src/.libs"
if [info exists lang_include_flags] then {
unset lang_include_flags
}
# Initialize dg.
dg-init
@ -152,6 +149,14 @@ if { $lang_test_file_found } {
# See above.
set GCC_UNDER_TEST "$SAVE_GCC_UNDER_TEST"
if [info exists lang_include_flags] then {
unset lang_source_re
unset lang_include_flags
}
unset lang_library_path
unset lang_link_flags
unset lang_test_file_found
# All done.
torture-finish
dg-finish

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

@ -1,16 +1,5 @@
# This whole file adapted from libgomp.c/c.exp.
if [info exists lang_library_path] then {
unset lang_library_path
unset lang_link_flags
}
if [info exists lang_test_file_found] then {
unset lang_test_file_found
}
if [info exists lang_include_flags] then {
unset lang_include_flags
}
load_lib libgomp-dg.exp
load_gcc_lib gcc-dg.exp
load_gcc_lib torture-options.exp

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

@ -10,12 +10,7 @@ global ALWAYS_CFLAGS
set shlib_ext [get_shlib_extension]
set lang_library_path "../libgfortran/.libs"
set lang_link_flags "-lgfortran -foffload=-lgfortran"
if [info exists lang_include_flags] then {
unset lang_include_flags
}
set lang_test_file_found 0
set quadmath_library_path "../libquadmath/.libs"
# Initialize dg.
dg-init
@ -46,6 +41,7 @@ if { $lang_test_file_found } {
set tests [lsort [find $srcdir/$subdir *.\[fF\]{,90,95,03,08}]]
if { $blddir != "" } {
set quadmath_library_path "../libquadmath/.libs"
if { [file exists "${blddir}/${quadmath_library_path}/libquadmath.a"]
|| [file exists "${blddir}/${quadmath_library_path}/libquadmath.${shlib_ext}"] } {
lappend ALWAYS_CFLAGS "ldflags=-L${blddir}/${quadmath_library_path}/"
@ -56,6 +52,7 @@ if { $lang_test_file_found } {
} else {
set ld_library_path "$always_ld_library_path:${blddir}/${lang_library_path}"
}
unset quadmath_library_path
} else {
set ld_library_path "$always_ld_library_path"
if { [check_no_compiler_messages has_libquadmath executable {
@ -120,5 +117,13 @@ if { $lang_test_file_found } {
unset offload_target
}
if { $blddir != "" } {
unset lang_source_re
unset lang_include_flags
}
unset lang_library_path
unset lang_link_flags
unset lang_test_file_found
# All done.
dg-finish