From: Keith Randall <khr@golang.org>
Date: Fri, 1 May 2015 16:36:18 +0000 (-0700)
Subject: test: fix nosplit test for noopt build
X-Git-Tag: go1.5beta1~770
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=6f42b6166ae2c0cd775d24aa82548fb8637004b5;p=gostls13.git

test: fix nosplit test for noopt build

Noopt builds get a larger stack guard.  This test must take that into account.

Change-Id: I1b5cbafdbbfee8c369ae1bebd0b900524ebf0d7d
Reviewed-on: https://go-review.googlesource.com/9610
Reviewed-by: Russ Cox <rsc@golang.org>
---

diff --git a/test/nosplit.go b/test/nosplit.go
index bd4e60bc13..bd7a8ddac3 100644
--- a/test/nosplit.go
+++ b/test/nosplit.go
@@ -292,9 +292,16 @@ TestCases:
 
 				// The limit was originally 128 but is now 512.
 				// Instead of rewriting the test cases above, adjust
-				// the first stack frame to use up the extra 32 bytes.
+				// the first stack frame to use up the extra bytes.
 				if i == 0 {
 					size += 512 - 128
+					// Noopt builds have a larger stackguard.
+					// See ../cmd/dist/buildruntime.go:stackGuardMultiplier
+					for _, s := range strings.Split(os.Getenv("GO_GCFLAGS"), " ") {
+						if s == "-N" {
+							size += 640
+						}
+					}
 				}
 
 				if size%ptrSize == 4 {