From: Ian Lance Taylor <iant@golang.org>
Date: Fri, 9 Nov 2018 07:54:08 +0000 (-0500)
Subject: tpl: Fix test to pass with gccgo
X-Git-Tag: v0.52~37
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a8cb1b07b;p=brevno-suite%2Fhugo

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
---

diff --git a/tpl/internal/templatefuncRegistry_test.go b/tpl/internal/templatefuncRegistry_test.go
index c2194807..ec7fbeb1 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))
 	}