Recalibrate the timeouts for the larger code tests

Some of the larger code tests timeout when -O3 is given.
This patch increase the map and pimlib-base-run-pass tests.

gcc/testsuite/ChangeLog:

	* gm2/examples/map/pass/examples-map-pass.exp:
	Call gm2_push_timeout 30 before foreach testcase.
	Call gm2_pop_timeout after the foreach statement.
	* gm2/pimlib/base/run/pass/pimlib-base-run-pass.exp:
	Call gm2_push_timeout 20 before foreach testcase.
	Call gm2_pop_timeout after the foreach statement.

Signed-off-by: Gaius Mulley <gaiusmod2@gmail.com>

diff --git a/gcc/testsuite/gm2/examples/map/pass/examples-map-pass.exp b/gcc/testsuite/gm2/examples/map/pass/examples-map-pass.exp
index 4c9ea5b..79841e8 100644 (file)
--- a/gcc/testsuite/gm2/examples/map/pass/examples-map-pass.exp
+++ b/gcc/testsuite/gm2/examples/map/pass/examples-map-pass.exp
@@ -27,6 +27,9 @@ load_lib gm2-torture.exp
 
 gm2_init_pim "$srcdir/$subdir"
 
+# We should be able to compile, link or run in 30 seconds.
+gm2_push_timeout 30
+
 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 {
@@ -35,3 +38,5 @@ foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] {
 
     gm2-torture $testcase
 }
+
+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 ba0d677..82d055b 100644 (file)
--- 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
@@ -29,6 +29,9 @@ set gm2src ${srcdir}/../m2
 
 gm2_init_pim "${srcdir}/gm2/pimlib/base/run/pass"
 
+# We should be able to compile, link or run in 20 seconds.
+gm2_push_timeout 20
+
 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 +40,5 @@ foreach testcase [lsort [glob -nocomplain $srcdir/$subdir/*.mod]] {
 
     gm2-torture-execute $testcase "" "pass"
 }
+
+gm2_pop_timeout