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 <gaiusmod2@gmail.com>

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 92ed8d8..3c1d9a1 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 09d04ee..1a64f7e 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 79640c2..d1e8e42 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 faec3f9..2212756 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 aa46c35..5013c50 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
 }