diff --git a/.delve.metadata b/.delve.metadata index e30cd18..feb49e0 100644 --- a/.delve.metadata +++ b/.delve.metadata @@ -1 +1 @@ -c8f99369a4bbf64032d480c11f416049c583069e SOURCES/delve-1.22.1.tar.gz +d5ab14fa3057236314ab9e1973773c01425060a1 SOURCES/delve-1.24.1.tar.gz diff --git a/.gitignore b/.gitignore index 8e8ad70..43bffb1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/delve-1.22.1.tar.gz +SOURCES/delve-1.24.1.tar.gz diff --git a/SOURCES/modify-tests.patch b/SOURCES/modify-tests.patch deleted file mode 100644 index 6e4d8ee..0000000 --- a/SOURCES/modify-tests.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 0d8ba2001ceacd67a8861f470399f695cabc8802 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=81lex=20S=C3=A1ez?= -Date: Wed, 24 Jan 2024 13:10:29 +0100 -Subject: [PATCH] Modify tests - -Some tests are not working properly with the build system so we need to -adapt them, like changing the ports they used. ---- - _fixtures/notify-v2.go | 2 +- - pkg/proc/proc_test.go | 3 +++ - pkg/terminal/command_test.go | 2 +- - 3 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/_fixtures/notify-v2.go b/_fixtures/notify-v2.go -index eb80526b..0f562c27 100644 ---- a/_fixtures/notify-v2.go -+++ b/_fixtures/notify-v2.go -@@ -19,5 +19,5 @@ func main() { - }() - }) - -- log.Fatalln(http.ListenAndServe("127.0.0.1:8888", nil)) -+ log.Fatalln(http.ListenAndServe("127.0.0.1:8889", nil)) - } -diff --git a/pkg/proc/proc_test.go b/pkg/proc/proc_test.go -index 714a4d1d..ea1d94a9 100644 ---- a/pkg/proc/proc_test.go -+++ b/pkg/proc/proc_test.go -@@ -2512,6 +2512,7 @@ func TestStepConcurrentDirect(t *testing.T) { - } - - func TestStepConcurrentPtr(t *testing.T) { -+ t.Skipf("Skipping due to CI issues") - protest.AllowRecording(t) - withTestProcess("teststepconcurrent", t, func(p *proc.Target, grp *proc.TargetGroup, fixture protest.Fixture) { - setFileBreakpoint(p, t, fixture.Source, 24) -@@ -5491,6 +5492,7 @@ func TestWatchpointCounts(t *testing.T) { - skipOn(t, "not implemented", "386") - skipOn(t, "see https://github.com/go-delve/delve/issues/2768", "windows") - skipOn(t, "not implemented", "ppc64le") -+ skipOn(t, "fails on CI", "arm64") - protest.AllowRecording(t) - - withTestProcess("databpcountstest", t, func(p *proc.Target, grp *proc.TargetGroup, fixture protest.Fixture) { -@@ -6080,6 +6082,7 @@ func TestEscapeCheckUnreadable(t *testing.T) { - } - - func TestStepShadowConcurrentBreakpoint(t *testing.T) { -+ t.Skipf("Skipping due to CI issues") - // Checks that a StepBreakpoint can not shadow a concurrently hit user breakpoint - withTestProcess("stepshadow", t, func(p *proc.Target, grp *proc.TargetGroup, fixture protest.Fixture) { - break2 := setFunctionBreakpoint(p, t, "main.stacktraceme2") -diff --git a/pkg/terminal/command_test.go b/pkg/terminal/command_test.go -index 57b62105..f6e3a3d9 100644 ---- a/pkg/terminal/command_test.go -+++ b/pkg/terminal/command_test.go -@@ -695,7 +695,7 @@ func TestIssue827(t *testing.T) { - withTestTerminal("notify-v2", t, func(term *FakeTerminal) { - go func() { - time.Sleep(1 * time.Second) -- resp, err := http.Get("http://127.0.0.1:8888/test") -+ resp, err := http.Get("http://127.0.0.1:8889/test") - if err == nil { - resp.Body.Close() - } --- -2.43.0 - diff --git a/SOURCES/skip-coredump-test.patch b/SOURCES/skip-coredump-test.patch new file mode 100644 index 0000000..03f5d36 --- /dev/null +++ b/SOURCES/skip-coredump-test.patch @@ -0,0 +1,78 @@ +From d5fb3bee427202f0d4b1683bf743bfd2adb41757 Mon Sep 17 00:00:00 2001 +From: Derek Parker +Date: Thu, 20 Mar 2025 01:15:19 -0700 +Subject: [PATCH] proc/core: skip tests on ppc64le (#3954) + +These tests have been somewhat silently failing on our CI because the +test ends up being skipped [due to the lack of coredumpctl](https://delve.teamcity.com/buildConfiguration/Delve_linux_ppc64le_1_24/66766?buildTab=tests&focusLine=NaN&name=testcore&suite=github.com%2Fgo-delve%2Fdelve%2Fpkg%2Fproc%2Fcore%3A+&expandedTest=build%3A%28id%3A66766%29%2Cid%3A2000000704&showLog=66766_20670_112.20612.20670&logFilter=debug&logView=flowAware). + +When `coredumpctl` is present, the test [fails +anyways](https://issues.redhat.com/browse/RHEL-83939), so let's just +skip it on ppc64le for now. +--- + pkg/proc/core/core_test.go | 41 +++++++++++++++++++++----------------- + 1 file changed, 23 insertions(+), 18 deletions(-) + +diff --git a/pkg/proc/core/core_test.go b/pkg/proc/core/core_test.go +index dddc1d3e7..52b210b6f 100644 +--- a/pkg/proc/core/core_test.go ++++ b/pkg/proc/core/core_test.go +@@ -249,15 +249,8 @@ func logRegisters(t *testing.T, regs proc.Registers, arch *proc.Arch) { + } + + func TestCore(t *testing.T) { +- if runtime.GOOS != "linux" || runtime.GOARCH == "386" { +- t.Skip("unsupported") +- } +- if runtime.GOOS != "linux" || runtime.GOARCH == "loong64" { +- t.Skip("could not read runtime.sigtrampgo context") +- } +- if runtime.GOOS == "linux" && os.Getenv("CI") == "true" && buildMode == "pie" { +- t.Skip("disabled on linux, Github Actions, with PIE buildmode") +- } ++ mustSupportCore(t) ++ + grp := withCoreFile(t, "panic", "") + p := grp.Selected + +@@ -412,15 +405,8 @@ func TestCoreFpRegisters(t *testing.T) { + } + + func TestCoreWithEmptyString(t *testing.T) { +- if runtime.GOOS != "linux" || runtime.GOARCH == "386" { +- t.Skip("unsupported") +- } +- if runtime.GOOS != "linux" || runtime.GOARCH == "loong64" { +- t.Skip("could not read runtime.sigtrampgo context") +- } +- if runtime.GOOS == "linux" && os.Getenv("CI") == "true" && buildMode == "pie" { +- t.Skip("disabled on linux, Github Actions, with PIE buildmode") +- } ++ mustSupportCore(t) ++ + grp := withCoreFile(t, "coreemptystring", "") + p := grp.Selected + +@@ -536,3 +522,22 @@ func procdump(t *testing.T, exePath string) string { + t.Fatalf("could not find dump file") + return "" + } ++ ++func mustSupportCore(t *testing.T) { ++ t.Helper() ++ ++ if runtime.GOOS != "linux" { ++ t.Skip("test must be run on linux") ++ } ++ ++ switch runtime.GOARCH { ++ case "386", "ppc64le": ++ t.Skip("unsupported") ++ case "loong64": ++ t.Skip("could not read runtime.sigtrampgo context") ++ } ++ ++ if os.Getenv("CI") == "true" && buildMode == "pie" { ++ t.Skip("disabled on linux, Github Actions, with PIE buildmode") ++ } ++} diff --git a/SOURCES/skip-substitute-path-test.patch b/SOURCES/skip-substitute-path-test.patch new file mode 100644 index 0000000..f234e60 --- /dev/null +++ b/SOURCES/skip-substitute-path-test.patch @@ -0,0 +1,42 @@ +From 55486fbab43420d67323cd3e79cda115e7e687c6 Mon Sep 17 00:00:00 2001 +From: Derek Parker +Date: Thu, 20 Mar 2025 01:14:20 -0700 +Subject: [PATCH] service/test: skip substitutepath test when modules disabled + (#3955) + +See: https://issues.redhat.com/browse/RHEL-83958 +--- + pkg/proc/test/support.go | 6 ++++++ + service/test/integration2_test.go | 2 ++ + 2 files changed, 8 insertions(+) + +diff --git a/pkg/proc/test/support.go b/pkg/proc/test/support.go +index d1f25bd49..c8efea360 100644 +--- a/pkg/proc/test/support.go ++++ b/pkg/proc/test/support.go +@@ -392,6 +392,12 @@ func MustHaveCgo(t *testing.T) { + } + } + ++func MustHaveModules(t *testing.T) { ++ if os.Getenv("GO111MODULE") == "off" { ++ t.Skip("skipping test which requires go modules") ++ } ++} ++ + func RegabiSupported() bool { + // Tracks regabiSupported variable in ParseGOEXPERIMENT internal/buildcfg/exp.go + switch { +diff --git a/service/test/integration2_test.go b/service/test/integration2_test.go +index 9ef131a3e..2e3928fb8 100644 +--- a/service/test/integration2_test.go ++++ b/service/test/integration2_test.go +@@ -3157,6 +3157,8 @@ func TestBreakpointVariablesWithoutG(t *testing.T) { + } + + func TestGuessSubstitutePath(t *testing.T) { ++ protest.MustHaveModules(t) ++ + t.Setenv("NOCERT", "1") + ver, _ := goversion.Parse(runtime.Version()) + if ver.IsDevelBuild() && os.Getenv("CI") != "" && runtime.GOOS == "linux" { diff --git a/SPECS/delve.spec b/SPECS/delve.spec index 9b2c37c..11ce26c 100644 --- a/SPECS/delve.spec +++ b/SPECS/delve.spec @@ -3,7 +3,7 @@ %endif Name: delve -Version: 1.22.1 +Version: 1.24.1 Release: 1%{?dist} Summary: A debugger for the Go programming language @@ -18,8 +18,8 @@ BuildRequires: git BuildRequires: lsof Provides: dlv = %{version} - -Patch0001: modify-tests.patch +Patch1: skip-coredump-test.patch +Patch2: skip-substitute-path-test.patch %description @@ -71,6 +71,11 @@ done %changelog +* Fri Mar 14 2025 David Benoit - 1.24.1-1 +- Rebase to 1.24.1 +- Skip unsupported tests +- Resolves: RHEL-83451 + * Fri Aug 16 2024 Alejandro Sáez - 1.22.1-1 - Rebase to 1.22.1 - Resolves: RHEL-54307