From a8cb1b07b4cf7fcf0e949657cb03c1a4838f975e Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 9 Nov 2018 02:54:08 -0500 Subject: [PATCH] tpl: Fix test to pass with gccgo When run under gccgo, the test looks for the name that gccgo gives to a thunk method. This name is not normally visible, but can be seen when using reflect.FuncForPC as this code does. That name changed in https://golang.org/cl/89555. Change the test to work with both the old name "$thunk0" and the new name "thunk0". Fixes golang/go#28669 --- tpl/internal/templatefuncRegistry_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tpl/internal/templatefuncRegistry_test.go b/tpl/internal/templatefuncRegistry_test.go index c21948077..ec7fbeb1a 100644 --- a/tpl/internal/templatefuncRegistry_test.go +++ b/tpl/internal/templatefuncRegistry_test.go @@ -31,7 +31,7 @@ func TestMethodToName(t *testing.T) { test := &Test{} if runtime.Compiler == "gccgo" { - require.Equal(t, "$thunk0", methodToName(test.MyTestMethod)) + require.Contains(t, methodToName(test.MyTestMethod), "thunk") } else { require.Equal(t, "MyTestMethod", methodToName(test.MyTestMethod)) }