OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

c-torture.exp: Compute LTO_TORTURE_OPTIONS after the environment is set up. 

* lib/c-torture.exp: Compute LTO_TORTURE_OPTIONS after the environment
	is set up.
	* lib/gcc-dg.exp: Likewise.

From-SVN: r219684
This commit is contained in:
Eric Botcazou 2015-01-15 20:39:04 +00:00 committed by Eric Botcazou
parent d145770146
commit 6c34c761d2
3 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2015-01-15 Eric Botcazou <ebotcazou@adacore.com>
* lib/c-torture.exp: Compute LTO_TORTURE_OPTIONS after the environment
is set up.
* lib/gcc-dg.exp: Likewise.
2015-01-15 Vladimir Makarov <vmakarov@redhat.com>
PR rtl-optimization/64110

28
gcc/testsuite/lib/c-torture.exp
View File

@ -51,6 +51,20 @@ if [info exists ADDITIONAL_TORTURE_OPTIONS] {
[concat $C_TORTURE_OPTIONS $ADDITIONAL_TORTURE_OPTIONS]
}
global GCC_UNDER_TEST
if ![info exists GCC_UNDER_TEST] {
set GCC_UNDER_TEST "[find_gcc]"
}
global orig_environment_saved
# This file may be sourced, so don't override environment settings
# that have been previously setup.
if { $orig_environment_saved == 0 } {
append ld_library_path [gcc-set-multilib-library-path $GCC_UNDER_TEST]
set_ld_library_path_env_vars
}
set LTO_TORTURE_OPTIONS ""
if [check_effective_target_lto] {
# When having plugin test both slim and fat LTO and plugin/nonplugin
@ -68,20 +82,6 @@ if [check_effective_target_lto] {
}
}
global GCC_UNDER_TEST
if ![info exists GCC_UNDER_TEST] {
set GCC_UNDER_TEST "[find_gcc]"
}
global orig_environment_saved
# This file may be sourced, so don't override environment settings
# that have been previously setup.
if { $orig_environment_saved == 0 } {
append ld_library_path [gcc-set-multilib-library-path $GCC_UNDER_TEST]
set_ld_library_path_env_vars
}
#
# c-torture-compile -- runs the Tege C-torture test
#

19
gcc/testsuite/lib/gcc-dg.exp
View File

@ -72,7 +72,14 @@ if [info exists ADDITIONAL_TORTURE_OPTIONS] {
[concat $DG_TORTURE_OPTIONS $ADDITIONAL_TORTURE_OPTIONS]
}
set LTO_TORTURE_OPTIONS ""
global orig_environment_saved
# This file may be sourced, so don't override environment settings
# that have been previously setup.
if { $orig_environment_saved == 0 } {
append ld_library_path [gcc-set-multilib-library-path $GCC_UNDER_TEST]
set_ld_library_path_env_vars
}
# Some torture-options cause intermediate code output, unusable for
# testing using e.g. scan-assembler. In this variable are the options
@ -80,6 +87,7 @@ set LTO_TORTURE_OPTIONS ""
global gcc_force_conventional_output
set gcc_force_conventional_output ""
set LTO_TORTURE_OPTIONS ""
if [check_effective_target_lto] {
# When having plugin test both slim and fat LTO and plugin/nonplugin
# path.
@ -97,15 +105,6 @@ if [check_effective_target_lto] {
}
}
global orig_environment_saved
# This file may be sourced, so don't override environment settings
# that have been previously setup.
if { $orig_environment_saved == 0 } {
append ld_library_path [gcc-set-multilib-library-path $GCC_UNDER_TEST]
set_ld_library_path_env_vars
}
# Define gcc callbacks for dg.exp.
proc gcc-dg-test-1 { target_compile prog do_what extra_tool_flags } {