Skip to content

Commit f82e333

Browse files
Merge pull request #2405 from microsoft/dev/auto-sync/microsoft/main
Update submodule to latest `master` in `microsoft/main`
2 parents 4d3b085 + 124d04c commit f82e333

2 files changed

Lines changed: 6 additions & 20 deletions

File tree

go

Submodule go updated 60 files

patches/0002-Add-crypto-backends.patch

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ Subject: [PATCH] Add crypto backends
1919
src/cmd/go/internal/help/helpdoc.go | 3 +
2020
src/cmd/go/internal/load/pkg.go | 50 ++-
2121
src/cmd/go/internal/tool/tool.go | 9 +-
22-
.../verylongtest/testdata/script/README | 2 +
2322
src/cmd/go/script_test.go | 3 +
2423
src/cmd/go/systemcrypto_test.go | 284 ++++++++++++++++++
2524
src/cmd/go/testdata/script/README | 2 +
@@ -138,7 +137,7 @@ Subject: [PATCH] Add crypto backends
138137
src/os/exec/exec_test.go | 9 +
139138
src/runtime/runtime_boring.go | 5 +
140139
src/syscall/syscall_windows.go | 3 +
141-
134 files changed, 2525 insertions(+), 378 deletions(-)
140+
133 files changed, 2523 insertions(+), 378 deletions(-)
142141
create mode 100644 src/cmd/go/systemcrypto_test.go
143142
create mode 100644 src/crypto/dsa/boring.go
144143
create mode 100644 src/crypto/dsa/notboring.go
@@ -734,24 +733,11 @@ index 97c27c8caa44d6..bb18bb112a314a 100644
734733
}
735734

736735
buildAndRunTool(ld, ctx, tool, args, runFunc)
737-
diff --git a/src/cmd/go/internal/verylongtest/testdata/script/README b/src/cmd/go/internal/verylongtest/testdata/script/README
738-
index 9ec997a138f0f2..09c4e7955ec162 100644
739-
--- a/src/cmd/go/internal/verylongtest/testdata/script/README
740-
+++ b/src/cmd/go/internal/verylongtest/testdata/script/README
741-
@@ -281,6 +281,8 @@ The available conditions are:
742-
testing.Short()
743-
[symlink]
744-
testenv.HasSymlink()
745-
+[systemcrypto]
746-
+ system crypto is enabled
747-
[verbose]
748-
testing.Verbose()
749-
750736
diff --git a/src/cmd/go/script_test.go b/src/cmd/go/script_test.go
751-
index 088b9a8b5fdb2e..4e1e545367afef 100644
737+
index 6033ec420b8452..a8374234a3f0a5 100644
752738
--- a/src/cmd/go/script_test.go
753739
+++ b/src/cmd/go/script_test.go
754-
@@ -299,6 +299,9 @@ var extraEnvKeys = []string{
740+
@@ -300,6 +300,9 @@ var extraEnvKeys = []string{
755741
"GO_TESTING_GOTOOLS", // for gccgo testing
756742
"GCCGO", // for gccgo testing
757743
"GCCGOTOOLDIR", // for gccgo testing
@@ -1052,10 +1038,10 @@ index 00000000000000..8e7f07fe1f758c
10521038
+ }
10531039
+}
10541040
diff --git a/src/cmd/go/testdata/script/README b/src/cmd/go/testdata/script/README
1055-
index 9fa2c92c0b32b2..c0dd9e533e8e48 100644
1041+
index 71052159b6e4f5..6e05ef51f89c17 100644
10561042
--- a/src/cmd/go/testdata/script/README
10571043
+++ b/src/cmd/go/testdata/script/README
1058-
@@ -421,6 +421,8 @@ The available conditions are:
1044+
@@ -419,6 +419,8 @@ The available conditions are:
10591045
testing.Short()
10601046
[symlink]
10611047
testenv.HasSymlink()

0 commit comments

Comments
 (0)