diff --git a/.delve.metadata b/.delve.metadata index feb49e0..e646bc8 100644 --- a/.delve.metadata +++ b/.delve.metadata @@ -1 +1 @@ -d5ab14fa3057236314ab9e1973773c01425060a1 SOURCES/delve-1.24.1.tar.gz +2aa9f5e108d2d0f6f00a70c7ea50c6b7142393af SOURCES/delve-1.25.2.tar.gz diff --git a/.gitignore b/.gitignore index 43bffb1..7cde7f7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/delve-1.24.1.tar.gz +SOURCES/delve-1.25.2.tar.gz diff --git a/SOURCES/fix-rhel-83939.patch b/SOURCES/fix-rhel-83939.patch deleted file mode 100644 index b42e401..0000000 --- a/SOURCES/fix-rhel-83939.patch +++ /dev/null @@ -1,63 +0,0 @@ -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/fix-rhel-83958.patch b/SOURCES/fix-rhel-83958.patch deleted file mode 100644 index 18665a0..0000000 --- a/SOURCES/fix-rhel-83958.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 f9847be..fb4ce9f 100644 --- a/SPECS/delve.spec +++ b/SPECS/delve.spec @@ -3,8 +3,8 @@ %endif Name: delve -Version: 1.24.1 -Release: 3%{?dist} +Version: 1.25.2 +Release: 1%{?dist} Summary: A debugger for the Go programming language License: MIT @@ -21,16 +21,11 @@ Provides: dlv = %{version} Patch0001: modify-ports.patch -# TODO: remove these once version 1.24.2 is released. -Patch0002: fix-rhel-83939.patch -Patch0003: fix-rhel-83958.patch - - %description -Delve is a debugger for the Go programming language. The goal of the project -is to provide a simple, full featured debugging tool for Go. Delve should be -easy to invoke and easy to use. Chances are if you're using a debugger, things -aren't going your way. With that in mind, Delve should stay out of your way as +Delve is a debugger for the Go programming language. The goal of the project +is to provide a simple, full featured debugging tool for Go. Delve should be +easy to invoke and easy to use. Chances are if you're using a debugger, things +aren't going your way. With that in mind, Delve should stay out of your way as much as possible. @@ -62,8 +57,8 @@ install -Dpm 0755 bin/dlv %{buildroot}%{_bindir}/dlv export GO111MODULE=off export GOPATH="%{_builddir}/%{name}-%{version}/_build" cd "_build/src/github.com/go-delve/%{name}" -for d in $(go list %{?exp} ./... | grep -v cmd | grep -v scripts); do - go test %{?exp} ${d} -skip 'TestGuessSubstitutePath' +for d in $(go list %{?exp} ./... | grep -v cmd | grep -v scripts | grep -v service/dap); do + go test %{?exp} ${d} -skip TestGuessSubstitutePath done @@ -75,6 +70,10 @@ done %changelog +* Thu Aug 28 2025 Alejandro Sáez - 1.25.2-1 +- Update to Delve 1.25.2 +- Resolves: RHEL-111801 + * Thu Mar 20 2025 Derek Parker - 1.24.1-2 - Fix 3 test failures - Resolves: RHEL-83939