.delve.metadata

@@ -1 +1 @@
-c8f99369a4bbf64032d480c11f416049c583069e SOURCES/delve-1.22.1.tar.gz
+3054aca571728247c66664630b5f601346f96e24 SOURCES/delve-1.20.2.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/delve-1.22.1.tar.gz
+SOURCES/delve-1.20.2.tar.gz

SOURCES/modify-ports.patch

@@ -1,64 +0,0 @@
-From 1ba9183936e11839811cf27472677d44ea4eb1a2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=81lex=20S=C3=A1ez?= <asm@redhat.com>
-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        | 6 ++++++
- pkg/terminal/command_test.go | 2 +-
- 3 files changed, 8 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..ae9f0bd9 100644
---- a/pkg/proc/proc_test.go
-+++ b/pkg/proc/proc_test.go
-@@ -2512,6 +2512,9 @@ func TestStepConcurrentDirect(t *testing.T) {
- }
- 
- func TestStepConcurrentPtr(t *testing.T) {
-+	if runtime.GOARCH == "ppc64le" {
-+		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)
-@@ -6080,6 +6083,9 @@ func TestEscapeCheckUnreadable(t *testing.T) {
- }
- 
- func TestStepShadowConcurrentBreakpoint(t *testing.T) {
-+	if runtime.GOARCH == "ppc64le" {
-+		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
-

SPECS/delve.spec

@@ -1,9 +1,5 @@
-%ifarch ppc64le
-%global exp "-tags=exp.linuxppc64le"
-%endif
-
 Name:                   delve
-Version:                1.22.1
+Version:                1.20.2
 Release:                1%{?dist}
 Summary:                A debugger for the Go programming language
 
@@ -11,7 +7,7 @@ License:                MIT
 URL:                    https://github.com/go-delve/delve
 Source0:                https://github.com/go-delve/delve/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
-ExcludeArch:            s390x %{ix86} armv7hl
+ExcludeArch:            ppc64le s390x aarch64 %{ix86} armv7hl
 
 BuildRequires:          compiler(go-compiler)
 BuildRequires:          git
@@ -19,8 +15,6 @@ BuildRequires:          lsof
 
 Provides:               dlv = %{version}
 
-Patch0001:		modify-ports.patch
-
 
 %description
 Delve is a debugger for the Go programming language. The goal of the project 
@@ -32,7 +26,6 @@ much as possible.
 
 %prep
 %setup -q
-%autopatch -p1
 
 rm -rf go.mod
 mv vendor %{_builddir}/src
@@ -45,7 +38,7 @@ mv %{_builddir}/src %{_builddir}/%{name}-%{version}/_build/src
 %build
 export GO111MODULE=off
 export GOPATH="%{_builddir}/%{name}-%{version}/_build"
-%gobuild %{?exp} -o bin/dlv github.com/go-delve/delve/cmd/dlv
+%gobuild -o bin/dlv github.com/go-delve/delve/cmd/dlv
 
 
 %install
@@ -55,12 +48,13 @@ install -Dpm 0755 bin/dlv %{buildroot}%{_bindir}/dlv
 
 
 %check
-export GO111MODULE=off
+## Related: rhbz#1922455
-export GOPATH="%{_builddir}/%{name}-%{version}/_build"
+# export GO111MODULE=off
-cd "_build/src/github.com/go-delve/%{name}"
+# export GOPATH="%{_builddir}/%{name}-%{version}/_build"
-for d in $(go list %{?exp} ./... | grep -v cmd | grep -v scripts); do
+# cd "_build/src/github.com/go-delve/%{name}"
-    go test %{?exp} ${d}
+# for d in $(go list ./... | grep -v cmd | grep -v scripts); do
-done
+#     go test ${d}
+# done
 
 
 %files
@@ -71,21 +65,6 @@ done
 
 
 %changelog
-* Fri Aug 16 2024 Alejandro Sáez <asm@redhat.com> - 1.22.1-1
-- Rebase to Delve 1.22.1
-- Resolves: RHEL-50840
-
-* Thu Jan 25 2024 Alejandro Sáez <asm@redhat.com> - 1.21.2-2
-- Modify ports: Some CI systems complain about the usage of the 8888 port.
-- Improve the way PPC64LE support is enabled.
-- Resolves: RHEL-22429
-
-* Tue Jan 23 2024 Alejandro Sáez <asm@redhat.com> - 1.21.2-1
-- Rebase to 1.21.2
-- Add support for ppc64le and aarch64
-- Enable the test suite
-- Resolves: RHEL-22429
-
 * Fri May 26 2023 Alejandro Sáez <asm@redhat.com> - 1.20.2-1
 - Rebase to 1.20.2
 - Resolves: rhbz#2186496