From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1499) id D3D483858418; Thu, 12 Jan 2023 23:49:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D3D483858418 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1673567383; bh=CUu2Pfdg2zY/WK1P8CwdzXVra+F4M9LK1GRdPJZxNCg=; h=From:To:Subject:Date:From; b=gZj5Ma3EIFouwmAPaC6vAPWxNxZE3w3rHgjwBN91Ld7Swp79P22+kk0ms8YiPzveI Dot36fqLy3+yDW0wmsVBOwK027iRueVmnkPoarwFeKSjNP6ep+bAXHtdxUFQ3htWNU VCk4+vPiicvh63ZxCvBEctYKpDzluQGgGGAGLQgI= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Gaius Mulley To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-5130] Testsuite: use same timeout for gm2 as other front-ends X-Act-Checkin: gcc X-Git-Author: Gaius Mulley X-Git-Refname: refs/heads/master X-Git-Oldrev: d84eab46cb656bde25b97b19e22973ac59e6c86a X-Git-Newrev: c0597d81b13c0cac41a9381fc5f3e6c73aa2ccaf Message-Id: <20230112234943.D3D483858418@sourceware.org> Date: Thu, 12 Jan 2023 23:49:43 +0000 (GMT) List-Id: https://gcc.gnu.org/g:c0597d81b13c0cac41a9381fc5f3e6c73aa2ccaf commit r13-5130-gc0597d81b13c0cac41a9381fc5f3e6c73aa2ccaf Author: Gaius Mulley Date: Thu Jan 12 23:48:48 2023 +0000 Testsuite: use same timeout for gm2 as other front-ends Committing a patch authored by: Jason Merrill which enables timeouts in the gm2 regression script library gm2.exp. gcc/testsuite/ChangeLog: * lib/gm2.exp: Use timeout.exp. Signed-off-by: Gaius Mulley Diff: --- gcc/testsuite/lib/gm2.exp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/lib/gm2.exp b/gcc/testsuite/lib/gm2.exp index a2169b95279..0d8490c6849 100644 --- a/gcc/testsuite/lib/gm2.exp +++ b/gcc/testsuite/lib/gm2.exp @@ -22,7 +22,7 @@ load_lib libgloss.exp load_lib prune.exp load_lib gcc-defs.exp load_lib target-libpath.exp - +load_lib timeout.exp # # GCC_UNDER_TEST is the compiler under test. @@ -183,9 +183,7 @@ proc gm2_target_compile_default { source dest type options } { if [info exists TOOL_OPTIONS] { lappend options "additional_flags=$TOOL_OPTIONS" } - if [target_info exists gcc,timeout] { - lappend options "timeout=[target_info gcc,timeout]" - } + lappend options "timeout=[timeout_value]" lappend options "compiler=$GCC_UNDER_TEST" # puts stderr "options = $options\n" # puts stderr "***** target_compile: $source $dest $type $options\n"