On 12/6/22 09:47, Gaius Mulley via Gcc-patches wrote:
Here are the dejagnu expect library scripts for the gm2
testsuite.
A couple of weeks ago I noticed on a testrun that the modula tests
didn't seem to be timing out properly, so I made this change. It looks
like they didn't run at all in the bootstrap/test I did just now, so I
don't know if this change is actually helpful, but here it is if you
think it makes sense:
From 6c9007800b8793c68921ee3d24f3a5000b44a100 Mon Sep 17 00:00:00 2001
From: Jason Merrill <ja...@redhat.com>
Date: Wed, 21 Dec 2022 17:01:50 -0500
Subject: [PATCH] testsuite: use same timeout for gm2 as other front-ends
To: gcc-patches@gcc.gnu.org
I noticed Modula tests running forever in a regression test run, and then
that its .exp wasn't using timeout.exp like the other front-ends.
gcc/testsuite/ChangeLog:
* lib/gm2.exp: Use timeout.exp.
---
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 9eba195291a..1fa62d8e6ea 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"
--
2.31.1
