Compare commits

...

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

2 changed files with 48 additions and 42 deletions

View File

@ -1,4 +1,4 @@
From 0d8ba2001ceacd67a8861f470399f695cabc8802 Mon Sep 17 00:00:00 2001 From 1ba9183936e11839811cf27472677d44ea4eb1a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lex=20S=C3=A1ez?= <asm@redhat.com> From: =?UTF-8?q?=C3=81lex=20S=C3=A1ez?= <asm@redhat.com>
Date: Wed, 24 Jan 2024 13:10:29 +0100 Date: Wed, 24 Jan 2024 13:10:29 +0100
Subject: [PATCH] Modify tests Subject: [PATCH] Modify tests
@ -7,9 +7,9 @@ Some tests are not working properly with the build system so we need to
adapt them, like changing the ports they used. adapt them, like changing the ports they used.
--- ---
_fixtures/notify-v2.go | 2 +- _fixtures/notify-v2.go | 2 +-
pkg/proc/proc_test.go | 3 +++ pkg/proc/proc_test.go | 6 ++++++
pkg/terminal/command_test.go | 2 +- pkg/terminal/command_test.go | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-) 3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/_fixtures/notify-v2.go b/_fixtures/notify-v2.go diff --git a/_fixtures/notify-v2.go b/_fixtures/notify-v2.go
index eb80526b..0f562c27 100644 index eb80526b..0f562c27 100644
@ -23,30 +23,26 @@ index eb80526b..0f562c27 100644
+ log.Fatalln(http.ListenAndServe("127.0.0.1:8889", 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 diff --git a/pkg/proc/proc_test.go b/pkg/proc/proc_test.go
index 714a4d1d..ea1d94a9 100644 index 714a4d1d..ae9f0bd9 100644
--- a/pkg/proc/proc_test.go --- a/pkg/proc/proc_test.go
+++ b/pkg/proc/proc_test.go +++ b/pkg/proc/proc_test.go
@@ -2512,6 +2512,7 @@ func TestStepConcurrentDirect(t *testing.T) { @@ -2512,6 +2512,9 @@ func TestStepConcurrentDirect(t *testing.T) {
} }
func TestStepConcurrentPtr(t *testing.T) { func TestStepConcurrentPtr(t *testing.T) {
+ if runtime.GOARCH == "ppc64le" {
+ t.Skipf("Skipping due to CI issues") + t.Skipf("Skipping due to CI issues")
+ }
protest.AllowRecording(t) protest.AllowRecording(t)
withTestProcess("teststepconcurrent", t, func(p *proc.Target, grp *proc.TargetGroup, fixture protest.Fixture) { withTestProcess("teststepconcurrent", t, func(p *proc.Target, grp *proc.TargetGroup, fixture protest.Fixture) {
setFileBreakpoint(p, t, fixture.Source, 24) setFileBreakpoint(p, t, fixture.Source, 24)
@@ -5491,6 +5492,7 @@ func TestWatchpointCounts(t *testing.T) { @@ -6080,6 +6083,9 @@ func TestEscapeCheckUnreadable(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) { func TestStepShadowConcurrentBreakpoint(t *testing.T) {
+ if runtime.GOARCH == "ppc64le" {
+ t.Skipf("Skipping due to CI issues") + t.Skipf("Skipping due to CI issues")
+ }
// Checks that a StepBreakpoint can not shadow a concurrently hit user breakpoint // 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) { withTestProcess("stepshadow", t, func(p *proc.Target, grp *proc.TargetGroup, fixture protest.Fixture) {
break2 := setFunctionBreakpoint(p, t, "main.stacktraceme2") break2 := setFunctionBreakpoint(p, t, "main.stacktraceme2")

View File

@ -19,7 +19,7 @@ BuildRequires: lsof
Provides: dlv = %{version} Provides: dlv = %{version}
Patch0001: modify-tests.patch Patch0001: modify-ports.patch
%description %description
@ -72,51 +72,61 @@ done
%changelog %changelog
* Fri Aug 16 2024 Alejandro Sáez <asm@redhat.com> - 1.22.1-1 * Fri Aug 16 2024 Alejandro Sáez <asm@redhat.com> - 1.22.1-1
- Rebase to 1.22.1 - Rebase to Delve 1.22.1
- Resolves: RHEL-54307 - Resolves: RHEL-50840
* Wed Jan 31 2024 Alejandro Sáez <asm@redhat.com> - 1.21.2-3 * Thu Jan 25 2024 Alejandro Sáez <asm@redhat.com> - 1.21.2-2
- Skip an additional test as it's breaking in the CI system. - Modify ports: Some CI systems complain about the usage of the 8888 port.
- Modify the name of the patch. - Improve the way PPC64LE support is enabled.
- Resolves: RHEL-22820 - Resolves: RHEL-22429
* Fri Jan 26 2024 Alejandro Sáez <asm@redhat.com> - 1.21.2-2 * Tue Jan 23 2024 Alejandro Sáez <asm@redhat.com> - 1.21.2-1
- 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 - Rebase to 1.21.2
- Add support for ppc64le and aarch64 - Add support for ppc64le and aarch64
- Enable the test suite - Enable the test suite
- Modify ports: Some CI systems complain about the usage of the 8888 port. - Resolves: RHEL-22429
- Improve the way PPC64LE support is enabled.
- Resolves: RHEL-22820
* Fri May 26 2023 Alejandro Sáez <asm@redhat.com> - 1.20.2-1 * Fri May 26 2023 Alejandro Sáez <asm@redhat.com> - 1.20.2-1
- Rebase to 1.20.2 - Rebase to 1.20.2
- Resolves: rhbz#2186495 - Resolves: rhbz#2186496
* 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#2131028
* Wed Apr 27 2022 Alejandro Sáez <asm@redhat.com> - 1.8.3-1 * Fri Jul 15 2022 Alejandro Sáez <asm@redhat.com> - 1.8.3-1
- Rebase to 1.8.3 - Rebase to 1.8.3
- Resolves: rhbz#2077956 - Related: rhbz#2098063
- Resolves: rhbz#2076501
* Thu Oct 14 2021 Alejandro Sáez <asm@redhat.com> - 1.7.2-1 * Wed Dec 22 2021 Alejandro Sáez <asm@redhat.com> - 1.7.3-1
- Rebase to 1.7.3
- Related: rhbz#2031116
* Fri Nov 05 2021 Alejandro Sáez <asm@redhat.com> - 1.7.2-1
- Rebase to 1.7.2 - Rebase to 1.7.2
- Related: rhbz#2014088 - 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
* Wed Mar 17 2021 Alejandro Sáez <asm@redhat.com> - 1.6.0-1 * Wed Mar 17 2021 Alejandro Sáez <asm@redhat.com> - 1.6.0-1
- Rebase to 1.6.0 - Rebase to 1.6.0
- Resolves: rhbz#1938071
- Removes golang-1.15.4-TestStepIntoWrapperForEmbeddedPointer.patch - Removes golang-1.15.4-TestStepIntoWrapperForEmbeddedPointer.patch
* Tue Nov 24 2020 David Benoit <dbenoit@redhat.com> - 1.5.0-2 * Mon Nov 16 2020 David Benoit <dbenoit@redhat.com> - 1.5.0-2
- Add golang-1.15.4 related patch - Resolves: rhbz#1898257
- Resolves: rhbz#1901189
* Wed Sep 09 2020 Alejandro Sáez <asm@redhat.com> - 1.5.0-1 * Wed Sep 09 2020 Alejandro Sáez <asm@redhat.com> - 1.5.0-1
- Rebase to 1.5.0 - Rebase to 1.5.0