Skip to content

R
riscv-gcc-1
Commit a03bd005 by Thomas Schwinge Committed by Thomas Schwinge
Options

Normalize interface for all *-dg-runtest. 

	gcc/testsuite/
	* lib/g++-dg.exp (g++-dg-runtest): Change interface to match
	dg-runtest's.  Adapt all callers.
	* lib/gcc-dg.exp (gcc-dg-runtest): Likewise.
	* lib/gfortran-dg.exp (gfortran-dg-runtest): Likewise.
	* lib/go-dg.exp (go-dg-runtest): Likewise.
	* lib/obj-c++-dg.exp (obj-c++-dg-runtest): Likewise.
	* lib/objc-dg.exp (objc-dg-runtest): Likewise.
	libffi/
	* testsuite/lib/libffi.exp (libffi-dg-runtest): Change interface
	match to dg-runtest's.

From-SVN: r212278
parent 01ffe74d
Showing with 135 additions and 120 deletions
gcc/testsuite/ChangeLog
2014-07-04 Thomas Schwinge <thomas@codesourcery.com>
* lib/g++-dg.exp (g++-dg-runtest): Change interface to match
dg-runtest's. Adapt all callers.
* lib/gcc-dg.exp (gcc-dg-runtest): Likewise.
* lib/gfortran-dg.exp (gfortran-dg-runtest): Likewise.
* lib/go-dg.exp (go-dg-runtest): Likewise.
* lib/obj-c++-dg.exp (obj-c++-dg-runtest): Likewise.
* lib/objc-dg.exp (objc-dg-runtest): Likewise.
2014-07-03 Jakub Jelinek <jakub@redhat.com> 2014-07-03 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/61682 PR tree-optimization/61682
......
gcc/testsuite/g++.dg/asan/asan.exp
...@@ -29,7 +29,7 @@ dg-init ...@@ -29,7 +29,7 @@ dg-init
if [asan_init] { if [asan_init] {
# Main loop. # Main loop.
gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C $srcdir/c-c++-common/asan/*.c]] "" gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C $srcdir/c-c++-common/asan/*.c]] "" ""
} }
......
gcc/testsuite/g++.dg/charset/charset.exp
...@@ -38,7 +38,7 @@ dg-init ...@@ -38,7 +38,7 @@ dg-init
# Main loop. # Main loop.
g++-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{c,cc,S} ]] \ g++-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{c,cc,S} ]] \
$DEFAULT_CHARSETCFLAGS "" $DEFAULT_CHARSETCFLAGS
# All done. # All done.
dg-finish dg-finish
gcc/testsuite/g++.dg/cilk-plus/cilk-plus.exp
...@@ -26,12 +26,12 @@ if { ![check_effective_target_cilkplus] } { ...@@ -26,12 +26,12 @@ if { ![check_effective_target_cilkplus] } {
dg-init dg-init
if [cilkplus_init] { if [cilkplus_init] {
# Run the tests that are shared with C. # Run the tests that are shared with C.
g++-dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/PS/*.c]] "" g++-dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/PS/*.c]] "" ""
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/SE/*.c]] "-O3" " " dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/SE/*.c]] "-O3" " "
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/SE/*.c]] " " " " dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/SE/*.c]] " " " "
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/SE/*.c]] "-g -O2" " " dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/SE/*.c]] "-g -O2" " "
# Run the C++ only tests. # Run the C++ only tests.
g++-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C]] "" g++-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C]] "" ""
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus" " " dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus" " "
dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -O1 -fcilkplus" " " dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -O1 -fcilkplus" " "
......
gcc/testsuite/g++.dg/debug/dwarf2/dwarf2.exp
...@@ -36,7 +36,7 @@ if { ! [string match "*: target system does not support the * debug format*" \ ...@@ -36,7 +36,7 @@ if { ! [string match "*: target system does not support the * debug format*" \
$comp_output] } { $comp_output] } {
remove-build-file "trivial.S" remove-build-file "trivial.S"
g++-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C $srcdir/c-c++-common/dwarf2/*.c]] \ g++-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C $srcdir/c-c++-common/dwarf2/*.c]] \
$DEFAULT_CFLAGS "" $DEFAULT_CFLAGS
} }
# All done. # All done.
......
gcc/testsuite/g++.dg/dfp/dfp.exp
...@@ -50,10 +50,10 @@ dg-init ...@@ -50,10 +50,10 @@ dg-init
# Main loop. Run the tests that are specific to C++. # Main loop. Run the tests that are specific to C++.
g++-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[C]] \ g++-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[C]] \
$DEFAULT_CXXFLAGS "" $DEFAULT_CXXFLAGS
# Run tests that are shared with C testing. # Run tests that are shared with C testing.
g++-dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/dfp/*.c]] \ g++-dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/dfp/*.c]] \
$DEFAULT_CXXFLAGS "" $DEFAULT_CXXFLAGS
# All done. # All done.
dg-finish dg-finish
......
gcc/testsuite/g++.dg/dg.exp
...@@ -57,14 +57,14 @@ set tests [prune $tests $srcdir/$subdir/ubsan/*] ...@@ -57,14 +57,14 @@ set tests [prune $tests $srcdir/$subdir/ubsan/*]
set tests [prune $tests $srcdir/$subdir/tsan/*] set tests [prune $tests $srcdir/$subdir/tsan/*]
# Main loop. # Main loop.
g++-dg-runtest $tests $DEFAULT_CXXFLAGS g++-dg-runtest $tests "" $DEFAULT_CXXFLAGS
# C/C++ common tests. # C/C++ common tests.
g++-dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/*.\[cSi\]]] \ g++-dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/*.\[cSi\]]] \
"" "" ""
g++-dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cpp/*.\[cS\]]] \ g++-dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cpp/*.\[cS\]]] \
"" "" ""
# All done. # All done.
......
gcc/testsuite/g++.dg/gcov/gcov.exp
...@@ -39,6 +39,6 @@ if { $files != "" } { ...@@ -39,6 +39,6 @@ if { $files != "" } {
} }
# Main loop. # Main loop.
g++-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C]] "" g++-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C]] "" ""
dg-finish dg-finish
gcc/testsuite/g++.dg/gomp/gomp.exp
...@@ -29,7 +29,7 @@ dg-init ...@@ -29,7 +29,7 @@ dg-init
# Main loop. # Main loop.
g++-dg-runtest [lsort [concat \ g++-dg-runtest [lsort [concat \
[find $srcdir/$subdir *.C] \ [find $srcdir/$subdir *.C] \
[find $srcdir/c-c++-common/gomp *.c]]] "-fopenmp" [find $srcdir/c-c++-common/gomp *.c]]] "" "-fopenmp"
# All done. # All done.
dg-finish dg-finish
gcc/testsuite/g++.dg/graphite/graphite.exp
...@@ -46,14 +46,14 @@ set block_files [lsort [glob -nocomplain $srcdir/$subdir/block-*.C ] ] ...@@ -46,14 +46,14 @@ set block_files [lsort [glob -nocomplain $srcdir/$subdir/block-*.C ] ]
# Tests to be compiled. # Tests to be compiled.
set dg-do-what-default compile set dg-do-what-default compile
g++-dg-runtest $scop_files "-O2 -fgraphite -fdump-tree-graphite-all" g++-dg-runtest $scop_files "" "-O2 -fgraphite -fdump-tree-graphite-all"
g++-dg-runtest $id_files "-O2 -fgraphite-identity -ffast-math" g++-dg-runtest $id_files "" "-O2 -fgraphite-identity -ffast-math"
# Tests to be run. # Tests to be run.
set dg-do-what-default run set dg-do-what-default run
g++-dg-runtest $run_id_files "-O2 -fgraphite-identity" g++-dg-runtest $run_id_files "" "-O2 -fgraphite-identity"
g++-dg-runtest $interchange_files "-O2 -floop-interchange -fno-loop-block -fno-loop-strip-mine -ffast-math -fdump-tree-graphite-all" g++-dg-runtest $interchange_files "" "-O2 -floop-interchange -fno-loop-block -fno-loop-strip-mine -ffast-math -fdump-tree-graphite-all"
g++-dg-runtest $block_files "-O2 -floop-block -fno-loop-strip-mine -fno-loop-interchange -ffast-math -fdump-tree-graphite-all" g++-dg-runtest $block_files "" "-O2 -floop-block -fno-loop-strip-mine -fno-loop-interchange -ffast-math -fdump-tree-graphite-all"
# The default action for the rest of the files is 'compile'. # The default action for the rest of the files is 'compile'.
set dg-do-what-default compile set dg-do-what-default compile
...@@ -62,7 +62,7 @@ foreach f $id_files {lremove wait_to_run_files $f} ...@@ -62,7 +62,7 @@ foreach f $id_files {lremove wait_to_run_files $f}
foreach f $run_id_files {lremove wait_to_run_files $f} foreach f $run_id_files {lremove wait_to_run_files $f}
foreach f $interchange_files {lremove wait_to_run_files $f} foreach f $interchange_files {lremove wait_to_run_files $f}
foreach f $block_files {lremove wait_to_run_files $f} foreach f $block_files {lremove wait_to_run_files $f}
g++-dg-runtest $wait_to_run_files " -pedantic-errors" g++-dg-runtest $wait_to_run_files "" "-pedantic-errors"
# Clean up. # Clean up.
set dg-do-what-default ${save-dg-do-what-default} set dg-do-what-default ${save-dg-do-what-default}
......
gcc/testsuite/g++.dg/guality/guality.exp
...@@ -47,8 +47,8 @@ if {[check_guality " ...@@ -47,8 +47,8 @@ if {[check_guality "
return 0; return 0;
} }
"]} { "]} {
gcc-dg-runtest [lsort [glob $srcdir/$subdir/*.C]] "" gcc-dg-runtest [lsort [glob $srcdir/$subdir/*.C]] "" ""
gcc-dg-runtest [lsort [glob $srcdir/c-c++-common/guality/*.c]] "" gcc-dg-runtest [lsort [glob $srcdir/c-c++-common/guality/*.c]] "" ""
} }
if [info exists guality_gdb_name] { if [info exists guality_gdb_name] {
......
gcc/testsuite/g++.dg/simulate-thread/simulate-thread.exp
...@@ -31,8 +31,8 @@ set-torture-options [list \ ...@@ -31,8 +31,8 @@ set-torture-options [list \
{ -Os -g } ] { -Os -g } ]
if [gdb-exists] { if [gdb-exists] {
gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C]] "" gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C]] "" ""
gcc-dg-runtest [lsort [glob $srcdir/c-c++-common/simulate-thread/*.c]] "" gcc-dg-runtest [lsort [glob $srcdir/c-c++-common/simulate-thread/*.c]] "" ""
} }
torture-finish torture-finish
......
gcc/testsuite/g++.dg/tls/tls.exp
...@@ -29,7 +29,7 @@ if ![info exists DEFAULT_CXXFLAGS] then { ...@@ -29,7 +29,7 @@ if ![info exists DEFAULT_CXXFLAGS] then {
dg-init dg-init
# Main loop. # Main loop.
g++-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C]] $DEFAULT_CXXFLAGS g++-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C]] "" $DEFAULT_CXXFLAGS
# All done. # All done.
dg-finish dg-finish
gcc/testsuite/g++.dg/tm/tm.exp
...@@ -34,10 +34,10 @@ dg-init ...@@ -34,10 +34,10 @@ dg-init
# Run the tests that are shared with C. # Run the tests that are shared with C.
g++-dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/tm/*.c]] \ g++-dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/tm/*.c]] \
$DEFAULT_CXXFLAGS "" $DEFAULT_CXXFLAGS
# Run the C++ only tests. # Run the C++ only tests.
g++-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C]] \ g++-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C]] \
$DEFAULT_CXXFLAGS "" $DEFAULT_CXXFLAGS
# All done. # All done.
dg-finish dg-finish
gcc/testsuite/g++.dg/torture/dg-torture.exp
...@@ -3,5 +3,5 @@ ...@@ -3,5 +3,5 @@
load_lib g++-dg.exp load_lib g++-dg.exp
dg-init dg-init
gcc-dg-runtest [lsort [glob $srcdir/$subdir/*.C $srcdir/c-c++-common/torture/*.c]] "" gcc-dg-runtest [lsort [glob $srcdir/$subdir/*.C $srcdir/c-c++-common/torture/*.c]] "" ""
dg-finish dg-finish
gcc/testsuite/g++.dg/torture/stackalign/stackalign.exp
...@@ -51,7 +51,7 @@ if { [check_effective_target_fpic] } then { ...@@ -51,7 +51,7 @@ if { [check_effective_target_fpic] } then {
# Combine stackalign options with the usual torture optimization flags. # Combine stackalign options with the usual torture optimization flags.
set-torture-options [concat $DG_TORTURE_OPTIONS $LTO_TORTURE_OPTIONS] $stackalign_options set-torture-options [concat $DG_TORTURE_OPTIONS $LTO_TORTURE_OPTIONS] $stackalign_options
gcc-dg-runtest [lsort [glob $srcdir/$subdir/*.C]] "$default_flags" gcc-dg-runtest [lsort [glob $srcdir/$subdir/*.C]] "" "$default_flags"
torture-finish torture-finish
dg-finish dg-finish
gcc/testsuite/g++.dg/tsan/tsan.exp
...@@ -37,7 +37,7 @@ set-torture-options [list \ ...@@ -37,7 +37,7 @@ set-torture-options [list \
if [tsan_init] { if [tsan_init] {
# Main loop. # Main loop.
gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C $srcdir/c-c++-common/tsan/*.c]] "" gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C $srcdir/c-c++-common/tsan/*.c]] "" ""
} }
......
gcc/testsuite/g++.dg/ubsan/ubsan.exp
...@@ -25,7 +25,7 @@ dg-init ...@@ -25,7 +25,7 @@ dg-init
if [ubsan_init] { if [ubsan_init] {
# Main loop. # Main loop.
gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C $srcdir/c-c++-common/ubsan/*.c]] "" gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C $srcdir/c-c++-common/ubsan/*.c]] "" ""
} }
......
gcc/testsuite/g++.dg/vect/vect.exp
...@@ -59,9 +59,9 @@ dg-init ...@@ -59,9 +59,9 @@ dg-init
# Main loop. # Main loop.
g++-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/pr*.{c,cc,S} ]] \ g++-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/pr*.{c,cc,S} ]] \
$DEFAULT_VECTCFLAGS "" $DEFAULT_VECTCFLAGS
g++-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/slp-pr*.{c,cc,S} ]] \ g++-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/slp-pr*.{c,cc,S} ]] \
$VECT_SLP_CFLAGS "" $VECT_SLP_CFLAGS
#### Tests with special options #### Tests with special options
global SAVED_DEFAULT_VECTCFLAGS global SAVED_DEFAULT_VECTCFLAGS
...@@ -71,7 +71,7 @@ set SAVED_DEFAULT_VECTCFLAGS $DEFAULT_VECTCFLAGS ...@@ -71,7 +71,7 @@ set SAVED_DEFAULT_VECTCFLAGS $DEFAULT_VECTCFLAGS
set DEFAULT_VECTCFLAGS $SAVED_DEFAULT_VECTCFLAGS set DEFAULT_VECTCFLAGS $SAVED_DEFAULT_VECTCFLAGS
lappend DEFAULT_VECTCFLAGS "--param max-aliased-vops=0" lappend DEFAULT_VECTCFLAGS "--param max-aliased-vops=0"
g++-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/param-max-aliased*.\[cS\]]] \ g++-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/param-max-aliased*.\[cS\]]] \
$DEFAULT_VECTCFLAGS "" $DEFAULT_VECTCFLAGS
# Clean up. # Clean up.
set dg-do-what-default ${save-dg-do-what-default} set dg-do-what-default ${save-dg-do-what-default}
......
gcc/testsuite/g++.old-deja/old-deja.exp
...@@ -31,7 +31,7 @@ dg-init ...@@ -31,7 +31,7 @@ dg-init
set tests [lsort [find $srcdir/$subdir *.C]] set tests [lsort [find $srcdir/$subdir *.C]]
# Main loop. # Main loop.
g++-dg-runtest $tests $DEFAULT_CXXFLAGS g++-dg-runtest $tests "" $DEFAULT_CXXFLAGS
# All done. # All done.
dg-finish dg-finish
gcc/testsuite/gcc.c-torture/compile/compile.exp
...@@ -27,7 +27,7 @@ dg-init ...@@ -27,7 +27,7 @@ dg-init
# Main loop. # Main loop.
set saved-dg-do-what-default ${dg-do-what-default} set saved-dg-do-what-default ${dg-do-what-default}
set dg-do-what-default "assemble" set dg-do-what-default "assemble"
gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "-w" gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "" "-w"
set dg-do-what-default ${saved-dg-do-what-default} set dg-do-what-default ${saved-dg-do-what-default}
# All done. # All done.
......
gcc/testsuite/gcc.dg/asan/asan.exp
...@@ -31,7 +31,7 @@ dg-init ...@@ -31,7 +31,7 @@ dg-init
if [asan_init] { if [asan_init] {
# Main loop. # Main loop.
gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c $srcdir/c-c++-common/asan/*.c]] "" gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c $srcdir/c-c++-common/asan/*.c]] "" ""
} }
......
gcc/testsuite/gcc.dg/atomic/atomic.exp
...@@ -26,7 +26,7 @@ load_lib atomic-dg.exp ...@@ -26,7 +26,7 @@ load_lib atomic-dg.exp
dg-init dg-init
if [atomic_init] { if [atomic_init] {
# Main loop. # Main loop.
gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c]] "" gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c]] "" ""
} }
# All done. # All done.
......
gcc/testsuite/gcc.dg/format/format.exp
...@@ -29,6 +29,6 @@ torture-init ...@@ -29,6 +29,6 @@ torture-init
set-torture-options [list { } { -DWIDE } ] set-torture-options [list { } { -DWIDE } ]
dg-init dg-init
gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "" gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "" ""
torture-finish torture-finish
dg-finish dg-finish
gcc/testsuite/gcc.dg/guality/guality.exp
...@@ -47,8 +47,8 @@ if {[check_guality " ...@@ -47,8 +47,8 @@ if {[check_guality "
return 0; return 0;
} }
"]} { "]} {
gcc-dg-runtest [lsort [glob $srcdir/$subdir/*.c]] "" gcc-dg-runtest [lsort [glob $srcdir/$subdir/*.c]] "" ""
gcc-dg-runtest [lsort [glob $srcdir/c-c++-common/guality/*.c]] "-Wc++-compat" gcc-dg-runtest [lsort [glob $srcdir/c-c++-common/guality/*.c]] "" "-Wc++-compat"
} }
if [info exists guality_gdb_name] { if [info exists guality_gdb_name] {
......
gcc/testsuite/gcc.dg/noncompile/noncompile.exp
...@@ -21,5 +21,5 @@ ...@@ -21,5 +21,5 @@
load_lib gcc-dg.exp load_lib gcc-dg.exp
dg-init dg-init
gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "" gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "" ""
dg-finish dg-finish
gcc/testsuite/gcc.dg/simulate-thread/simulate-thread.exp
...@@ -33,8 +33,8 @@ set-torture-options [list \ ...@@ -33,8 +33,8 @@ set-torture-options [list \
{ -O3 -g } ] { -O3 -g } ]
if [gdb-exists] { if [gdb-exists] {
gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c]] "" gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c]] "" ""
gcc-dg-runtest [lsort [glob $srcdir/c-c++-common/simulate-thread/*.c]] "" gcc-dg-runtest [lsort [glob $srcdir/c-c++-common/simulate-thread/*.c]] "" ""
} }
torture-finish torture-finish
......
gcc/testsuite/gcc.dg/torture/dg-torture.exp
...@@ -3,5 +3,5 @@ ...@@ -3,5 +3,5 @@
load_lib gcc-dg.exp load_lib gcc-dg.exp
dg-init dg-init
gcc-dg-runtest [lsort [glob $srcdir/$subdir/*.c $srcdir/c-c++-common/torture/*.c]] "" gcc-dg-runtest [lsort [glob $srcdir/$subdir/*.c $srcdir/c-c++-common/torture/*.c]] "" ""
dg-finish dg-finish
gcc/testsuite/gcc.dg/torture/stackalign/stackalign.exp
...@@ -63,7 +63,7 @@ if { [check_effective_target_automatic_stack_alignment] } then { ...@@ -63,7 +63,7 @@ if { [check_effective_target_automatic_stack_alignment] } then {
# Combine stackalign options with the usual torture optimization flags. # Combine stackalign options with the usual torture optimization flags.
set-torture-options [concat $DG_TORTURE_OPTIONS $LTO_TORTURE_OPTIONS] $stackalign_options set-torture-options [concat $DG_TORTURE_OPTIONS $LTO_TORTURE_OPTIONS] $stackalign_options
gcc-dg-runtest [lsort [glob $srcdir/$subdir/*.c]] "$default_flags" gcc-dg-runtest [lsort [glob $srcdir/$subdir/*.c]] "" "$default_flags"
torture-finish torture-finish
dg-finish dg-finish
gcc/testsuite/gcc.dg/torture/tls/tls.exp
...@@ -50,7 +50,7 @@ set-torture-options $TLS_TORTURE_OPTIONS {{}} $LTO_TORTURE_OPTIONS ...@@ -50,7 +50,7 @@ set-torture-options $TLS_TORTURE_OPTIONS {{}} $LTO_TORTURE_OPTIONS
# Main loop. # Main loop.
gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] \ gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] \
$DEFAULT_CFLAGS "" $DEFAULT_CFLAGS
# All done. # All done.
torture-finish torture-finish
......
gcc/testsuite/gcc.dg/tsan/tsan.exp
...@@ -37,7 +37,7 @@ set-torture-options [list \ ...@@ -37,7 +37,7 @@ set-torture-options [list \
if [tsan_init] { if [tsan_init] {
# Main loop. # Main loop.
gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c $srcdir/c-c++-common/tsan/*.c]] "" gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c $srcdir/c-c++-common/tsan/*.c]] "" ""
} }
......
gcc/testsuite/gcc.dg/ubsan/ubsan.exp
...@@ -27,7 +27,7 @@ dg-init ...@@ -27,7 +27,7 @@ dg-init
if [ubsan_init] { if [ubsan_init] {
# Main loop. # Main loop.
gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c $srcdir/c-c++-common/ubsan/*.c]] "" gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c $srcdir/c-c++-common/ubsan/*.c]] "" ""
} }
......
gcc/testsuite/gcc.dg/vmx/vmx.exp
...@@ -49,7 +49,7 @@ dg-init ...@@ -49,7 +49,7 @@ dg-init
# Main loop. # Main loop.
gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c]] \ gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c]] \
$DEFAULT_VMXCFLAGS "" $DEFAULT_VMXCFLAGS
# All done. # All done.
dg-finish dg-finish
......
gcc/testsuite/gcc.misc-tests/i386-prefetch.exp
...@@ -98,16 +98,16 @@ if { [board_info target exists multilib_flags] ...@@ -98,16 +98,16 @@ if { [board_info target exists multilib_flags]
} }
set-torture-options $PREFETCH_NONE set-torture-options $PREFETCH_NONE
gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/i386-pf-none-*.c]] "" gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/i386-pf-none-*.c]] "" ""
set-torture-options $PREFETCH_SSE set-torture-options $PREFETCH_SSE
gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/i386-pf-sse-*.c]] "" gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/i386-pf-sse-*.c]] "" ""
set-torture-options $PREFETCH_3DNOW set-torture-options $PREFETCH_3DNOW
gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/i386-pf-3dnow-*.c]] "" gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/i386-pf-3dnow-*.c]] "" ""
set-torture-options $PREFETCH_ATHLON set-torture-options $PREFETCH_ATHLON
gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/i386-pf-athlon-*.c]] "" gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/i386-pf-athlon-*.c]] "" ""
torture-finish torture-finish
dg-finish dg-finish
......
gcc/testsuite/gcc.target/avr/torture/avr-torture.exp
...@@ -55,7 +55,7 @@ set-torture-options $AVR_TORTURE_OPTIONS ...@@ -55,7 +55,7 @@ set-torture-options $AVR_TORTURE_OPTIONS
# Main loop. # Main loop.
gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{\[cS\],cpp}]] $DEFAULT_CFLAGS gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{\[cS\],cpp}]] "" $DEFAULT_CFLAGS
# Finalize use of torture lists. # Finalize use of torture lists.
torture-finish torture-finish
......
gcc/testsuite/gcc.target/cris/torture/cris-torture.exp
...@@ -35,7 +35,7 @@ if ![info exists DEFAULT_CFLAGS] then { ...@@ -35,7 +35,7 @@ if ![info exists DEFAULT_CFLAGS] then {
dg-init dg-init
# Main loop. # Main loop.
gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] $DEFAULT_CFLAGS gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "" $DEFAULT_CFLAGS
# All done. # All done.
dg-finish dg-finish
gcc/testsuite/gcc.target/frv/frv.exp
...@@ -49,5 +49,5 @@ foreach arch $archs { ...@@ -49,5 +49,5 @@ foreach arch $archs {
} }
dg-init dg-init
gcc-dg-runtest [eval concat $files] "" gcc-dg-runtest [eval concat $files] "" ""
dg-finish dg-finish
gcc/testsuite/gcc.target/i386/math-torture/math-torture.exp
...@@ -65,6 +65,6 @@ torture-init ...@@ -65,6 +65,6 @@ torture-init
set-torture-options $MATH_TORTURE_OPTIONS {{}} $LTO_TORTURE_OPTIONS set-torture-options $MATH_TORTURE_OPTIONS {{}} $LTO_TORTURE_OPTIONS
dg-init dg-init
gcc-dg-runtest [lsort [glob $srcdir/$subdir/*.c]] "" gcc-dg-runtest [lsort [glob $srcdir/$subdir/*.c]] "" ""
torture-finish torture-finish
dg-finish dg-finish
gcc/testsuite/gcc.target/microblaze/microblaze.exp
...@@ -49,7 +49,7 @@ dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/isa/*.\[cSi\]]] \ ...@@ -49,7 +49,7 @@ dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/isa/*.\[cSi\]]] \
${default_c_flags} "" ${default_c_flags} ""
gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/others/*.\[cSi\]]] \ gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/others/*.\[cSi\]]] \
"-mcpu=v6.00.a" "" "-mcpu=v6.00.a"
# All done. # All done.
......
gcc/testsuite/gcc.target/mips/mips.exp
...@@ -1304,6 +1304,6 @@ proc mips-gcc-dg-test { prog do_what extra_tool_flags } { ...@@ -1304,6 +1304,6 @@ proc mips-gcc-dg-test { prog do_what extra_tool_flags } {
dg-init dg-init
mips-dg-init mips-dg-init
gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c]] \ gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c]] \
"-DNOMIPS16=__attribute__((nomips16)) -DNOMICROMIPS=__attribute__((nomicromips)) -DNOCOMPRESSION=__attribute__((nocompression))" "" "-DNOMIPS16=__attribute__((nomips16)) -DNOMICROMIPS=__attribute__((nomicromips)) -DNOCOMPRESSION=__attribute__((nocompression))"
mips-dg-finish mips-dg-finish
dg-finish dg-finish
gcc/testsuite/gcc.target/powerpc/powerpc.exp
...@@ -45,7 +45,7 @@ if [check_vmx_hw_available] { ...@@ -45,7 +45,7 @@ if [check_vmx_hw_available] {
} }
torture-init torture-init
set-torture-options $SAVRES_TEST_OPTS set-torture-options $SAVRES_TEST_OPTS
gcc-dg-runtest [list $srcdir/$subdir/savres.c] $alti gcc-dg-runtest [list $srcdir/$subdir/savres.c] "" $alti
# All done. # All done.
torture-finish torture-finish
......
gcc/testsuite/gcc.target/rx/rx.exp
...@@ -37,7 +37,7 @@ dg-init ...@@ -37,7 +37,7 @@ dg-init
set tests [lsort [find $srcdir/$subdir *.\[cS\]]] set tests [lsort [find $srcdir/$subdir *.\[cS\]]]
# Main loop. # Main loop.
gcc-dg-runtest $tests $DEFAULT_CFLAGS gcc-dg-runtest $tests "" $DEFAULT_CFLAGS
# All done. # All done.
dg-finish dg-finish
gcc/testsuite/gcc.target/sh/torture/sh-torture.exp
...@@ -35,7 +35,7 @@ if ![info exists DEFAULT_CFLAGS] then { ...@@ -35,7 +35,7 @@ if ![info exists DEFAULT_CFLAGS] then {
dg-init dg-init
# Main loop. # Main loop.
gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] $DEFAULT_CFLAGS gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "" $DEFAULT_CFLAGS
# All done. # All done.
dg-finish dg-finish
gcc/testsuite/gcc.target/tic6x/builtins/c6x-builtins.exp
...@@ -24,6 +24,6 @@ if { ![istarget tic6x-*-*] } then { ...@@ -24,6 +24,6 @@ if { ![istarget tic6x-*-*] } then {
} }
dg-init dg-init
gcc-dg-runtest [lsort [glob $srcdir/$subdir/*.c]] "" gcc-dg-runtest [lsort [glob $srcdir/$subdir/*.c]] "" ""
dg-finish dg-finish
gcc/testsuite/gfortran.dg/dg.exp
...@@ -30,10 +30,10 @@ dg-init ...@@ -30,10 +30,10 @@ dg-init
# Main loop. # Main loop.
gfortran-dg-runtest [lsort \ gfortran-dg-runtest [lsort \
[glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95,03,08} ] ] $DEFAULT_FFLAGS [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95,03,08} ] ] "" $DEFAULT_FFLAGS
gfortran-dg-runtest [lsort \ gfortran-dg-runtest [lsort \
[glob -nocomplain $srcdir/$subdir/g77/*.\[fF\] ] ] $DEFAULT_FFLAGS [glob -nocomplain $srcdir/$subdir/g77/*.\[fF\] ] ] "" $DEFAULT_FFLAGS
# All done. # All done.
......
gcc/testsuite/gfortran.dg/gomp/gomp.exp
...@@ -30,7 +30,7 @@ dg-init ...@@ -30,7 +30,7 @@ dg-init
# Main loop. # Main loop.
gfortran-dg-runtest [lsort \ gfortran-dg-runtest [lsort \
[find $srcdir/$subdir *.\[fF\]{,90,95,03,08} ] ] " -fopenmp" [find $srcdir/$subdir *.\[fF\]{,90,95,03,08} ] ] "" "-fopenmp"
# All done. # All done.
dg-finish dg-finish
gcc/testsuite/gfortran.dg/graphite/graphite.exp
...@@ -47,19 +47,19 @@ set vect_files [lsort [glob -nocomplain $srcdir/$subdir/vect-*.\[fF\]{,90 ...@@ -47,19 +47,19 @@ set vect_files [lsort [glob -nocomplain $srcdir/$subdir/vect-*.\[fF\]{,90
# Tests to be compiled. # Tests to be compiled.
set dg-do-what-default compile set dg-do-what-default compile
gfortran-dg-runtest $scop_files "-O2 -fgraphite -fdump-tree-graphite-all" gfortran-dg-runtest $scop_files "" "-O2 -fgraphite -fdump-tree-graphite-all"
gfortran-dg-runtest $id_files "-O2 -fgraphite-identity -ffast-math" gfortran-dg-runtest $id_files "" "-O2 -fgraphite-identity -ffast-math"
gfortran-dg-runtest $interchange_files "-O2 -floop-interchange -fno-loop-block -fno-loop-strip-mine -ffast-math -fdump-tree-graphite-all" gfortran-dg-runtest $interchange_files "" "-O2 -floop-interchange -fno-loop-block -fno-loop-strip-mine -ffast-math -fdump-tree-graphite-all"
gfortran-dg-runtest $block_files "-O2 -floop-block -fno-loop-strip-mine -fno-loop-interchange -ffast-math -fdump-tree-graphite-all" gfortran-dg-runtest $block_files "" "-O2 -floop-block -fno-loop-strip-mine -fno-loop-interchange -ffast-math -fdump-tree-graphite-all"
# Vectorizer tests, to be run or compiled, depending on target capabilities. # Vectorizer tests, to be run or compiled, depending on target capabilities.
if [check_vect_support_and_set_flags] { if [check_vect_support_and_set_flags] {
gfortran-dg-runtest $vect_files "-O2 -fgraphite-identity -ftree-vectorize -fno-vect-cost-model -fdump-tree-vect-details -ffast-math" gfortran-dg-runtest $vect_files "" "-O2 -fgraphite-identity -ftree-vectorize -fno-vect-cost-model -fdump-tree-vect-details -ffast-math"
} }
# Tests to be run. # Tests to be run.
set dg-do-what-default run set dg-do-what-default run
gfortran-dg-runtest $run_id_files "-O2 -fgraphite-identity" gfortran-dg-runtest $run_id_files "" "-O2 -fgraphite-identity"
# The default action for the rest of the files is 'compile'. # The default action for the rest of the files is 'compile'.
set dg-do-what-default compile set dg-do-what-default compile
...@@ -69,7 +69,7 @@ foreach f $interchange_files {lremove wait_to_run_files $f} ...@@ -69,7 +69,7 @@ foreach f $interchange_files {lremove wait_to_run_files $f}
foreach f $scop_files {lremove wait_to_run_files $f} foreach f $scop_files {lremove wait_to_run_files $f}
foreach f $run_id_files {lremove wait_to_run_files $f} foreach f $run_id_files {lremove wait_to_run_files $f}
foreach f $vect_files {lremove wait_to_run_files $f} foreach f $vect_files {lremove wait_to_run_files $f}
gfortran-dg-runtest $wait_to_run_files "" gfortran-dg-runtest $wait_to_run_files "" ""
# Clean up. # Clean up.
set dg-do-what-default ${save-dg-do-what-default} set dg-do-what-default ${save-dg-do-what-default}
......
gcc/testsuite/gfortran.dg/guality/guality.exp
...@@ -25,7 +25,7 @@ if ![info exists ::env(GUALITY_GDB_NAME)] { ...@@ -25,7 +25,7 @@ if ![info exists ::env(GUALITY_GDB_NAME)] {
setenv GUALITY_GDB_NAME "$guality_gdb_name" setenv GUALITY_GDB_NAME "$guality_gdb_name"
} }
gfortran-dg-runtest [lsort [glob $srcdir/$subdir/*.\[fF\]{,90,95,03,08} ]] "" gfortran-dg-runtest [lsort [glob $srcdir/$subdir/*.\[fF\]{,90,95,03,08} ]] "" ""
if [info exists guality_gdb_name] { if [info exists guality_gdb_name] {
unsetenv GUALITY_GDB_NAME unsetenv GUALITY_GDB_NAME
......
gcc/testsuite/gfortran.dg/ieee/ieee.exp
...@@ -53,7 +53,7 @@ set options "$options $target_options" ...@@ -53,7 +53,7 @@ set options "$options $target_options"
# Main loop. # Main loop.
gfortran-dg-runtest [lsort \ gfortran-dg-runtest [lsort \
[find $srcdir/$subdir *.\[fF\]{,90,95,03,08} ] ] $options [find $srcdir/$subdir *.\[fF\]{,90,95,03,08} ] ] "" $options
# All done. # All done.
dg-finish dg-finish
gcc/testsuite/gfortran.dg/vect/vect.exp
...@@ -47,8 +47,8 @@ if ![check_vect_support_and_set_flags] { ...@@ -47,8 +47,8 @@ if ![check_vect_support_and_set_flags] {
dg-init dg-init
# Main loop. # Main loop.
gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/vect-*.\[fF\]{,90,95,03,08} ]] $DEFAULT_VECTCFLAGS gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/vect-*.\[fF\]{,90,95,03,08} ]] "" $DEFAULT_VECTCFLAGS
gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/pr*.\[fF\]{,90,95,03,08} ]] $DEFAULT_VECTCFLAGS gfortran-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/pr*.\[fF\]{,90,95,03,08} ]] "" $DEFAULT_VECTCFLAGS
#### Tests with special options #### Tests with special options
global SAVED_DEFAULT_VECTCFLAGS global SAVED_DEFAULT_VECTCFLAGS
......
gcc/testsuite/go.dg/dg.exp
...@@ -30,7 +30,7 @@ dg-init ...@@ -30,7 +30,7 @@ dg-init
# Main loop. # Main loop.
go-dg-runtest [lsort \ go-dg-runtest [lsort \
[glob -nocomplain $srcdir/$subdir/*.go ] ] $DEFAULT_GOCFLAGS [glob -nocomplain $srcdir/$subdir/*.go ] ] "" $DEFAULT_GOCFLAGS
# All done. # All done.
dg-finish dg-finish
gcc/testsuite/go.test/go-test.exp
...@@ -152,7 +152,7 @@ proc errchk { test opts } { ...@@ -152,7 +152,7 @@ proc errchk { test opts } {
set hold_runtests $runtests set hold_runtests $runtests
set runtests "go-test.exp" set runtests "go-test.exp"
go-dg-runtest $filename "-fno-show-column $DEFAULT_GOCFLAGS $opts" go-dg-runtest $filename "" "-fno-show-column $DEFAULT_GOCFLAGS $opts"
set runtests $hold_runtests set runtests $hold_runtests
file delete $filename file delete $filename
...@@ -176,7 +176,7 @@ proc go-execute-xfail { test } { ...@@ -176,7 +176,7 @@ proc go-execute-xfail { test } {
set hold_runtests $runtests set hold_runtests $runtests
set runtests "go-test.exp" set runtests "go-test.exp"
go-dg-runtest $filename "-w $DEFAULT_GOCFLAGS" go-dg-runtest $filename "" "-w $DEFAULT_GOCFLAGS"
set runtests $hold_runtests set runtests $hold_runtests
file delete $filename file delete $filename
...@@ -524,7 +524,7 @@ proc go-gc-tests { } { ...@@ -524,7 +524,7 @@ proc go-gc-tests { } {
|| $test_line == "// echo bug395 is broken # takes 90+ seconds to break" } { || $test_line == "// echo bug395 is broken # takes 90+ seconds to break" } {
# This is a vanilla compile test. # This is a vanilla compile test.
set dg-do-what-default "assemble" set dg-do-what-default "assemble"
go-dg-runtest $test "-w $DEFAULT_GOCFLAGS" go-dg-runtest $test "" "-w $DEFAULT_GOCFLAGS"
} elseif { $test_line == "// run" } elseif { $test_line == "// run"
|| $test_line == "// \$G \$F.go && \$L \$F.\$A && ./\$A.out" } { || $test_line == "// \$G \$F.go && \$L \$F.\$A && ./\$A.out" } {
# This is a vanilla execution test. # This is a vanilla execution test.
...@@ -533,7 +533,7 @@ proc go-gc-tests { } { ...@@ -533,7 +533,7 @@ proc go-gc-tests { } {
} elseif { $test_line == "// build" } { } elseif { $test_line == "// build" } {
# This is a vanilla compile and link test. # This is a vanilla compile and link test.
set dg-do-what-default "link" set dg-do-what-default "link"
go-dg-runtest $test "-w $DEFAULT_GOCFLAGS" go-dg-runtest $test "" "-w $DEFAULT_GOCFLAGS"
} elseif { [string match "// runoutput*" $test_line] \ } elseif { [string match "// runoutput*" $test_line] \
|| ($test_line == "// \$G \$D/\$F.go && \$L \$F.\$A &&" || ($test_line == "// \$G \$D/\$F.go && \$L \$F.\$A &&"
&& $test_line2 == "// ./\$A.out >tmp.go && \$G tmp.go && \$L -o \$A.out1 tmp.\$A && ./\$A.out1") } { && $test_line2 == "// ./\$A.out >tmp.go && \$G tmp.go && \$L -o \$A.out1 tmp.\$A && ./\$A.out1") } {
......
gcc/testsuite/lib/g++-dg.exp
...@@ -29,7 +29,7 @@ proc g++-dg-prune { system text } { ...@@ -29,7 +29,7 @@ proc g++-dg-prune { system text } {
# Modified dg-runtest that runs tests in both C++98 and C++11 modes # Modified dg-runtest that runs tests in both C++98 and C++11 modes
# unless they specifically specify one or the other. # unless they specifically specify one or the other.
proc g++-dg-runtest { testcases default-extra-flags } { proc g++-dg-runtest { testcases flags default-extra-flags } {
global runtests global runtests
foreach test $testcases { foreach test $testcases {
...@@ -53,9 +53,9 @@ proc g++-dg-runtest { testcases default-extra-flags } { ...@@ -53,9 +53,9 @@ proc g++-dg-runtest { testcases default-extra-flags } {
set nshort [file tail [file dirname $test]]/[file tail $test] set nshort [file tail [file dirname $test]]/[file tail $test]
foreach flags $option_list { foreach flags_t $option_list {
verbose "Testing $nshort, $flags" 1 verbose "Testing $nshort, $flags $flags_t" 1
dg-test $test $flags ${default-extra-flags} dg-test $test "$flags $flags_t" ${default-extra-flags}
} }
} }
} }
gcc/testsuite/lib/gcc-dg.exp
...@@ -337,7 +337,7 @@ proc search_for { file pattern } { ...@@ -337,7 +337,7 @@ proc search_for { file pattern } {
# Modified dg-runtest that can cycle through a list of optimization options # Modified dg-runtest that can cycle through a list of optimization options
# as c-torture does. # as c-torture does.
proc gcc-dg-runtest { testcases default-extra-flags } { proc gcc-dg-runtest { testcases flags default-extra-flags } {
global runtests global runtests
# Some callers set torture options themselves; don't override those. # Some callers set torture options themselves; don't override those.
...@@ -367,9 +367,9 @@ proc gcc-dg-runtest { testcases default-extra-flags } { ...@@ -367,9 +367,9 @@ proc gcc-dg-runtest { testcases default-extra-flags } {
set nshort [file tail [file dirname $test]]/[file tail $test] set nshort [file tail [file dirname $test]]/[file tail $test]
foreach flags $option_list { foreach flags_t $option_list {
verbose "Testing $nshort, $flags" 1 verbose "Testing $nshort, $flags $flags_t" 1
dg-test $test $flags ${default-extra-flags} dg-test $test "$flags $flags_t" ${default-extra-flags}
} }
} }
......
gcc/testsuite/lib/gfortran-dg.exp
...@@ -88,7 +88,7 @@ proc gfortran-dg-prune { system text } { ...@@ -88,7 +88,7 @@ proc gfortran-dg-prune { system text } {
# Modified dg-runtest that can cycle through a list of optimization options # Modified dg-runtest that can cycle through a list of optimization options
# as c-torture does. # as c-torture does.
proc gfortran-dg-runtest { testcases default-extra-flags } { proc gfortran-dg-runtest { testcases flags default-extra-flags } {
global runtests global runtests
global DG_TORTURE_OPTIONS torture_with_loops global DG_TORTURE_OPTIONS torture_with_loops
...@@ -113,9 +113,9 @@ proc gfortran-dg-runtest { testcases default-extra-flags } { ...@@ -113,9 +113,9 @@ proc gfortran-dg-runtest { testcases default-extra-flags } {
set nshort [file tail [file dirname $test]]/[file tail $test] set nshort [file tail [file dirname $test]]/[file tail $test]
list-module-names $test list-module-names $test
foreach flags $option_list { foreach flags_t $option_list {
verbose "Testing $nshort, $flags" 1 verbose "Testing $nshort, $flags $flags_t" 1
dg-test $test $flags ${default-extra-flags} dg-test $test "$flags $flags_t" ${default-extra-flags}
cleanup-modules "" cleanup-modules ""
} }
} }
......
gcc/testsuite/lib/go-dg.exp
...@@ -36,7 +36,7 @@ proc go-dg-prune { system text } { ...@@ -36,7 +36,7 @@ proc go-dg-prune { system text } {
# Modified dg-runtest that can cycle through a list of optimization options # Modified dg-runtest that can cycle through a list of optimization options
# as c-torture does. # as c-torture does.
proc go-dg-runtest { testcases default-extra-flags } { proc go-dg-runtest { testcases flags default-extra-flags } {
global runtests global runtests
global TORTURE_OPTIONS global TORTURE_OPTIONS
...@@ -57,9 +57,9 @@ proc go-dg-runtest { testcases default-extra-flags } { ...@@ -57,9 +57,9 @@ proc go-dg-runtest { testcases default-extra-flags } {
set nshort [file tail [file dirname $test]]/[file tail $test] set nshort [file tail [file dirname $test]]/[file tail $test]
foreach flags $option_list { foreach flags_t $option_list {
verbose "Testing $nshort, $flags" 1 verbose "Testing $nshort, $flags $flags_t" 1
dg-test $test $flags ${default-extra-flags} dg-test $test "$flags $flags_t" ${default-extra-flags}
} }
} }
} }
gcc/testsuite/lib/obj-c++-dg.exp
...@@ -29,7 +29,7 @@ proc obj-c++-dg-prune { system text } { ...@@ -29,7 +29,7 @@ proc obj-c++-dg-prune { system text } {
# Modified dg-runtest that can cycle through a list of optimization options # Modified dg-runtest that can cycle through a list of optimization options
# as c-torture does. # as c-torture does.
proc obj-c++-dg-runtest { testcases default-extra-flags } { proc obj-c++-dg-runtest { testcases flags default-extra-flags } {
global runtests global runtests
# Some callers set torture options themselves; don't override those. # Some callers set torture options themselves; don't override those.
...@@ -59,9 +59,9 @@ proc obj-c++-dg-runtest { testcases default-extra-flags } { ...@@ -59,9 +59,9 @@ proc obj-c++-dg-runtest { testcases default-extra-flags } {
set nshort [file tail [file dirname $test]]/[file tail $test] set nshort [file tail [file dirname $test]]/[file tail $test]
foreach flags $option_list { foreach flags_t $option_list {
# combine flags so that dg-skip & xfail will see the extras. # combine flags so that dg-skip & xfail will see the extras.
set combined_flags "$flags ${default-extra-flags}" set combined_flags "$flags $flags_t ${default-extra-flags}"
verbose "Testing $nshort, $combined_flags" 1 verbose "Testing $nshort, $combined_flags" 1
dg-test $test $combined_flags "" dg-test $test $combined_flags ""
} }
......
gcc/testsuite/lib/objc-dg.exp
...@@ -30,7 +30,7 @@ proc objc-dg-prune { system text } { ...@@ -30,7 +30,7 @@ proc objc-dg-prune { system text } {
# Modified dg-runtest that can cycle through a list of optimization options # Modified dg-runtest that can cycle through a list of optimization options
# as c-torture does. # as c-torture does.
proc objc-dg-runtest { testcases default-extra-flags } { proc objc-dg-runtest { testcases flags default-extra-flags } {
global runtests global runtests
# Some callers set torture options themselves; don't override those. # Some callers set torture options themselves; don't override those.
...@@ -60,9 +60,9 @@ proc objc-dg-runtest { testcases default-extra-flags } { ...@@ -60,9 +60,9 @@ proc objc-dg-runtest { testcases default-extra-flags } {
set nshort [file tail [file dirname $test]]/[file tail $test] set nshort [file tail [file dirname $test]]/[file tail $test]
foreach flags $option_list { foreach flags_t $option_list {
# combine flags so that dg-skip & xfail will see the extras. # combine flags so that dg-skip & xfail will see the extras.
set combined_flags "$flags ${default-extra-flags}" set combined_flags "$flags $flags_t ${default-extra-flags}"
verbose "Testing $nshort, $combined_flags" 1 verbose "Testing $nshort, $combined_flags" 1
dg-test $test $combined_flags "" dg-test $test $combined_flags ""
} }
......
gcc/testsuite/obj-c++.dg/torture/dg-torture.exp
...@@ -7,11 +7,11 @@ dg-init ...@@ -7,11 +7,11 @@ dg-init
# Gather a list of all tests. # Gather a list of all tests.
set tests [lsort [glob -nocomplain $srcdir/$subdir/*.mm]] set tests [lsort [glob -nocomplain $srcdir/$subdir/*.mm]]
obj-c++-dg-runtest $tests "-fgnu-runtime" obj-c++-dg-runtest $tests "" "-fgnu-runtime"
# darwin targets can also run code with the NeXT runtime. # darwin targets can also run code with the NeXT runtime.
if [istarget "*-*-darwin*" ] { if [istarget "*-*-darwin*" ] {
obj-c++-dg-runtest $tests "-fnext-runtime" obj-c++-dg-runtest $tests "" "-fnext-runtime"
} }
dg-finish dg-finish
gcc/testsuite/obj-c++.dg/torture/strings/strings.exp
...@@ -24,11 +24,11 @@ dg-init ...@@ -24,11 +24,11 @@ dg-init
# Gather a list of all tests. # Gather a list of all tests.
set tests [lsort [glob -nocomplain $srcdir/$subdir/*.mm]] set tests [lsort [glob -nocomplain $srcdir/$subdir/*.mm]]
obj-c++-dg-runtest $tests "-fgnu-runtime" obj-c++-dg-runtest $tests "" "-fgnu-runtime"
# Darwin targets can also run code with the NeXT runtime. # Darwin targets can also run code with the NeXT runtime.
if [istarget "*-*-darwin*" ] { if [istarget "*-*-darwin*" ] {
obj-c++-dg-runtest $tests "-fnext-runtime" obj-c++-dg-runtest $tests "" "-fnext-runtime"
} }
dg-finish dg-finish
gcc/testsuite/obj-c++.dg/torture/tls/tls.exp
...@@ -6,11 +6,11 @@ dg-init ...@@ -6,11 +6,11 @@ dg-init
# Gather a list of all tests. # Gather a list of all tests.
set tests [lsort [glob -nocomplain $srcdir/$subdir/*.mm]] set tests [lsort [glob -nocomplain $srcdir/$subdir/*.mm]]
obj-c++-dg-runtest $tests "-fgnu-runtime" obj-c++-dg-runtest $tests "" "-fgnu-runtime"
# darwin targets can also run code with the NeXT runtime. # darwin targets can also run code with the NeXT runtime.
if [istarget "*-*-darwin*" ] { if [istarget "*-*-darwin*" ] {
obj-c++-dg-runtest $tests "-fnext-runtime" obj-c++-dg-runtest $tests "" "-fnext-runtime"
} }
dg-finish dg-finish
gcc/testsuite/objc.dg/torture/dg-torture.exp
...@@ -7,11 +7,11 @@ dg-init ...@@ -7,11 +7,11 @@ dg-init
# Gather a list of all tests. # Gather a list of all tests.
set tests [lsort [glob -nocomplain $srcdir/$subdir/*.m]] set tests [lsort [glob -nocomplain $srcdir/$subdir/*.m]]
objc-dg-runtest $tests "-fgnu-runtime" objc-dg-runtest $tests "" "-fgnu-runtime"
# darwin targets can also run code with the NeXT runtime. # darwin targets can also run code with the NeXT runtime.
if [istarget "*-*-darwin*" ] { if [istarget "*-*-darwin*" ] {
objc-dg-runtest $tests "-fnext-runtime" objc-dg-runtest $tests "" "-fnext-runtime"
} }
dg-finish dg-finish
gcc/testsuite/objc.dg/torture/strings/strings.exp
...@@ -24,11 +24,11 @@ dg-init ...@@ -24,11 +24,11 @@ dg-init
# Gather a list of all tests. # Gather a list of all tests.
set tests [lsort [glob -nocomplain $srcdir/$subdir/*.m]] set tests [lsort [glob -nocomplain $srcdir/$subdir/*.m]]
objc-dg-runtest $tests "-fgnu-runtime" objc-dg-runtest $tests "" "-fgnu-runtime"
# Darwin targets also test with the NeXT runtime. # Darwin targets also test with the NeXT runtime.
if [istarget "*-*-darwin*" ] { if [istarget "*-*-darwin*" ] {
objc-dg-runtest $tests "-fnext-runtime" objc-dg-runtest $tests "" "-fnext-runtime"
} }
dg-finish dg-finish
gcc/testsuite/objc.dg/torture/tls/tls.exp
...@@ -7,11 +7,11 @@ dg-init ...@@ -7,11 +7,11 @@ dg-init
# Gather a list of all tests. # Gather a list of all tests.
set tests [lsort [glob -nocomplain $srcdir/$subdir/*.m]] set tests [lsort [glob -nocomplain $srcdir/$subdir/*.m]]
objc-dg-runtest $tests "-fgnu-runtime" objc-dg-runtest $tests "" "-fgnu-runtime"
# darwin targets can also run code with the NeXT runtime. # darwin targets can also run code with the NeXT runtime.
if [istarget "*-*-darwin*" ] { if [istarget "*-*-darwin*" ] {
objc-dg-runtest $tests "-fnext-runtime" objc-dg-runtest $tests "" "-fnext-runtime"
} }
dg-finish dg-finish
libffi/ChangeLog
2014-07-04 Thomas Schwinge <thomas@codesourcery.com>
* testsuite/lib/libffi.exp (libffi-dg-runtest): Change interface
match to dg-runtest's.
2014-05-20 Sebastian Huber <sebastian.huber@embedded-brains.de> 2014-05-20 Sebastian Huber <sebastian.huber@embedded-brains.de>
* testsuite/lib/libffi.exp (load_gcc_lib): Register loaded libs. * testsuite/lib/libffi.exp (load_gcc_lib): Register loaded libs.
......
libffi/testsuite/lib/libffi.exp
...@@ -238,7 +238,7 @@ proc search_for { file pattern } { ...@@ -238,7 +238,7 @@ proc search_for { file pattern } {
# Modified dg-runtest that can cycle through a list of optimization options # Modified dg-runtest that can cycle through a list of optimization options
# as c-torture does. # as c-torture does.
proc libffi-dg-runtest { testcases default-extra-flags } { proc libffi-dg-runtest { testcases flags default-extra-flags } {
global runtests global runtests
foreach test $testcases { foreach test $testcases {
...@@ -259,9 +259,9 @@ proc libffi-dg-runtest { testcases default-extra-flags } { ...@@ -259,9 +259,9 @@ proc libffi-dg-runtest { testcases default-extra-flags } {
set nshort [file tail [file dirname $test]]/[file tail $test] set nshort [file tail [file dirname $test]]/[file tail $test]
foreach flags $option_list { foreach flags_t $option_list {
verbose "Testing $nshort, $flags" 1 verbose "Testing $nshort, $flags $flags_t" 1
dg-test $test $flags ${default-extra-flags} dg-test $test "$flags $flags_t" ${default-extra-flags}
} }
} }
} }
......
libgomp/testsuite/libgomp.fortran/fortran.exp
...@@ -66,7 +66,7 @@ if { $lang_test_file_found } { ...@@ -66,7 +66,7 @@ if { $lang_test_file_found } {
# For Fortran we're doing torture testing, as Fortran has far more tests # For Fortran we're doing torture testing, as Fortran has far more tests
# with arrays etc. that testing just -O0 or -O2 is insufficient, that is # with arrays etc. that testing just -O0 or -O2 is insufficient, that is
# typically not the case for C/C++. # typically not the case for C/C++.
gfortran-dg-runtest $tests "" gfortran-dg-runtest $tests "" ""
} }
# All done. # All done.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment