From 0557b60a665e2ebd89306ddb98960614f003796e Mon Sep 17 00:00:00 2001 From: janis Date: Wed, 26 Nov 2008 18:51:07 +0000 Subject: gcc/ PR testsuite/28870 * doc/sourcebuild.texi (Test Directives): Add dg-timeout and dg-timeout-factor. gcc/testsuite/ PR testsuite/28870 * lib/timeout.exp: New. * lib/timeout-dg.exp: New. * lib/gcc-dg.exp: Include new timeout library files. (dg-test): Unset timeout variables. * lib/gcc.exp (gcc_target_compile): Set timeout value from new proc. * lib/g++.exp (g++_target_compile): Ditto. * lib/gfortran.exp (gfortran_target_compile): Ditto. * lib/objc.exp (objc_target_compile): Ditto. * lib/obj-c++.exp (obj-c++_target_compile): Ditto. * lib/obj-c++.exp (obj-c++_target_compile): Ditto. * lib/gnat.exp (gnat_target_compile): Ditto. libstdc++-v3/ PR testsuite/28870 * testsuite/lib/libstdc++.exp: Include new timeout library files. (libstdc++_init): Define tool_timeout. (dg-test): Override DejaGnu proc. (v3_target_compile): Set timeout value from new proc. (v3_target_compile_as_c): Ditto. libmudflap/ PR testsuite/28870 * testsuite/lib/mfdg.exp (dg-test): Use new timeout support. (dg-timeout): Remove. (standard-wait): Remove. * testsuite/lib/libmudflap.exp: Include new timeout library files. (libmudflap_target_compile): Set timeout value from new proc. libgomp/ PR testsuite/28870 * testsuite/lib/libgomp.exp: Include new timeout library files. (libgomp_target_compile): Set timeout value from new proc. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@142225 138bc75d-0d04-0410-961f-82ee72b054a4 --- libmudflap/ChangeLog | 9 +++++++++ libmudflap/testsuite/lib/libmudflap.exp | 3 +++ libmudflap/testsuite/lib/mfdg.exp | 31 +------------------------------ 3 files changed, 13 insertions(+), 30 deletions(-) (limited to 'libmudflap') diff --git a/libmudflap/ChangeLog b/libmudflap/ChangeLog index 208ab8fb99b..c75648e22d3 100644 --- a/libmudflap/ChangeLog +++ b/libmudflap/ChangeLog @@ -1,3 +1,12 @@ +2008-11-26 Janis Johnson + + PR testsuite/28870 + * testsuite/lib/mfdg.exp (dg-test): Use new timeout support. + (dg-timeout): Remove. + (standard-wait): Remove. + * testsuite/lib/libmudflap.exp: Include new timeout library files. + (libmudflap_target_compile): Set timeout value from new proc. + 2008-11-10 Jakub Jelinek PR middle-end/35314 diff --git a/libmudflap/testsuite/lib/libmudflap.exp b/libmudflap/testsuite/lib/libmudflap.exp index 94d060b3c75..1abd783c510 100644 --- a/libmudflap/testsuite/lib/libmudflap.exp +++ b/libmudflap/testsuite/lib/libmudflap.exp @@ -29,6 +29,8 @@ proc load_gcc_lib { filename } { load_lib mfdg.exp load_lib libgloss.exp load_gcc_lib target-libpath.exp +load_gcc_lib timeout.exp +load_gcc_lib timeout-dg.exp proc libmudflap-init { language } { global env @@ -213,6 +215,7 @@ proc libmudflap_target_compile { source dest type options } { set cxx_final [concat $cxx_final $libs] lappend options "compiler=$cxx_final" + lappend options "timeout=[timeout_value]" # Picks up the freshly-built testsuite library corresponding to the # multilib under test. diff --git a/libmudflap/testsuite/lib/mfdg.exp b/libmudflap/testsuite/lib/mfdg.exp index 7bcd44a94c1..68702994675 100644 --- a/libmudflap/testsuite/lib/mfdg.exp +++ b/libmudflap/testsuite/lib/mfdg.exp @@ -40,8 +40,7 @@ proc dg-test { args } { set keep 0 set i 0 set dg-repetitions 1 ;# may be overridden by { dg-repetitions N } - global dg-timeout - set dg-timeout 0 ;# likewise by { dg-timeout N } + unset_timeout_vars if { [string index [lindex $args 0] 0] == "-" } { for { set i 0 } { $i < [llength $args] } { incr i } { @@ -347,31 +346,3 @@ proc dg-repetitions { line value } { upvar dg-repetitions repetitions set repetitions $value } - - -# -# Indicate that this test case is to be run with a short timeout. -# The embedded format is "{ dg-timeout N }", where N is in seconds. -# -proc dg-timeout { line value } { - global dg-timeout - set dg-timeout $value -} - - -# dejagnu's config/unix.exp hard-codes 300 seconds as the timeout -# for any natively run executable. That's too long for tests run -# multiple times and that may possibly hang. So we override it here -# to provide some degree of control. -rename standard_wait hooked_standard_wait -proc standard_wait { dest timeout } { - global dg-timeout - if {[info exists dg-timeout]} { - if {${dg-timeout} > 0} { - verbose -log "Overriding timeout = ${dg-timeout}" - set timeout ${dg-timeout} - } - } - - hooked_standard_wait $dest $timeout -} -- cgit v1.2.1