From 4ee2093ecf6df6ddfb9a47d4bf039e6c12c3aefb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Wed, 31 Jan 2024 12:56:34 +0100 Subject: [PATCH] Skip additional tests. Modify the name of the patch. Resolves: RHEL-22820 --- delve.spec | 9 ++++++-- modify-ports.patch => modify-tests.patch | 28 ++++++++++++++---------- 2 files changed, 23 insertions(+), 14 deletions(-) rename modify-ports.patch => modify-tests.patch (69%) diff --git a/delve.spec b/delve.spec index 132a11b..b4118fe 100644 --- a/delve.spec +++ b/delve.spec @@ -4,7 +4,7 @@ Name: delve Version: 1.21.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A debugger for the Go programming language License: MIT @@ -19,7 +19,7 @@ BuildRequires: lsof Provides: dlv = %{version} -Patch0001: modify-ports.patch +Patch0001: modify-tests.patch %description @@ -71,6 +71,11 @@ done %changelog +* Wed Jan 31 2024 Alejandro Sáez - 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 - 1.21.2-2 - Fix: Remove architectures from exclude ExcludeArch - Resolves: RHEL-22820 diff --git a/modify-ports.patch b/modify-tests.patch similarity index 69% rename from modify-ports.patch rename to modify-tests.patch index 0939534..6e4d8ee 100644 --- a/modify-ports.patch +++ b/modify-tests.patch @@ -1,4 +1,4 @@ -From 1ba9183936e11839811cf27472677d44ea4eb1a2 Mon Sep 17 00:00:00 2001 +From 0d8ba2001ceacd67a8861f470399f695cabc8802 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20S=C3=A1ez?= Date: Wed, 24 Jan 2024 13:10:29 +0100 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. --- _fixtures/notify-v2.go | 2 +- - pkg/proc/proc_test.go | 6 ++++++ + pkg/proc/proc_test.go | 3 +++ pkg/terminal/command_test.go | 2 +- - 3 files changed, 8 insertions(+), 2 deletions(-) + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/_fixtures/notify-v2.go b/_fixtures/notify-v2.go index eb80526b..0f562c27 100644 @@ -23,26 +23,30 @@ index eb80526b..0f562c27 100644 + 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 +index 714a4d1d..ea1d94a9 100644 --- a/pkg/proc/proc_test.go +++ b/pkg/proc/proc_test.go -@@ -2512,6 +2512,9 @@ func TestStepConcurrentDirect(t *testing.T) { +@@ -2512,6 +2512,7 @@ func TestStepConcurrentDirect(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) 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) { +@@ -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) { -+ 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 withTestProcess("stepshadow", t, func(p *proc.Target, grp *proc.TargetGroup, fixture protest.Fixture) { break2 := setFunctionBreakpoint(p, t, "main.stacktraceme2")