From 9c637082a6dc076731f5a20b259dad39cbd9c94a Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Tue, 16 Apr 2024 21:27:44 +0200
Subject: Merging debian version 1.22.2-2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 ...p-flaky-TestCrashDumpsAllThreads-on-s390x.patch | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 25 insertions(+)
 create mode 100644 debian/patches/0002-Skip-flaky-TestCrashDumpsAllThreads-on-s390x.patch

(limited to 'debian/patches')

diff --git a/debian/patches/0002-Skip-flaky-TestCrashDumpsAllThreads-on-s390x.patch b/debian/patches/0002-Skip-flaky-TestCrashDumpsAllThreads-on-s390x.patch
new file mode 100644
index 0000000..e94963f
--- /dev/null
+++ b/debian/patches/0002-Skip-flaky-TestCrashDumpsAllThreads-on-s390x.patch
@@ -0,0 +1,24 @@
+From: Shengjing Zhu <zhsj@debian.org>
+Date: Tue, 16 Apr 2024 16:04:03 +0800
+Subject: Skip flaky TestCrashDumpsAllThreads on s390x
+
+Bug: https://github.com/golang/go/issues/64650
+---
+ src/runtime/crash_unix_test.go | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/runtime/crash_unix_test.go b/src/runtime/crash_unix_test.go
+index 20a7ca6..23cc273 100644
+--- a/src/runtime/crash_unix_test.go
++++ b/src/runtime/crash_unix_test.go
+@@ -63,6 +63,10 @@ func TestCrashDumpsAllThreads(t *testing.T) {
+ 		t.Skipf("skipping; flaky on %s", runtime.GOARCH)
+ 	}
+ 
++	if runtime.GOARCH == "s390x" {
++		t.Skipf("skipping; flaky on %s", runtime.GOARCH)
++	}
++
+ 	switch runtime.GOOS {
+ 	case "darwin", "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "illumos", "solaris":
+ 	default:
diff --git a/debian/patches/series b/debian/patches/series
index 4764021..a2455da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Skip-flaky-TestCrashDumpsAllThreads-on-mips64le.patch
+0002-Skip-flaky-TestCrashDumpsAllThreads-on-s390x.patch
-- 
cgit v1.2.3