aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2014-10-31 17:38:03 +0100
committerThomas Schwinge <thomas@codesourcery.com>2023-05-09 14:32:45 +0200
commit2ed5ceba0fe313ef09bdfe98788ba9377bfec9aa (patch)
tree64e12c840de4014349e93da591e47beac2b1a398
parentfed3dbbfd1b707d7386b14e724056bfe2234e3a5 (diff)
downloadgcc-2ed5ceba0fe313ef09bdfe98788ba9377bfec9aa.zip
gcc-2ed5ceba0fe313ef09bdfe98788ba9377bfec9aa.tar.gz
gcc-2ed5ceba0fe313ef09bdfe98788ba9377bfec9aa.tar.bz2
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'.
-rw-r--r--libgomp/testsuite/lib/libgomp.exp4
-rw-r--r--libgomp/testsuite/libgomp.c++/c++.exp4
-rw-r--r--libgomp/testsuite/libgomp.c/c.exp4
-rw-r--r--libgomp/testsuite/libgomp.fortran/fortran.exp4
-rw-r--r--libgomp/testsuite/libgomp.graphite/graphite.exp4
-rw-r--r--libgomp/testsuite/libgomp.oacc-c++/c++.exp4
-rw-r--r--libgomp/testsuite/libgomp.oacc-c/c.exp4
-rw-r--r--libgomp/testsuite/libgomp.oacc-fortran/fortran.exp4
8 files changed, 8 insertions, 24 deletions
diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp
index 92f6507..aae7149 100644
--- a/libgomp/testsuite/lib/libgomp.exp
+++ b/libgomp/testsuite/lib/libgomp.exp
@@ -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.
diff --git a/libgomp/testsuite/libgomp.c++/c++.exp b/libgomp/testsuite/libgomp.c++/c++.exp
index 188d1a82..7dd2d49 100644
--- a/libgomp/testsuite/libgomp.c++/c++.exp
+++ b/libgomp/testsuite/libgomp.c++/c++.exp
@@ -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"
}
diff --git a/libgomp/testsuite/libgomp.c/c.exp b/libgomp/testsuite/libgomp.c/c.exp
index 31bdd57..e67adc8 100644
--- a/libgomp/testsuite/libgomp.c/c.exp
+++ b/libgomp/testsuite/libgomp.c/c.exp
@@ -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
diff --git a/libgomp/testsuite/libgomp.fortran/fortran.exp b/libgomp/testsuite/libgomp.fortran/fortran.exp
index eb70131..5e8e15e 100644
--- a/libgomp/testsuite/libgomp.fortran/fortran.exp
+++ b/libgomp/testsuite/libgomp.fortran/fortran.exp
@@ -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"
}
diff --git a/libgomp/testsuite/libgomp.graphite/graphite.exp b/libgomp/testsuite/libgomp.graphite/graphite.exp
index 1260dc9..1c5ea66 100644
--- a/libgomp/testsuite/libgomp.graphite/graphite.exp
+++ b/libgomp/testsuite/libgomp.graphite/graphite.exp
@@ -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
diff --git a/libgomp/testsuite/libgomp.oacc-c++/c++.exp b/libgomp/testsuite/libgomp.oacc-c++/c++.exp
index 24a4d1f..24ab8bb 100644
--- a/libgomp/testsuite/libgomp.oacc-c++/c++.exp
+++ b/libgomp/testsuite/libgomp.oacc-c++/c++.exp
@@ -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"
}
diff --git a/libgomp/testsuite/libgomp.oacc-c/c.exp b/libgomp/testsuite/libgomp.oacc-c/c.exp
index 4bb2b2a..8a960aa 100644
--- a/libgomp/testsuite/libgomp.oacc-c/c.exp
+++ b/libgomp/testsuite/libgomp.oacc-c/c.exp
@@ -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
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp b/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp
index 7365b32..a56c7d9 100644
--- a/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp
+++ b/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp
@@ -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"
}