]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/link/internal/ld: fix TestArchiveBuildInvokeWithExec
authorCherry Zhang <cherryyz@google.com>
Mon, 4 Nov 2019 21:19:29 +0000 (16:19 -0500)
committerCherry Zhang <cherryyz@google.com>
Mon, 4 Nov 2019 21:38:36 +0000 (21:38 +0000)
TestArchiveBuildInvokeWithExec is failing on darwin due to
duplicated symbols, because the C definition (int fortytwo;) is
copied to two generated cgo sources. In fact, this test is about
building c-archive, but doesn't need to import "C". Removed the
"C" import.

Change-Id: I3a17546e01272a7ae37e6417791ab949fb44597e
Reviewed-on: https://go-review.googlesource.com/c/go/+/205278
Run-TryBot: Cherry Zhang <cherryyz@google.com>
Reviewed-by: Than McIntosh <thanm@google.com>
src/cmd/link/internal/ld/ld_test.go

index 1ffcadece9d9525e791c0e3254aae7272af1a158..4dbe09d58611149f788e17af7de16c88126a4d41 100644 (file)
@@ -76,14 +76,9 @@ func TestUndefinedRelocErrors(t *testing.T) {
 const carchiveSrcText = `
 package main
 
-// int fortytwo;
-import "C"
-
-var v int
-
 //export GoFunc
 func GoFunc() {
-       v = int(C.fortytwo)
+       println(42)
 }
 
 func main() {