Compare commits

...

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

5 changed files with 7 additions and 164 deletions

View File

@ -1 +1 @@
d5ab14fa3057236314ab9e1973773c01425060a1 SOURCES/delve-1.24.1.tar.gz
f8dc90f3f1b84d2b231b9be7f86ebe3ba365a9f8 SOURCES/delve-1.9.1.tar.gz

2
.gitignore vendored
View File

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

View File

@ -1,78 +0,0 @@
From d5fb3bee427202f0d4b1683bf743bfd2adb41757 Mon Sep 17 00:00:00 2001
From: Derek Parker <parkerderek86@gmail.com>
Date: Thu, 20 Mar 2025 01:15:19 -0700
Subject: [PATCH] proc/core: skip tests on ppc64le (#3954)
These tests have been somewhat silently failing on our CI because the
test ends up being skipped [due to the lack of coredumpctl](https://delve.teamcity.com/buildConfiguration/Delve_linux_ppc64le_1_24/66766?buildTab=tests&focusLine=NaN&name=testcore&suite=github.com%2Fgo-delve%2Fdelve%2Fpkg%2Fproc%2Fcore%3A+&expandedTest=build%3A%28id%3A66766%29%2Cid%3A2000000704&showLog=66766_20670_112.20612.20670&logFilter=debug&logView=flowAware).
When `coredumpctl` is present, the test [fails
anyways](https://issues.redhat.com/browse/RHEL-83939), so let's just
skip it on ppc64le for now.
---
pkg/proc/core/core_test.go | 41 +++++++++++++++++++++-----------------
1 file changed, 23 insertions(+), 18 deletions(-)
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")
+ }
+}

View File

@ -1,42 +0,0 @@
From 55486fbab43420d67323cd3e79cda115e7e687c6 Mon Sep 17 00:00:00 2001
From: Derek Parker <parkerderek86@gmail.com>
Date: Thu, 20 Mar 2025 01:14:20 -0700
Subject: [PATCH] service/test: skip substitutepath test when modules disabled
(#3955)
See: https://issues.redhat.com/browse/RHEL-83958
---
pkg/proc/test/support.go | 6 ++++++
service/test/integration2_test.go | 2 ++
2 files changed, 8 insertions(+)
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" {

View File

@ -1,9 +1,5 @@
%ifarch ppc64le
%global exp "-tags=exp.linuxppc64le"
%endif
Name: delve
Version: 1.24.1
Version: 1.9.1
Release: 1%{?dist}
Summary: A debugger for the Go programming language
@ -11,15 +7,13 @@ 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
BuildRequires: lsof
Provides: dlv = %{version}
Patch1: skip-coredump-test.patch
Patch2: skip-substitute-path-test.patch
%description
@ -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
@ -58,8 +51,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}
for d in $(go list ./... | grep -v cmd | grep -v scripts); do
go test ${d}
done
@ -71,36 +64,6 @@ done
%changelog
* Fri Mar 14 2025 David Benoit <dbenoit@redhat.com> - 1.24.1-1
- Rebase to 1.24.1
- Skip unsupported tests
- Resolves: RHEL-83451
* 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
- Rebase to 1.9.1
- Related: rhbz#2131026