Skip to content

Commit d8d9bdd

Browse files
committed
skip TestIssue71943
1 parent 130e931 commit d8d9bdd

File tree

1 file changed

+29
-6
lines changed

1 file changed

+29
-6
lines changed

patches/0004-Use-crypto-backends.patch

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Subject: [PATCH] Use crypto backends
55

66
---
77
src/cmd/api/boring_test.go | 2 +-
8+
.../compile/internal/test/issue71943_test.go | 4 +
89
src/cmd/dist/build.go | 13 ++
910
src/cmd/dist/test.go | 10 +-
1011
src/cmd/go/go_boring_test.go | 11 +-
@@ -89,7 +90,7 @@ Subject: [PATCH] Use crypto backends
8990
src/net/lookup_test.go | 3 +
9091
src/os/exec/exec_test.go | 9 +
9192
src/runtime/pprof/vminfo_darwin_test.go | 6 +
92-
85 files changed, 1095 insertions(+), 89 deletions(-)
93+
86 files changed, 1099 insertions(+), 89 deletions(-)
9394
create mode 100644 src/crypto/dsa/boring.go
9495
create mode 100644 src/crypto/dsa/notboring.go
9596
create mode 100644 src/crypto/ecdsa/badlinkname.go
@@ -114,6 +115,28 @@ index f0e3575637c62a..9eab3b4e66e60b 100644
114115

115116
package main
116117

118+
diff --git a/src/cmd/compile/internal/test/issue71943_test.go b/src/cmd/compile/internal/test/issue71943_test.go
119+
index a92b0a1e2b038d..c7720720f0092f 100644
120+
--- a/src/cmd/compile/internal/test/issue71943_test.go
121+
+++ b/src/cmd/compile/internal/test/issue71943_test.go
122+
@@ -6,6 +6,7 @@ package test
123+
124+
import (
125+
"crypto/sha256"
126+
+ "internal/goexperiment"
127+
"internal/testenv"
128+
"runtime"
129+
"testing"
130+
@@ -17,6 +18,9 @@ func Verify(token, salt string) [32]byte {
131+
132+
func TestIssue71943(t *testing.T) {
133+
testenv.SkipIfOptimizationOff(t)
134+
+ if goexperiment.OpenSSLCrypto || goexperiment.DarwinCrypto {
135+
+ t.Skip("skipping test in OpenSSL or Darwin crypto, see https://github.com/microsoft/go/issues/1629")
136+
+ }
137+
if n := testing.AllocsPerRun(10, func() {
138+
runtime.KeepAlive(Verify("teststring", "test"))
139+
}); n > 0 {
117140
diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go
118141
index 4fcc508f8ed48e..eb5ef7df6eaca1 100644
119142
--- a/src/cmd/dist/build.go
@@ -276,10 +299,10 @@ index b2d4ad7cb0e7f6..2859879041ff8f 100644
276299
*mode = BuildModePIE
277300
default:
278301
diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go
279-
index b114ca2a3d4115..0be0f3d218b09b 100644
302+
index 7f22b6ba1c5bf0..c78af6f054293f 100644
280303
--- a/src/cmd/link/internal/ld/lib.go
281304
+++ b/src/cmd/link/internal/ld/lib.go
282-
@@ -1172,6 +1172,7 @@ var hostobj []Hostobj
305+
@@ -1176,6 +1176,7 @@ var hostobj []Hostobj
283306
// These packages can use internal linking mode.
284307
// Others trigger external mode.
285308
var internalpkg = []string{
@@ -288,7 +311,7 @@ index b114ca2a3d4115..0be0f3d218b09b 100644
288311
"crypto/internal/boring/syso",
289312
"crypto/x509",
290313
diff --git a/src/cmd/link/internal/ld/main.go b/src/cmd/link/internal/ld/main.go
291-
index 377dcd6c856fa6..1744ff2ca38973 100644
314+
index 6a684890be0a03..1dcc126b7a0440 100644
292315
--- a/src/cmd/link/internal/ld/main.go
293316
+++ b/src/cmd/link/internal/ld/main.go
294317
@@ -44,6 +44,7 @@ import (
@@ -299,7 +322,7 @@ index 377dcd6c856fa6..1744ff2ca38973 100644
299322
"strconv"
300323
"strings"
301324
)
302-
@@ -186,7 +187,16 @@ func Main(arch *sys.Arch, theArch Arch) {
325+
@@ -187,7 +188,16 @@ func Main(arch *sys.Arch, theArch Arch) {
303326

304327
buildVersion := buildcfg.Version
305328
if goexperiment := buildcfg.Experiment.String(); goexperiment != "" {
@@ -2698,7 +2721,7 @@ index e7369542a73270..ff52175e4ac636 100644
26982721
}
26992722
}
27002723
diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
2701-
index 70f0713b6359f8..01609e5e6a9d62 100644
2724+
index 9881eab7c523a2..3c7724689d734f 100644
27022725
--- a/src/go/build/deps_test.go
27032726
+++ b/src/go/build/deps_test.go
27042727
@@ -520,7 +520,7 @@ var depsRules = `

0 commit comments

Comments
 (0)