From: Russ Cox <rsc@golang.org>
Date: Mon, 23 Sep 2013 19:58:35 +0000 (-0400)
Subject: undo CL 13321048 / 9567c5da6e25
X-Git-Tag: go1.2rc2~137
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=0fc9db794492323e0a4b8c7bf8c8f4069257f58a;p=gostls13.git

undo CL 13321048 / 9567c5da6e25

Makes build unnecessarily slower. Will fix the parser instead.

««« original CL description
runtime/pprof: run TestGoroutineSwitch for longer

Short test now takes about 0.5 second here.

Fixes #6417.

The failure was also seen on our builders.

R=golang-dev, minux.ma, r
CC=golang-dev
https://golang.org/cl/13321048
»»»

R=golang-dev, minux.ma
CC=golang-dev
https://golang.org/cl/13720048
---

diff --git a/src/pkg/runtime/pprof/pprof_test.go b/src/pkg/runtime/pprof/pprof_test.go
index f7bb487b7f..419178415a 100644
--- a/src/pkg/runtime/pprof/pprof_test.go
+++ b/src/pkg/runtime/pprof/pprof_test.go
@@ -183,11 +183,11 @@ func TestCPUProfileWithFork(t *testing.T) {
 // If it did, it would see inconsistent state and would either record an incorrect stack
 // or crash because the stack was malformed.
 func TestGoroutineSwitch(t *testing.T) {
-	// How much to try. These defaults take about 6 seconds
-	// on a 2011 Windows 7 64 bit notebook. The ones in short mode take
-	// about 0.6 seconds.
+	// How much to try. These defaults take about 1 seconds
+	// on a 2012 MacBook Pro. The ones in short mode take
+	// about 0.1 seconds.
 	tries := 10
-	count := 4000000
+	count := 1000000
 	if testing.Short() {
 		tries = 1
 	}