diff --git a/go/ssa/interp/interp_test.go b/go/ssa/interp/interp_test.go index 997922f6..3b15636a 100644 --- a/go/ssa/interp/interp_test.go +++ b/go/ssa/interp/interp_test.go @@ -103,8 +103,8 @@ var gorootTestTests = []string{ "floatcmp.go", "crlf.go", // doesn't actually assert anything (runoutput) // Slow tests follow. - "bom.go", // ~1.7s - "gc1.go", // ~1.7s + "bom.go", // ~1.7s + "gc1.go", // ~1.7s "cmplxdivide.go cmplxdivide1.go", // ~2.4s // Working, but not worth enabling: @@ -192,7 +192,7 @@ func run(t *testing.T, dir, input string, success successPredicate) bool { interp.CapturedOutput = nil }() - hint = fmt.Sprintf("To dump SSA representation, run:\n%% go build golang.org/x/tools/cmd/ssadump && ./ssadump -test -build=CFP %s\n", input) + hint = fmt.Sprintf("To dump SSA representation, run:\n%% go build golang.org/x/tools/cmd/ssadump && ./ssadump -test -build=CFP %s\n", strings.Join(inputs, " ")) iprog, err := conf.Load() if err != nil { @@ -227,7 +227,7 @@ func run(t *testing.T, dir, input string, success successPredicate) bool { var out bytes.Buffer interp.CapturedOutput = &out - hint = fmt.Sprintf("To trace execution, run:\n%% go build golang.org/x/tools/cmd/ssadump && ./ssadump -build=C -test -run --interp=T %s\n", input) + hint = fmt.Sprintf("To trace execution, run:\n%% go build golang.org/x/tools/cmd/ssadump && ./ssadump -build=C -test -run --interp=T %s\n", strings.Join(inputs, " ")) exitCode := interp.Interpret(mainPkg, 0, &types.StdSizes{WordSize: 8, MaxAlign: 8}, inputs[0], []string{}) // The definition of success varies with each file. diff --git a/go/ssa/interp/testdata/complit.go b/go/ssa/interp/testdata/complit.go index 7bec5231..876c37b2 100644 --- a/go/ssa/interp/testdata/complit.go +++ b/go/ssa/interp/testdata/complit.go @@ -5,7 +5,9 @@ package main import "fmt" // Map literals. -func init() { +// TODO(adonovan): we can no longer print maps +// until the interpreter supports (reflect.Value).MapRange. +func _() { type M map[int]int m1 := []*M{{1: 1}, &M{2: 2}} want := "map[1:1] map[2:2]"