Compare commits

...

No commits in common. "c8-stream-rhel8" and "c8s-stream-rhel8" have entirely different histories.

4 changed files with 7 additions and 107 deletions

View File

@ -1 +1 @@
c8f99369a4bbf64032d480c11f416049c583069e SOURCES/delve-1.22.1.tar.gz f8dc90f3f1b84d2b231b9be7f86ebe3ba365a9f8 SOURCES/delve-1.9.1.tar.gz

2
.gitignore vendored
View File

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

View File

@ -1,68 +0,0 @@
From 0d8ba2001ceacd67a8861f470399f695cabc8802 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 | 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

View File

@ -1,9 +1,5 @@
%ifarch ppc64le
%global exp "-tags=exp.linuxppc64le"
%endif
Name: delve Name: delve
Version: 1.22.1 Version: 1.9.1
Release: 1%{?dist} Release: 1%{?dist}
Summary: A debugger for the Go programming language Summary: A debugger for the Go programming language
@ -11,7 +7,7 @@ License: MIT
URL: https://github.com/go-delve/delve URL: https://github.com/go-delve/delve
Source0: https://github.com/go-delve/delve/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz 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: compiler(go-compiler)
BuildRequires: git BuildRequires: git
@ -19,8 +15,6 @@ BuildRequires: lsof
Provides: dlv = %{version} Provides: dlv = %{version}
Patch0001: modify-tests.patch
%description %description
Delve is a debugger for the Go programming language. The goal of the project Delve is a debugger for the Go programming language. The goal of the project
@ -32,7 +26,6 @@ much as possible.
%prep %prep
%setup -q %setup -q
%autopatch -p1
rm -rf go.mod rm -rf go.mod
mv vendor %{_builddir}/src mv vendor %{_builddir}/src
@ -45,7 +38,7 @@ mv %{_builddir}/src %{_builddir}/%{name}-%{version}/_build/src
%build %build
export GO111MODULE=off export GO111MODULE=off
export GOPATH="%{_builddir}/%{name}-%{version}/_build" 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 %install
@ -58,8 +51,8 @@ install -Dpm 0755 bin/dlv %{buildroot}%{_bindir}/dlv
export GO111MODULE=off export GO111MODULE=off
export GOPATH="%{_builddir}/%{name}-%{version}/_build" export GOPATH="%{_builddir}/%{name}-%{version}/_build"
cd "_build/src/github.com/go-delve/%{name}" cd "_build/src/github.com/go-delve/%{name}"
for d in $(go list %{?exp} ./... | grep -v cmd | grep -v scripts); do for d in $(go list ./... | grep -v cmd | grep -v scripts); do
go test %{?exp} ${d} go test ${d}
done done
@ -71,31 +64,6 @@ done
%changelog %changelog
* Fri Aug 16 2024 Alejandro Sáez <asm@redhat.com> - 1.22.1-1
- Rebase to 1.22.1
- Resolves: RHEL-54307
* Wed Jan 31 2024 Alejandro Sáez <asm@redhat.com> - 1.21.2-3
- Skip an additional test as it's breaking in the CI system.
- Modify the name of the patch.
- Resolves: RHEL-22820
* Fri Jan 26 2024 Alejandro Sáez <asm@redhat.com> - 1.21.2-2
- Fix: Remove architectures from exclude ExcludeArch
- Resolves: RHEL-22820
* Fri Jan 26 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
- Modify ports: Some CI systems complain about the usage of the 8888 port.
- Improve the way PPC64LE support is enabled.
- Resolves: RHEL-22820
* Fri May 26 2023 Alejandro Sáez <asm@redhat.com> - 1.20.2-1
- Rebase to 1.20.2
- Resolves: rhbz#2186495
* Fri Sep 30 2022 Alejandro Sáez <asm@redhat.com> - 1.9.1-1 * Fri Sep 30 2022 Alejandro Sáez <asm@redhat.com> - 1.9.1-1
- Rebase to 1.9.1 - Rebase to 1.9.1
- Related: rhbz#2131026 - Related: rhbz#2131026