Patchwork [go,testsuite] : Fix PR48501, 64bit-out.go, select5-out.go, tmp.go compilation times out

login
register
mail settings
Submitter Uros Bizjak
Date Jan. 30, 2012, 6:42 p.m.
Message ID <CAFULd4ZBmTQDfQNKPaB4YXQRieTa3fWzauJELT22FobhktOKUg@mail.gmail.com>
Download mbox | patch
Permalink /patch/138622/
State New
Headers show

Comments

Uros Bizjak - Jan. 30, 2012, 6:42 p.m.
Hello!

Attached patch introduces adjustable timeout value to go testsuite. I
have added the fix for select5-out.go compilation timeout error, since
this test fails on my target. Following this example, it is trivial to
fix other timeout issues in go-test.exp.

2012-01-30  Uros Bizjak  <ubizjak@gmail.com>

	PR go/48501
	* lib/go.exp (go_target_compile): Append timeout= to options.
	* go.test/go-test.exp (go-gc-tests): Add dg-timeout-factor for
	select5-out.go test on alpha*-*-* targets.

Tested on alphaev8-pc-linux-gnu.

OK for mainline?

Uros.
Ian Taylor - Jan. 30, 2012, 9:22 p.m.
Uros Bizjak <ubizjak@gmail.com> writes:

> 2012-01-30  Uros Bizjak  <ubizjak@gmail.com>
>
> 	PR go/48501
> 	* lib/go.exp (go_target_compile): Append timeout= to options.
> 	* go.test/go-test.exp (go-gc-tests): Add dg-timeout-factor for
> 	select5-out.go test on alpha*-*-* targets.

This is OK.

Thanks.

Ian

Patch

Index: go.test/go-test.exp
===================================================================
--- go.test/go-test.exp	(revision 183732)
+++ go.test/go-test.exp	(working copy)
@@ -1005,7 +1005,10 @@ 
 		} else {
 		    pass "$name execution"
 		    file delete $base-out.x
+		    # This testcase takes long time to compile.
+		    dg-timeout-factor list 4 { target alpha*-*-* }
 		    go-torture-execute "./$base-out.go"
+		    unset_timeout_vars
 		}
 		file delete $base-out.go
 	    }
Index: lib/go.exp
===================================================================
--- lib/go.exp	(revision 183732)
+++ lib/go.exp	(working copy)
@@ -216,6 +216,7 @@ 
 	lappend options "ldflags=${wrap_flags}"
     }
 
+    lappend options "timeout=[timeout_value]"
     lappend options "compiler=$GOC_UNDER_TEST"
 
     set options [concat "$ALWAYS_GOCFLAGS" $options]