fortran-torture.exp (get-fortran-torture-options): New function, replacing old FORTRAN_TORTURE_OPTIONS code.

gcc/testsuite/
	* lib/fortran-torture.exp (get-fortran-torture-options):
	New function, replacing old FORTRAN_TORTURE_OPTIONS code.
	* gfortran.fortran-torture/compile/compile.exp: Use
	[get-fortran-torture-options] instead of $FORTRAN_TORTURE_OPTIONS.
	* gfortran.fortran-torture/execute/execute.exp: Likewise.

From-SVN: r136050
This commit is contained in:
Richard Sandiford 2008-05-27 18:57:10 +00:00 committed by Richard Sandiford
parent 3395aa0532
commit 75e8fd2f71
4 changed files with 27 additions and 10 deletions

View File

@ -1,3 +1,11 @@
2008-05-27 Richard Sandiford <rdsandiford@googlemail.com>
* lib/fortran-torture.exp (get-fortran-torture-options):
New function, replacing old FORTRAN_TORTURE_OPTIONS code.
* gfortran.fortran-torture/compile/compile.exp: Use
[get-fortran-torture-options] instead of $FORTRAN_TORTURE_OPTIONS.
* gfortran.fortran-torture/execute/execute.exp: Likewise.
2008-05-27 Michael Matz <matz@suse.de>
PR c++/27975

View File

@ -26,7 +26,7 @@ load_lib fortran-torture.exp
load_lib torture-options.exp
torture-init
set-torture-options $FORTRAN_TORTURE_OPTIONS
set-torture-options [get-fortran-torture-options]
foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.f]] {
# If we're only testing specific files and this isn't one of them, skip it.

View File

@ -30,7 +30,7 @@ load_lib fortran-torture.exp
load_lib torture-options.exp
torture-init
set-torture-options $FORTRAN_TORTURE_OPTIONS
set-torture-options [get-fortran-torture-options]
foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.f]] {
# If we're only testing specific files and this isn't one of them, skip it.

View File

@ -22,12 +22,16 @@
load_lib target-supports.exp
# Return the list of options to use for fortran torture tests.
# The default option list can be overridden by
# TORTURE_OPTIONS="{ { list1 } ... { listN } }"
proc get-fortran-torture-options { } {
global TORTURE_OPTIONS
if [info exists TORTURE_OPTIONS] {
return $TORTURE_OPTIONS
}
if [info exists TORTURE_OPTIONS] {
set FORTRAN_TORTURE_OPTIONS $TORTURE_OPTIONS
} else {
# determine if host supports vectorization, and the necessary set
# of options, based on code from testsuite/vect/vect.exp
@ -61,17 +65,22 @@ if [info exists TORTURE_OPTIONS] {
set test_tree_vectorize 0
}
set FORTRAN_TORTURE_OPTIONS [list \
{ -O0 } { -O1 } { -O2 } \
set options {}
lappend options \
{ -O0 } \
{ -O1 } \
{ -O2 } \
{ -O2 -fomit-frame-pointer -finline-functions } \
{ -O2 -fomit-frame-pointer -finline-functions -funroll-loops } \
{ -O2 -fbounds-check } \
{ -O3 -g } \
{ -Os }]
{ -Os }
if { $test_tree_vectorize } {
lappend FORTRAN_TORTURE_OPTIONS $vectorizer_options
lappend options $vectorizer_options
}
return $options
}