Testsuite: use same timeout for gm2 as other front-ends

Committing a patch authored by: Jason Merrill <jason@redhat.com>
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 <gaiusmod2@gmail.com>

diff --git a/gcc/testsuite/lib/gm2.exp b/gcc/testsuite/lib/gm2.exp
index a2169b952794fb8a591f0b0b6a249e7dfd7c0122..0d8490c68491256dbd0ffe12ae826b63df21838d 100644 (file)
--- 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"