Skip to content

Commit 59aece9

Browse files
authored
goversion,proc_test: add go1.24 compatiblity, disable broken test (#3882)
Add go1.24 to compatibility set and test matrix. Remove go1.21 from test matrix. TestRangeOverFuncNextInlined is disabled because the improved inlining of go1.24 produces symbol names that are too complicated for us to correlate, a fix for this will require a change to the compiler that will probably be too complex to make it into 1.24.
1 parent 530afae commit 59aece9

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

.teamcity/settings.kts

+7-7
Original file line numberDiff line numberDiff line change
@@ -41,27 +41,27 @@ To debug in IntelliJ Idea, open the 'Maven Projects' tool window (View
4141
version = "2023.05"
4242

4343
val targets = arrayOf(
44-
"linux/amd64/1.21",
4544
"linux/amd64/1.22",
4645
"linux/amd64/1.23",
46+
"linux/amd64/1.24",
4747
"linux/amd64/tip",
4848

49-
"linux/386/1.23",
49+
"linux/386/1.24",
5050

51-
"linux/arm64/1.23",
51+
"linux/arm64/1.24",
5252
"linux/arm64/tip",
5353

54-
"linux/ppc64le/1.23",
54+
"linux/ppc64le/1.24",
5555

5656
"linux/riscv64/tip",
5757

58-
"windows/amd64/1.23",
58+
"windows/amd64/1.24",
5959
"windows/amd64/tip",
6060

61-
"mac/amd64/1.23",
61+
"mac/amd64/1.24",
6262
"mac/amd64/tip",
6363

64-
"mac/arm64/1.23",
64+
"mac/arm64/1.24",
6565
"mac/arm64/tip"
6666
)
6767

pkg/goversion/compat.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var (
1111
MinSupportedVersionOfGoMajor = 1
1212
MinSupportedVersionOfGoMinor = 21
1313
MaxSupportedVersionOfGoMajor = 1
14-
MaxSupportedVersionOfGoMinor = 23
14+
MaxSupportedVersionOfGoMinor = 24
1515
goTooOldErr = fmt.Sprintf("Go version %%s is too old for this version of Delve (minimum supported version %d.%d, suppress this error with --check-go-version=false)", MinSupportedVersionOfGoMajor, MinSupportedVersionOfGoMinor)
1616
goTooOldWarn = fmt.Sprintf("WARNING: undefined behavior - Go version %%s is too old for this version of Delve (minimum supported version %d.%d)", MinSupportedVersionOfGoMajor, MinSupportedVersionOfGoMinor)
1717
dlvTooOldErr = fmt.Sprintf("Version of Delve is too old for Go version %%s (maximum supported version %d.%d, suppress this error with --check-go-version=false)", MaxSupportedVersionOfGoMajor, MaxSupportedVersionOfGoMinor)

pkg/proc/stepping_test.go

+3
Original file line numberDiff line numberDiff line change
@@ -1218,6 +1218,9 @@ func TestRangeOverFuncNextInlined(t *testing.T) {
12181218
if !goversion.VersionAfterOrEqual(runtime.Version(), 1, 23) {
12191219
t.Skip("N/A")
12201220
}
1221+
if goversion.VersionAfterOrEqual(runtime.Version(), 1, 24) && !goversion.VersionAfterOrEqual(runtime.Version(), 1, 25) {
1222+
t.Skip("broken due to inlined symbol names")
1223+
}
12211224

12221225
var bp *proc.Breakpoint
12231226

0 commit comments

Comments
 (0)