Skip to content

Commit 30f119e

Browse files
qmuntalgdams
andauthored
Reenable internal linking test on darwin with cgo (#1947)
* reenable internal linking test on darwin with cgo * rerun --------- Co-authored-by: George Adams <georgeadams1995@gmail.com>
1 parent fec46bf commit 30f119e

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

patches/0003-Implement-crypto-internal-backend.patch

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ desired goexperiments and build tags.
1313
.../compile/internal/logopt/logopt_test.go | 6 +-
1414
src/cmd/compile/script_test.go | 8 +
1515
src/cmd/dist/build.go | 80 +++-
16-
src/cmd/dist/test.go | 43 +-
16+
src/cmd/dist/test.go | 38 +-
1717
src/cmd/go/go_test.go | 11 +
1818
src/cmd/go/internal/cfg/cfg.go | 16 +
1919
src/cmd/go/internal/load/pkg.go | 3 +
@@ -53,7 +53,7 @@ desired goexperiments and build tags.
5353
src/internal/buildcfg/exp.go | 57 +++
5454
src/runtime/runtime_boring.go | 5 +
5555
src/syscall/exec_linux_test.go | 4 +
56-
44 files changed, 2615 insertions(+), 21 deletions(-)
56+
44 files changed, 2610 insertions(+), 21 deletions(-)
5757
create mode 100644 src/cmd/go/systemcrypto_test.go
5858
create mode 100644 src/crypto/internal/backend/backend_test.go
5959
create mode 100644 src/crypto/internal/backend/bbig/big.go
@@ -246,7 +246,7 @@ index e4250e12de8975..917f682fd4bfaf 100644
246246
if debug {
247247
run("", ShowOutput|CheckExit, pathf("%s/compile", tooldir), "-V=full")
248248
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
249-
index f8d19ac34c562f..1314403a56cad0 100644
249+
index 9c9e1b85f0cd76..54274e7fad8de3 100644
250250
--- a/src/cmd/dist/test.go
251251
+++ b/src/cmd/dist/test.go
252252
@@ -156,10 +156,12 @@ func (t *tester) run() {
@@ -350,18 +350,6 @@ index f8d19ac34c562f..1314403a56cad0 100644
350350
// Only start multiple test dir shards on builders,
351351
// where they get distributed to multiple machines.
352352
// See issues 20141 and 31834.
353-
@@ -1194,6 +1214,11 @@ func (t *tester) internalLink() bool {
354-
if goos == "ios" {
355-
return false
356-
}
357-
+ if goos == "darwin" && t.cgoEnabled && (strings.Contains(goexperiment, "systemcrypto") || strings.Contains(goexperiment, "darwincrypto")) {
358-
+ // linkmode=internal isn't supported with system/darwin crypto.
359-
+ // see https://github.com/microsoft/go-crypto-darwin/issues/33
360-
+ return false
361-
+ }
362-
// Internally linking cgo is incomplete on some architectures.
363-
// https://golang.org/issue/10373
364-
// https://golang.org/issue/14449
365353
diff --git a/src/cmd/go/go_test.go b/src/cmd/go/go_test.go
366354
index 1722f1a2c34428..ba7740bf8cd31e 100644
367355
--- a/src/cmd/go/go_test.go

stub

Whitespace-only changes.

0 commit comments

Comments
 (0)