Compare commits

...

No commits in common. 'c9' and 'c8-stream-rhel8' have entirely different histories.

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

2
.gitignore vendored

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

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

@ -1,5 +1,9 @@
%ifarch ppc64le
%global exp "-tags=exp.linuxppc64le"
%endif
Name: delve
Version: 1.20.2
Version: 1.22.1
Release: 1%{?dist}
Summary: A debugger for the Go programming language
@ -7,7 +11,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: ppc64le s390x aarch64 %{ix86} armv7hl
ExcludeArch: s390x %{ix86} armv7hl
BuildRequires: compiler(go-compiler)
BuildRequires: git
@ -15,6 +19,8 @@ BuildRequires: lsof
Provides: dlv = %{version}
Patch0001: modify-tests.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,7 +45,7 @@ mv %{_builddir}/src %{_builddir}/%{name}-%{version}/_build/src
%build
export GO111MODULE=off
export GOPATH="%{_builddir}/%{name}-%{version}/_build"
%gobuild -o bin/dlv github.com/go-delve/delve/cmd/dlv
%gobuild %{?exp} -o bin/dlv github.com/go-delve/delve/cmd/dlv
%install
@ -48,13 +55,12 @@ 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}
# done
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}
done
%files
@ -65,47 +71,52 @@ install -Dpm 0755 bin/dlv %{buildroot}%{_bindir}/dlv
%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#2186496
- Resolves: rhbz#2186495
* Fri Sep 30 2022 Alejandro Sáez <asm@redhat.com> - 1.9.1-1
- Rebase to 1.9.1
- Related: rhbz#2131028
- Related: rhbz#2131026
* Fri Jul 15 2022 Alejandro Sáez <asm@redhat.com> - 1.8.3-1
* Wed Apr 27 2022 Alejandro Sáez <asm@redhat.com> - 1.8.3-1
- Rebase to 1.8.3
- Related: rhbz#2098063
* Wed Dec 22 2021 Alejandro Sáez <asm@redhat.com> - 1.7.3-1
- Rebase to 1.7.3
- Related: rhbz#2031116
- Resolves: rhbz#2077956
- Resolves: rhbz#2076501
* Fri Nov 05 2021 Alejandro Sáez <asm@redhat.com> - 1.7.2-1
* Thu Oct 14 2021 Alejandro Sáez <asm@redhat.com> - 1.7.2-1
- Rebase to 1.7.2
- Related: rhbz#2014087
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.0-5
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.0-4
- Rebuilt for RHEL 9 BETA for openssl 3.0
Related: rhbz#1971065
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.0-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Mar 30 2021 Alejandro Sáez <asm@redhat.com> - 1.6.0-2
- Rebase to 1.6.0
- Resolves: rhbz#1922455
- Related: rhbz#2014088
* Wed Mar 17 2021 Alejandro Sáez <asm@redhat.com> - 1.6.0-1
- Rebase to 1.6.0
- Resolves: rhbz#1938071
- Removes golang-1.15.4-TestStepIntoWrapperForEmbeddedPointer.patch
* Mon Nov 16 2020 David Benoit <dbenoit@redhat.com> - 1.5.0-2
- Resolves: rhbz#1898257
* Tue Nov 24 2020 David Benoit <dbenoit@redhat.com> - 1.5.0-2
- Add golang-1.15.4 related patch
- Resolves: rhbz#1901189
* Wed Sep 09 2020 Alejandro Sáez <asm@redhat.com> - 1.5.0-1
- Rebase to 1.5.0

Loading…
Cancel
Save