Skip to content

Commit

Permalink
Merge pull request #1057 from microsoft/dev/auto-sync/microsoft/relea…
Browse files Browse the repository at this point in the history
…se-branch.go1.21

Update submodule to latest `release-branch.go1.21` in `microsoft/release-branch.go1.21`
  • Loading branch information
microsoft-golang-review-bot authored Oct 6, 2023
2 parents a8380d9 + 69e0806 commit 2b4c2f3
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 2 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
go1.21.1
go1.21.2
68 changes: 68 additions & 0 deletions patches/0009-Skip-failing-tests-on-Windows.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Thu, 5 Oct 2023 16:06:31 -0700
Subject: [PATCH] Skip failing tests on Windows

---
src/cmd/cgo/internal/test/test.go | 3 +++
src/runtime/runtime-gdb_test.go | 12 ++++++++++++
2 files changed, 15 insertions(+)

diff --git a/src/cmd/cgo/internal/test/test.go b/src/cmd/cgo/internal/test/test.go
index 7da5a856b307a0..1f045ca6f801a4 100644
--- a/src/cmd/cgo/internal/test/test.go
+++ b/src/cmd/cgo/internal/test/test.go
@@ -1067,6 +1067,9 @@ func testErrno(t *testing.T) {
}

func testMultipleAssign(t *testing.T) {
+ if runtime.GOOS == "windows" {
+ t.Skip("failing starting with 1.21.2: https://github.com/microsoft/go/issues/1059")
+ }
p := C.CString("234")
n, m := C.strtol(p, nil, 345), C.strtol(p, nil, 10)
if runtime.GOOS == "openbsd" {
diff --git a/src/runtime/runtime-gdb_test.go b/src/runtime/runtime-gdb_test.go
index 8c759bf4066370..5249f87154245f 100644
--- a/src/runtime/runtime-gdb_test.go
+++ b/src/runtime/runtime-gdb_test.go
@@ -168,6 +168,9 @@ func TestGdbPythonCgo(t *testing.T) {
}

func testGdbPython(t *testing.T, cgo bool) {
+ if runtime.GOOS == "windows" {
+ t.Skip("may encounter unexpected line endings")
+ }
if cgo {
testenv.MustHaveCGO(t)
}
@@ -399,6 +402,9 @@ func main() {
// TestGdbBacktrace tests that gdb can unwind the stack correctly
// using only the DWARF debug info.
func TestGdbBacktrace(t *testing.T) {
+ if runtime.GOOS == "windows" {
+ t.Skip("may encounter unexpected line endings")
+ }
if runtime.GOOS == "netbsd" {
testenv.SkipFlaky(t, 15603)
}
@@ -525,6 +531,9 @@ func main() {
// TestGdbAutotmpTypes ensures that types of autotmp variables appear in .debug_info
// See bug #17830.
func TestGdbAutotmpTypes(t *testing.T) {
+ if runtime.GOOS == "windows" {
+ t.Skip("may encounter unexpected line endings")
+ }
checkGdbEnvironment(t)
t.Parallel()
checkGdbVersion(t)
@@ -598,6 +607,9 @@ func main() {
`

func TestGdbConst(t *testing.T) {
+ if runtime.GOOS == "windows" {
+ t.Skip("may encounter unexpected line endings")
+ }
checkGdbEnvironment(t)
t.Parallel()
checkGdbVersion(t)

0 comments on commit 2b4c2f3

Please sign in to comment.