close_issue_2
/
tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

go.tools/oracle: eliminate reliance on undefined map iteration order. 

(Unmasked by recent randomization of small (<8) map iteration.)

R=gri, crawshaw, bradfitz
CC=golang-codereviews
https://golang.org/cl/51170044
This commit is contained in:
Alan Donovan 2014-01-15 22:55:52 -05:00
parent e8afbfad8c
commit d20cbc12f1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
oracle/callgraph.go
View File

@ -127,6 +127,7 @@ func (r *callgraphResult) toSerial(res *serial.Result, fset *token.FileSet) {
for callee := range call.CalleesOf(n) { for callee := range call.CalleesOf(n) {
j.Children = append(j.Children, numbering[callee]) j.Children = append(j.Children, numbering[callee])
} }
sort.Ints(j.Children)
} }
res.Callgraph = cg res.Callgraph = cg
} }

3
oracle/oracle_test.go
View File

@ -211,8 +211,7 @@ func TestOracle(t *testing.T) {
"testdata/src/main/what.go", "testdata/src/main/what.go",
// JSON: // JSON:
// TODO(adonovan): most of these are very similar; combine them. // TODO(adonovan): most of these are very similar; combine them.
// TODO(adonovan): enable this test once it works again. "testdata/src/main/callgraph-json.go",
//"testdata/src/main/callgraph-json.go",
"testdata/src/main/calls-json.go", "testdata/src/main/calls-json.go",
"testdata/src/main/peers-json.go", "testdata/src/main/peers-json.go",
"testdata/src/main/describe-json.go", "testdata/src/main/describe-json.go",