*: Update gore dep for 1.22 (#3611)

go-delve · Dec 27, 2023 · 050a108 · 050a108
1 parent ba403e3
commit 050a108
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 15 deletions.
diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/cosiner/argv v0.1.0
 	github.com/creack/pty v1.1.20
 	github.com/derekparker/trie v0.0.0-20230829180723-39f4de51ef7d
-	github.com/go-delve/gore v0.11.5
+	github.com/go-delve/gore v0.11.6
 	github.com/go-delve/liner v1.2.3-0.20220127212407-d32d89dd2a5d
 	github.com/google/go-dap v0.11.0
 	github.com/hashicorp/golang-lru v1.0.2

diff --git a/go.sum b/go.sum
@@ -13,8 +13,8 @@ github.com/derekparker/trie v0.0.0-20230829180723-39f4de51ef7d h1:hUWoLdw5kvo2xC
 github.com/derekparker/trie v0.0.0-20230829180723-39f4de51ef7d/go.mod h1:C7Es+DLenIpPc9J6IYw4jrK0h7S9bKj4DNl8+KxGEXU=
 github.com/frankban/quicktest v1.14.5 h1:dfYrrRyLtiqT9GyKXgdh+k4inNeTvmGbuSgZ3lx3GhA=
 github.com/frankban/quicktest v1.14.5/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
-github.com/go-delve/gore v0.11.5 h1:pcMZDA5G3k3tJEm4+szgqF4FeXLySy6NRbQ9Yx4wTaA=
-github.com/go-delve/gore v0.11.5/go.mod h1:6RBVnEUxVGkztpRY0UDUnEzS4GqETQjWrw8rhegmN4I=
+github.com/go-delve/gore v0.11.6 h1:MyP7xTNQO+dDiLBKxI/DKgkn74cMBjHZZxS8grtJ6G8=
+github.com/go-delve/gore v0.11.6/go.mod h1:6RBVnEUxVGkztpRY0UDUnEzS4GqETQjWrw8rhegmN4I=
 github.com/go-delve/liner v1.2.3-0.20220127212407-d32d89dd2a5d h1:pxjSLshkZJGLVm0wv20f/H0oTWiq/egkoJQ2ja6LEvo=
 github.com/go-delve/liner v1.2.3-0.20220127212407-d32d89dd2a5d/go.mod h1:biJCRbqp51wS+I92HMqn5H8/A0PAhxn2vyOT+JqhiGI=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=

diff --git a/pkg/proc/proc_test.go b/pkg/proc/proc_test.go
@@ -3192,9 +3192,6 @@ func TestDebugStripped(t *testing.T) {
 	skipOn(t, "not working on freebsd", "freebsd")
 	skipOn(t, "not working on linux/386", "linux", "386")
 	skipOn(t, "not working on linux/ppc64le when -gcflags=-N -l is passed", "linux", "ppc64le")
-	if goversion.VersionAfterOrEqual(runtime.Version(), 1, 22) {
-		t.Skip("broken")
-	}
 	withTestProcessArgs("testnextprog", t, "", []string{}, protest.LinkStrip, func(p *proc.Target, grp *proc.TargetGroup, f protest.Fixture) {
 		setFunctionBreakpoint(p, t, "main.main")
 		assertNoError(grp.Continue(), t, "Continue")
@@ -3212,12 +3209,6 @@ func TestDebugStripped2(t *testing.T) {
 	skipOn(t, "not working on freebsd", "freebsd")
 	skipOn(t, "not working on linux/386", "linux", "386")
 	skipOn(t, "not working on linux/ppc64le when -gcflags=-N -l is passed", "linux", "ppc64le")
-	if goversion.VersionAfterOrEqual(runtime.Version(), 1, 22) {
-		t.Skip("broken")
-	}
-	if !goversion.VersionAfterOrEqual(runtime.Version(), 1, 20) {
-		t.Skip("temporarily disabled on Go versions < 1.20")
-	}
 	withTestProcessArgs("inlinestripped", t, "", []string{}, protest.EnableInlining|protest.LinkStrip|protest.LinkDisableDWARF, func(p *proc.Target, grp *proc.TargetGroup, f protest.Fixture) {
 		setFunctionBreakpointAll(p, t, "fmt.Println")
 

diff --git a/vendor/github.com/go-delve/gore/goversion_gen.go b/vendor/github.com/go-delve/gore/goversion_gen.go
diff --git a/vendor/github.com/go-delve/gore/stdpkg_gen.go b/vendor/github.com/go-delve/gore/stdpkg_gen.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -24,7 +24,7 @@ github.com/creack/pty
 # github.com/derekparker/trie v0.0.0-20230829180723-39f4de51ef7d
 ## explicit; go 1.19
 github.com/derekparker/trie
-# github.com/go-delve/gore v0.11.5
+# github.com/go-delve/gore v0.11.6
 ## explicit; go 1.21
 github.com/go-delve/gore
 # github.com/go-delve/liner v1.2.3-0.20220127212407-d32d89dd2a5d