fortran-torture.exp (fortran-torture): Don't test compile tests with fulllist of...

* 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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1f5163845f1016b9d3420004b198684f59633364..5269f5d6e84e42a932eb1c876d2a1ed063b76cba 100644 (file)
--- 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 d069a4a5886950c19a04ba3f7b0c2514c458c738..c7ecf0e0e683ef53d7c0ba904c7ae2f67bbac7b1 100644 (file)
--- 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 903d380c02d2bd331ff81e8eac446684ad1c5539..2387403030b1f0af5ba25d119adfc3ee5a3c7590 100644 (file)
--- 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}
+       }
+    }
 }