From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1499) id 80F743858C52; Thu, 28 Sep 2023 18:07:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 80F743858C52 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1695924450; bh=YaVVpTMd/PgLD9yb8+L3hzLAB//MrHcVKQB027KbtXg=; h=From:To:Subject:Date:From; b=RqoalYJr9PGfOFMC/g5cosGDahdiK+FuJ/WmYq7gxv2LP41X40tnKfRsAizAqg3dW ifjzC699SxWBLLeykjjTJfXGCTzuZvgcJwVHaRZaOHFGmPZ93mB8Mx/DcGUGbEWCoa IoJXi/kiN44gX28sKYZ9j97Bl55Qnx7UzpqGAwRw= 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 r14-4314] modula2: Increase linking test timeouts for slower targets X-Act-Checkin: gcc X-Git-Author: Gaius Mulley X-Git-Refname: refs/heads/master X-Git-Oldrev: 2c1e3544a94c5d7354fad031e1f9731c3ce3af25 X-Git-Newrev: 918a691a398718b556516846f3f07344203cea11 Message-Id: <20230928180730.80F743858C52@sourceware.org> Date: Thu, 28 Sep 2023 18:07:30 +0000 (GMT) List-Id: https://gcc.gnu.org/g:918a691a398718b556516846f3f07344203cea11 commit r14-4314-g918a691a398718b556516846f3f07344203cea11 Author: Gaius Mulley Date: Thu Sep 28 19:07:04 2023 +0100 modula2: Increase linking test timeouts for slower targets This patch introduces missing timeout handling for pimlib-base-run-pass.exp and increases the timeout value for larger projects which link (necessary for slower targets). gcc/testsuite/ChangeLog: * gm2/coroutines/pim/run/pass/coroutines-pim-run-pass.exp: Add load_lib timeout-dg.exp and increase timeout to 60 seconds. * gm2/pimlib/base/run/pass/pimlib-base-run-pass.exp: Add load_lib timeout-dg.exp and increase timeout to 60 seconds. * gm2/projects/iso/run/pass/halma/projects-iso-run-pass-halma.exp: Increase timeout to 45 seconds. * gm2/switches/whole-program/pass/run/switches-whole-program-pass-run.exp: Add load_lib timeout-dg.exp and increase timeout to 120 seconds. Remove unnecessary compile of mystrlib.mod. * gm2/iso/run/pass/iso-run-pass.exp: Add load_lib timeout-dg.exp and set timeout to 60 seconds. Signed-off-by: Gaius Mulley Diff: --- .../gm2/coroutines/pim/run/pass/coroutines-pim-run-pass.exp | 4 ++-- gcc/testsuite/gm2/iso/run/pass/iso-run-pass.exp | 6 ++++++ gcc/testsuite/gm2/pimlib/base/run/pass/pimlib-base-run-pass.exp | 5 +++-- .../projects/iso/run/pass/halma/projects-iso-run-pass-halma.exp | 7 +++++++ .../whole-program/pass/run/switches-whole-program-pass-run.exp | 4 ++-- 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/gcc/testsuite/gm2/coroutines/pim/run/pass/coroutines-pim-run-pass.exp b/gcc/testsuite/gm2/coroutines/pim/run/pass/coroutines-pim-run-pass.exp index 92ed8d8b8ef..3c1d9a14d16 100644 --- a/gcc/testsuite/gm2/coroutines/pim/run/pass/coroutines-pim-run-pass.exp +++ b/gcc/testsuite/gm2/coroutines/pim/run/pass/coroutines-pim-run-pass.exp @@ -30,8 +30,8 @@ set gm2src ${srcdir}/../gm2 gm2_init_cor "" -# We should be able to compile, link or run in 15 seconds. -gm2_push_timeout 15 +# We should be able to compile, link or run in 20 seconds. +gm2_push_timeout 20 foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] { diff --git a/gcc/testsuite/gm2/iso/run/pass/iso-run-pass.exp b/gcc/testsuite/gm2/iso/run/pass/iso-run-pass.exp index 09d04ee910d..1a64f7e3e1b 100644 --- a/gcc/testsuite/gm2/iso/run/pass/iso-run-pass.exp +++ b/gcc/testsuite/gm2/iso/run/pass/iso-run-pass.exp @@ -23,10 +23,14 @@ if $tracelevel then { # load support procs load_lib gm2-torture.exp +load_lib timeout-dg.exp gm2_init_iso "${srcdir}/gm2/iso/run/pass" -fsoft-check-all gm2_link_obj fileio.o +# We should be able to compile, link or run in 60 seconds. +gm2_push_timeout 60 + foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] { # If we're only testing specific files and this isn't one of them, skip it. if ![runtest_file_p $runtests $testcase] then { @@ -38,3 +42,5 @@ foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] { gm2-torture-execute $testcase "" "pass" } } + +gm2_pop_timeout diff --git a/gcc/testsuite/gm2/pimlib/base/run/pass/pimlib-base-run-pass.exp b/gcc/testsuite/gm2/pimlib/base/run/pass/pimlib-base-run-pass.exp index 79640c2db4d..d1e8e422090 100644 --- a/gcc/testsuite/gm2/pimlib/base/run/pass/pimlib-base-run-pass.exp +++ b/gcc/testsuite/gm2/pimlib/base/run/pass/pimlib-base-run-pass.exp @@ -24,13 +24,14 @@ if $tracelevel then { # load support procs load_lib gm2-torture.exp +load_lib timeout-dg.exp set gm2src ${srcdir}/../m2 gm2_init_pim "" -# We should be able to compile, link or run in 20 seconds. -gm2_push_timeout 20 +# We should be able to compile, link or run in 60 seconds. +gm2_push_timeout 60 foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] { # If we're only testing specific files and this isn't one of them, skip it. diff --git a/gcc/testsuite/gm2/projects/iso/run/pass/halma/projects-iso-run-pass-halma.exp b/gcc/testsuite/gm2/projects/iso/run/pass/halma/projects-iso-run-pass-halma.exp index faec3f92902..22127561cbc 100644 --- a/gcc/testsuite/gm2/projects/iso/run/pass/halma/projects-iso-run-pass-halma.exp +++ b/gcc/testsuite/gm2/projects/iso/run/pass/halma/projects-iso-run-pass-halma.exp @@ -29,6 +29,11 @@ set gm2src ${srcdir}/../m2 gm2_init_iso "" +# We should be able to compile, link or run in 45 seconds even on a +# really slow host/target. + +gm2_push_timeout 45 + foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] { # If we're only testing specific files and this isn't one of them, skip it. if ![runtest_file_p $runtests $testcase] then { @@ -37,3 +42,5 @@ foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] { gm2-torture-execute $testcase "" "pass" } + +gm2_pop_timeout diff --git a/gcc/testsuite/gm2/switches/whole-program/pass/run/switches-whole-program-pass-run.exp b/gcc/testsuite/gm2/switches/whole-program/pass/run/switches-whole-program-pass-run.exp index aa46c35f93a..5013c500fee 100644 --- a/gcc/testsuite/gm2/switches/whole-program/pass/run/switches-whole-program-pass-run.exp +++ b/gcc/testsuite/gm2/switches/whole-program/pass/run/switches-whole-program-pass-run.exp @@ -23,16 +23,16 @@ if $tracelevel then { # load support procs load_lib gm2-torture.exp +load_lib timeout-dg.exp gm2_init_pim "${srcdir}/gm2/switches/whole-program/run/pass" -fm2-whole-program -gm2_push_timeout 60 +gm2_push_timeout 120 foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] { # If we're only testing specific files and this isn't one of them, skip it. if ![runtest_file_p $runtests $testcase] then { continue } - gm2_target_compile $srcdir/$subdir/mystrlib.mod mystrlib.o object "-g -O3 -I$srcdir/$subdir/" gm2-torture $testcase }