Skip to content

Commit ae416a5

Browse files
committed
unix: regenerate type Clockinfo on OpenBSD 6.9
OpenBSD 6.9 changed the definition of Clockinfo, leading TestSysctlClockinfo to fail on OpenBSD 6.9 onwards. Since OpenBSD 6.8 is no longer supported upstream, regenerate Clockinfo on that release and test that SysctlClockInfo fails gracefully on OpenBSD 6.8 and earlier. Fixes golang/go#47629 For golang/go#48977 Change-Id: Ia511b8601af11f70ffcce0f96764c69a67d626b8 Reviewed-on: https://go-review.googlesource.com/c/sys/+/360694 Trust: Tobias Klauser <[email protected]> Run-TryBot: Tobias Klauser <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Bryan C. Mills <[email protected]> Reviewed-by: Joel Sing <[email protected]>
1 parent 4dd7244 commit ae416a5

6 files changed

+33
-30
lines changed

unix/syscall_bsd_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,14 @@ func TestSysctlUint32(t *testing.T) {
7070
func TestSysctlClockinfo(t *testing.T) {
7171
ci, err := unix.SysctlClockinfo("kern.clockrate")
7272
if err != nil {
73+
if runtime.GOOS == "openbsd" && (err == unix.ENOMEM || err == unix.EIO) {
74+
if osrev, _ := unix.SysctlUint32("kern.osrevision"); osrev <= 202010 {
75+
// SysctlClockinfo should fail gracefully due to a struct size
76+
// mismatch on OpenBSD 6.8 and earlier, see
77+
// https://golang.org/issue/47629
78+
return
79+
}
80+
}
7381
t.Fatal(err)
7482
}
7583
t.Logf("tick = %v, hz = %v, profhz = %v, stathz = %v",

unix/ztypes_openbsd_386.go

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/ztypes_openbsd_amd64.go

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/ztypes_openbsd_arm.go

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/ztypes_openbsd_arm64.go

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/ztypes_openbsd_mips64.go

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)