libgomp testsuite: Use 'lang_test_file_found' instead of 'lang_test_file'
The value of 'lang_test_file' isn't actually used anywhere. libgomp/ * testsuite/libgomp.c++/c++.exp: Don't set 'lang_test_file'. * testsuite/libgomp.fortran/fortran.exp: Likewise. * testsuite/libgomp.oacc-c++/c++.exp: Likewise. * testsuite/libgomp.oacc-fortran/fortran.exp: Likewise. * testsuite/libgomp.c/c.exp: Unset 'lang_test_file_found' instead of 'lang_test_file'. * testsuite/libgomp.oacc-c/c.exp: Likewise. * testsuite/libgomp.graphite/graphite.exp: Likewise. * testsuite/lib/libgomp.exp (libgomp_target_compile): Look for 'lang_test_file_found' instead of 'lang_test_file'.
This commit is contained in:
parent
fed3dbbfd1
commit
2ed5ceba0f
8 changed files with 8 additions and 24 deletions
|
@ -234,13 +234,13 @@ proc libgomp_target_compile { source dest type options } {
|
|||
global gluefile wrap_flags
|
||||
global ALWAYS_CFLAGS
|
||||
global GCC_UNDER_TEST
|
||||
global lang_test_file
|
||||
global lang_test_file_found
|
||||
global lang_library_path
|
||||
global lang_link_flags
|
||||
global lang_include_flags
|
||||
global lang_source_re
|
||||
|
||||
if { [info exists lang_test_file] } {
|
||||
if { [info exists lang_test_file_found] } {
|
||||
if { $blddir != "" } {
|
||||
# Some targets use libgfortran.a%s in their specs, so they need
|
||||
# a -B option for uninstalled testing.
|
||||
|
|
|
@ -30,19 +30,15 @@ set GCC_UNDER_TEST "$GCC_UNDER_TEST -x c++"
|
|||
if { $blddir != "" } {
|
||||
# Look for a static libstdc++ first.
|
||||
if [file exists "${blddir}/${lang_library_path}/libstdc++.a"] {
|
||||
set lang_test_file "${lang_library_path}/libstdc++.a"
|
||||
set lang_test_file_found 1
|
||||
# We may have a shared only build, so look for a shared libstdc++.
|
||||
} elseif [file exists "${blddir}/${lang_library_path}/libstdc++.${shlib_ext}"] {
|
||||
set lang_test_file "${lang_library_path}/libstdc++.${shlib_ext}"
|
||||
set lang_test_file_found 1
|
||||
} else {
|
||||
puts "No libstdc++ library found, will not execute c++ tests"
|
||||
}
|
||||
} elseif { [info exists GXX_UNDER_TEST] } {
|
||||
set lang_test_file_found 1
|
||||
# Needs to exist for libgomp.exp.
|
||||
set lang_test_file ""
|
||||
} else {
|
||||
puts "GXX_UNDER_TEST not defined, will not execute c++ tests"
|
||||
}
|
||||
|
|
|
@ -2,8 +2,8 @@ if [info exists lang_library_path] then {
|
|||
unset lang_library_path
|
||||
unset lang_link_flags
|
||||
}
|
||||
if [info exists lang_test_file] then {
|
||||
unset lang_test_file
|
||||
if [info exists lang_test_file_found] then {
|
||||
unset lang_test_file_found
|
||||
}
|
||||
if [info exists lang_include_flags] then {
|
||||
unset lang_include_flags
|
||||
|
|
|
@ -26,19 +26,15 @@ if { $blddir != "" } {
|
|||
set lang_include_flags "-fintrinsic-modules-path=${blddir}"
|
||||
# Look for a static libgfortran first.
|
||||
if [file exists "${blddir}/${lang_library_path}/libgfortran.a"] {
|
||||
set lang_test_file "${lang_library_path}/libgfortran.a"
|
||||
set lang_test_file_found 1
|
||||
# We may have a shared only build, so look for a shared libgfortran.
|
||||
} elseif [file exists "${blddir}/${lang_library_path}/libgfortran.${shlib_ext}"] {
|
||||
set lang_test_file "${lang_library_path}/libgfortran.${shlib_ext}"
|
||||
set lang_test_file_found 1
|
||||
} else {
|
||||
puts "No libgfortran library found, will not execute fortran tests"
|
||||
}
|
||||
} elseif [info exists GFORTRAN_UNDER_TEST] {
|
||||
set lang_test_file_found 1
|
||||
# Needs to exist for libgomp.exp.
|
||||
set lang_test_file ""
|
||||
} else {
|
||||
puts "GFORTRAN_UNDER_TEST not defined, will not execute fortran tests"
|
||||
}
|
||||
|
|
|
@ -18,8 +18,8 @@ if [info exists lang_library_path] then {
|
|||
unset lang_library_path
|
||||
unset lang_link_flags
|
||||
}
|
||||
if [info exists lang_test_file] then {
|
||||
unset lang_test_file
|
||||
if [info exists lang_test_file_found] then {
|
||||
unset lang_test_file_found
|
||||
}
|
||||
if [info exists lang_include_flags] then {
|
||||
unset lang_include_flags
|
||||
|
|
|
@ -36,19 +36,15 @@ set GCC_UNDER_TEST "$GCC_UNDER_TEST -x c++"
|
|||
if { $blddir != "" } {
|
||||
# Look for a static libstdc++ first.
|
||||
if [file exists "${blddir}/${lang_library_path}/libstdc++.a"] {
|
||||
set lang_test_file "${lang_library_path}/libstdc++.a"
|
||||
set lang_test_file_found 1
|
||||
# We may have a shared only build, so look for a shared libstdc++.
|
||||
} elseif [file exists "${blddir}/${lang_library_path}/libstdc++.${shlib_ext}"] {
|
||||
set lang_test_file "${lang_library_path}/libstdc++.${shlib_ext}"
|
||||
set lang_test_file_found 1
|
||||
} else {
|
||||
puts "No libstdc++ library found, will not execute c++ tests"
|
||||
}
|
||||
} elseif { [info exists GXX_UNDER_TEST] } {
|
||||
set lang_test_file_found 1
|
||||
# Needs to exist for libgomp.exp.
|
||||
set lang_test_file ""
|
||||
} else {
|
||||
puts "GXX_UNDER_TEST not defined, will not execute c++ tests"
|
||||
}
|
||||
|
|
|
@ -4,8 +4,8 @@ if [info exists lang_library_path] then {
|
|||
unset lang_library_path
|
||||
unset lang_link_flags
|
||||
}
|
||||
if [info exists lang_test_file] then {
|
||||
unset lang_test_file
|
||||
if [info exists lang_test_file_found] then {
|
||||
unset lang_test_file_found
|
||||
}
|
||||
if [info exists lang_include_flags] then {
|
||||
unset lang_include_flags
|
||||
|
|
|
@ -28,19 +28,15 @@ if { $blddir != "" } {
|
|||
set lang_include_flags "-fintrinsic-modules-path=${blddir}"
|
||||
# Look for a static libgfortran first.
|
||||
if [file exists "${blddir}/${lang_library_path}/libgfortran.a"] {
|
||||
set lang_test_file "${lang_library_path}/libgfortran.a"
|
||||
set lang_test_file_found 1
|
||||
# We may have a shared only build, so look for a shared libgfortran.
|
||||
} elseif [file exists "${blddir}/${lang_library_path}/libgfortran.${shlib_ext}"] {
|
||||
set lang_test_file "${lang_library_path}/libgfortran.${shlib_ext}"
|
||||
set lang_test_file_found 1
|
||||
} else {
|
||||
puts "No libgfortran library found, will not execute fortran tests"
|
||||
}
|
||||
} elseif [info exists GFORTRAN_UNDER_TEST] {
|
||||
set lang_test_file_found 1
|
||||
# Needs to exist for libgomp.exp.
|
||||
set lang_test_file ""
|
||||
} else {
|
||||
puts "GFORTRAN_UNDER_TEST not defined, will not execute fortran tests"
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue