diff options
| author | Tobias Schlüter <tobias.schlueter@physik.uni-muenchen.de> | 2004-07-16 02:32:26 +0200 |
|---|---|---|
| committer | Tobias Schlüter <tobi@gcc.gnu.org> | 2004-07-16 02:32:26 +0200 |
| commit | e94f3b4f2bc52f378923e08e9f7b2684a9ef6c7c (patch) | |
| tree | 0caede859daafa3ef079e9bd49843a8193a577eb /gcc | |
| parent | a916927fb5f966bf29dd99e44e195c7d0b3c028b (diff) | |
| download | gcc-e94f3b4f2bc52f378923e08e9f7b2684a9ef6c7c.zip gcc-e94f3b4f2bc52f378923e08e9f7b2684a9ef6c7c.tar.gz gcc-e94f3b4f2bc52f378923e08e9f7b2684a9ef6c7c.tar.bz2 | |
fortran-torture.exp (fortran-torture): Don't test compile tests with fulllist of options.
* lib/fortran-torture.exp (fortran-torture): Don't test compile
tests with fulllist of options.
* lib/gfortran-dg.exp (gfortran-dg-runtest): Only test with all
of TORTURE_OPTIONS if test contains 'dg-do run'.
From-SVN: r84792
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/lib/fortran-torture.exp | 3 | ||||
| -rw-r--r-- | gcc/testsuite/lib/gfortran-dg.exp | 26 |
3 files changed, 33 insertions, 3 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1f51638..5269f5d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2004-07-16 Tobias Schlueter <tobias.schlueter@physik.uni-muenchen.de> + + * lib/fortran-torture.exp (fortran-torture): Don't test compile + tests with full list of options. + * lib/gfortran-dg.exp (gfortran-dg-runtest): Only test with all + of TORTURE_OPTIONS if test contains 'dg-do run'. + 2004-07-16 Volker Reichelt <reichelt@igpm.rwth-aachen.de> PR rtl-optimization/16536 diff --git a/gcc/testsuite/lib/fortran-torture.exp b/gcc/testsuite/lib/fortran-torture.exp index d069a4a..c7ecf0e 100644 --- a/gcc/testsuite/lib/fortran-torture.exp +++ b/gcc/testsuite/lib/fortran-torture.exp @@ -300,7 +300,6 @@ proc search_for_re { file pattern } { proc fortran-torture { args } { global srcdir subdir global compiler_conditional_xfail_data - global TORTURE_OPTIONS set src [lindex $args 0]; if { [llength $args] > 1 } { @@ -325,7 +324,7 @@ proc fortran-torture { args } { } # loop through all the options - set option_list $TORTURE_OPTIONS + set option_list [list { "-O" } ] foreach option $option_list { # torture_compile_xfail is set by the .x script (if present) diff --git a/gcc/testsuite/lib/gfortran-dg.exp b/gcc/testsuite/lib/gfortran-dg.exp index 903d380..2387403 100644 --- a/gcc/testsuite/lib/gfortran-dg.exp +++ b/gcc/testsuite/lib/gfortran-dg.exp @@ -43,5 +43,29 @@ proc gfortran-dg-prune { system text } { # Modified dg-runtest that can cycle through a list of optimization options # as c-torture does. proc gfortran-dg-runtest { testcases default-extra-flags } { - return [gcc-dg-runtest $testcases ${default-extra-flags}] + global runtests + global TORTURE_OPTIONS + + foreach test $testcases { + # If we're only testing specific files and this isn't one of + # them, skip it. + if ![runtest_file_p $runtests $test] { + continue + } + + # look if this is dg-do-run test, in which case + # we cycle through the option list, otherwise we don't + if [expr [search_for $test "dg-do run"]] { + set option_list $TORTURE_OPTIONS + } else { + set option_list [list { -O } ] + } + + set nshort [file tail [file dirname $test]]/[file tail $test] + + foreach flags $option_list { + verbose "Testing $nshort, $flags" 1 + dg-test $test $flags ${default-extra-flags} + } + } } |