Skip to content

Commit

Permalink
os: don't use wait6 on netbsd
Browse files Browse the repository at this point in the history
CL 315281 changed the os package use wait6 on netbsd. This seems to be
causing frequent test failures as reported in golang#48789. Revert that change
using wait6 on netbsd for now.

Updates golang#13987
Updates golang#16028
For golang#48789

Change-Id: Ieddffc65611c7f449971eaa8ed6f4299a5f742c2
Reviewed-on: https://go-review.googlesource.com/c/go/+/354249
Trust: Tobias Klauser <[email protected]>
Trust: Bryan C. Mills <[email protected]>
Trust: Benny Siegert <[email protected]>
Run-TryBot: Tobias Klauser <[email protected]>
TryBot-Result: Go Bot <[email protected]>
Reviewed-by: Bryan C. Mills <[email protected]>
Reviewed-by: Benny Siegert <[email protected]>
Reviewed-by: Ian Lance Taylor <[email protected]>
  • Loading branch information
tklauser committed Oct 7, 2021
1 parent 4ab3c10 commit 0f52292
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
12 changes: 9 additions & 3 deletions src/os/wait_unimp.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,22 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:build aix || darwin || (js && wasm) || openbsd || solaris
// +build aix darwin js,wasm openbsd solaris
// aix, darwin, js/wasm, openbsd and solaris don't implement
// waitid/wait6. netbsd implements wait6, but that is causing test
// failures, see issue #48789.

//go:build aix || darwin || (js && wasm) || netbsd || openbsd || solaris
// +build aix darwin js,wasm netbsd openbsd solaris

package os

// blockUntilWaitable attempts to block until a call to p.Wait will
// succeed immediately, and reports whether it has done so.
// It does not actually call p.Wait.
// This version is used on systems that do not implement waitid,
// or where we have not implemented it yet.
// or where we have not implemented it yet. Note that this is racy:
// a call to Process.Signal can in an extremely unlikely case send a
// signal to the wrong process, see issue #13987.
func (p *Process) blockUntilWaitable() (bool, error) {
return false, nil
}
4 changes: 2 additions & 2 deletions src/os/wait_wait6.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:build dragonfly || freebsd || netbsd
// +build dragonfly freebsd netbsd
//go:build dragonfly || freebsd
// +build dragonfly freebsd

package os

Expand Down

0 comments on commit 0f52292

Please sign in to comment.