From 65fc2e083b163e417d6015b5b544022d981f821f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= <asm@redhat.com>
Date: Thu, 25 Jan 2024 08:28:13 +0100
Subject: [PATCH] Modify ports

Some CI systems complain about the usage of the 8888 port.
Improve the way PPC64LE support is enabled.

Resolves: RHEL-22429
---
 delve.spec         | 25 +++++++++++-------
 modify-ports.patch | 64 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 9 deletions(-)
 create mode 100644 modify-ports.patch

diff --git a/delve.spec b/delve.spec
index 7819e7a..dacbe75 100644
--- a/delve.spec
+++ b/delve.spec
@@ -1,6 +1,10 @@
+%ifarch ppc64le
+%global exp "-tags=exp.linuxppc64le"
+%endif
+
 Name:                   delve
 Version:                1.21.2
-Release:                1%{?dist}
+Release:                2%{?dist}
 Summary:                A debugger for the Go programming language
 
 License:                MIT
@@ -15,6 +19,8 @@ BuildRequires:          lsof
 
 Provides:               dlv = %{version}
 
+Patch0001:		modify-ports.patch
+
 
 %description
 Delve is a debugger for the Go programming language. The goal of the project 
@@ -26,6 +32,7 @@ much as possible.
 
 %prep
 %setup -q
+%autopatch -p1
 
 rm -rf go.mod
 mv vendor %{_builddir}/src
@@ -38,11 +45,7 @@ mv %{_builddir}/src %{_builddir}/%{name}-%{version}/_build/src
 %build
 export GO111MODULE=off
 export GOPATH="%{_builddir}/%{name}-%{version}/_build"
-%ifarch ppc64le
-%gobuild '-tags=exp.linuxppc64le' -o bin/dlv github.com/go-delve/delve/cmd/dlv
-%else
-%gobuild -o bin/dlv github.com/go-delve/delve/cmd/dlv
-%endif
+%gobuild %{?exp} -o bin/dlv github.com/go-delve/delve/cmd/dlv
 
 
 %install
@@ -52,12 +55,11 @@ install -Dpm 0755 bin/dlv %{buildroot}%{_bindir}/dlv
 
 
 %check
-# Related: rhbz#1922455
 export GO111MODULE=off
 export GOPATH="%{_builddir}/%{name}-%{version}/_build"
 cd "_build/src/github.com/go-delve/%{name}"
-for d in $(go list ./... | grep -v cmd | grep -v scripts); do
-    go test ${d}
+for d in $(go list %{?exp} ./... | grep -v cmd | grep -v scripts); do
+    go test %{?exp} ${d}
 done
 
 
@@ -69,6 +71,11 @@ done
 
 
 %changelog
+* 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
diff --git a/modify-ports.patch b/modify-ports.patch
new file mode 100644
index 0000000..0939534
--- /dev/null
+++ b/modify-ports.patch
@@ -0,0 +1,64 @@
+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
+