From: Ian Lance Taylor <iant@golang.org>
Date: Wed, 6 Jul 2011 20:00:54 +0000 (-0700)
Subject: json: fix test if rand returns 0.
X-Git-Tag: weekly.2011-07-07~18
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=7b0bb48056a59d3829ee47ab853b282d38b1efd1;p=gostls13.git

json: fix test if rand returns 0.

Fixes test when run with gccgo using optimization, which
changes the order of the calls to rand.

R=golang-dev, gri
CC=golang-dev
https://golang.org/cl/4639101
---

diff --git a/src/pkg/json/scanner_test.go b/src/pkg/json/scanner_test.go
index 0d4de3246d..023e7c81ee 100644
--- a/src/pkg/json/scanner_test.go
+++ b/src/pkg/json/scanner_test.go
@@ -252,7 +252,10 @@ func genArray(n int) []interface{} {
 	if f > n {
 		f = n
 	}
-	x := make([]interface{}, int(f))
+	if n > 0 && f == 0 {
+		f = 1
+	}
+	x := make([]interface{}, f)
 	for i := range x {
 		x[i] = genValue(((i+1)*n)/f - (i*n)/f)
 	}