diff options
| -rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/unsorted/dump-noaddr.x | 21 | ||||
| -rw-r--r-- | gcc/testsuite/lib/gcc-dg.exp | 4 |
3 files changed, 15 insertions, 17 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3618373d514..4bc83d270f9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2009-06-21 Uros Bizjak <ubizjak@gmail.com> + + * gcc.c-torture/unsorted/dump-noaddr.x (dump_compare): Use --dumpbase + to put dump files in a subdirectory. + * gcc/testsuite/lib/gcc-dg.exp (cleanup-saved-temps): Also remove + ".o" temporary files. + 2009-06-21 Janus Weil <janus@gcc.gnu.org> PR fortran/39850 diff --git a/gcc/testsuite/gcc.c-torture/unsorted/dump-noaddr.x b/gcc/testsuite/gcc.c-torture/unsorted/dump-noaddr.x index 6e066c6e8c9..1655b382885 100644 --- a/gcc/testsuite/gcc.c-torture/unsorted/dump-noaddr.x +++ b/gcc/testsuite/gcc.c-torture/unsorted/dump-noaddr.x @@ -2,28 +2,19 @@ proc dump_compare { src options } { global srcdir subdir global tmpdir - - exec echo $src - + global torture_with_loops set option_list $torture_with_loops - set dumpbase dump-noaddr - # ??? passing -dumpbase to the gcc driver doesn't work, since it will pass - # another -dumpbase option to override it. + set dumpbase dump-noaddr.c + # loop through all the options foreach option $option_list { -# c-torture-compile ${dumpbase}_1 "$option $options -DMASK=1 -x c -da -fdump-tree-all" -# c-torture-compile ${dumpbase}_2 "$option $options -DMASK=2 -x c -da -fdump-tree-all" -# c-torture-compile ${dumpbase}_3 "$option $options -DMASK=3 -x c -da -fdump-tree-all" file delete -force dump1 - file delete -force dump2 file mkdir dump1 + c-torture-compile $src "$option $options --dumpbase=dump1/$dumpbase -DMASK=1 -x c --param ggc-min-heapsize=1 -fdump-rtl-all -fdump-tree-all -fdump-noaddr" + file delete -force dump2 file mkdir dump2 - cd dump1 - c-torture-compile $src "$option $options -DMASK=1 -x c --param ggc-min-heapsize=1 -da -fdump-tree-all -fdump-noaddr" - cd ../dump2 - c-torture-compile $src "$option $options -DMASK=2 -x c -da -fdump-tree-all -fdump-noaddr" - cd .. + c-torture-compile $src "$option $options --dumpbase=dump2/$dumpbase -DMASK=2 -x c -fdump-rtl-all -fdump-tree-all -fdump-noaddr" foreach dump1 [lsort [glob -nocomplain dump1/*]] { regsub dump1/ $dump1 dump2/ dump2 set dumptail "gcc.c-torture/unsorted/[file tail $dump1]" diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp index 98e2f667bdb..7e684171be9 100644 --- a/gcc/testsuite/lib/gcc-dg.exp +++ b/gcc/testsuite/lib/gcc-dg.exp @@ -460,7 +460,7 @@ proc cleanup-dump { suffix } { # Remove files kept by --save-temps for the current test. # -# Currently this is only .i, .ii and .s files, but more can be added +# Currently this is only .i, .ii, .s and .o files, but more can be added # if there are tests generating them. # ARGS is a list of suffixes to NOT delete. proc cleanup-saved-temps { args } { @@ -468,7 +468,7 @@ proc cleanup-saved-temps { args } { set suffixes {} # add the to-be-kept suffixes - foreach suffix {".ii" ".i" ".s"} { + foreach suffix {".ii" ".i" ".s" ".o"} { if {[lsearch $args $suffix] < 0} { lappend suffixes $suffix } |