Skip to content

Commit

Permalink
os/exec: ignore hungup error while copying stdin on Plan 9
Browse files Browse the repository at this point in the history
Fixes #35753

Change-Id: I38674c59c601785eb25b778dc25efdb92231dd9b
Reviewed-on: https://go-review.googlesource.com/c/go/+/208223
Run-TryBot: Emmanuel Odeke <[email protected]>
TryBot-Result: Gobot Gobot <[email protected]>
Reviewed-by: Brad Fitzpatrick <[email protected]>
  • Loading branch information
fhs authored and bradfitz committed Dec 15, 2019
1 parent 7d30af8 commit a3dc6da
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 6 deletions.
1 change: 0 additions & 1 deletion src/os/exec/exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ func (c *Cmd) argv() []string {

// skipStdinCopyError optionally specifies a function which reports
// whether the provided stdin copy error should be ignored.
// It is non-nil everywhere but Plan 9, which lacks EPIPE. See exec_posix.go.
var skipStdinCopyError func(error) bool

func (c *Cmd) stdin() (f *os.File, err error) {
Expand Down
19 changes: 19 additions & 0 deletions src/os/exec/exec_plan9.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// Copyright 2019 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package exec

import "os"

func init() {
skipStdinCopyError = func(err error) bool {
// Ignore hungup errors copying to stdin if the program
// completed successfully otherwise.
// See Issue 35753.
pe, ok := err.(*os.PathError)
return ok &&
pe.Op == "write" && pe.Path == "|1" &&
pe.Err.Error() == "i/o on hungup channel"
}
}
5 changes: 0 additions & 5 deletions src/os/exec/exec_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -974,11 +974,6 @@ func (delayedInfiniteReader) Read(b []byte) (int, error) {
func TestIgnorePipeErrorOnSuccess(t *testing.T) {
testenv.MustHaveExec(t)

// We really only care about testing this on Unixy and Windowsy things.
if runtime.GOOS == "plan9" {
t.Skipf("skipping test on %q", runtime.GOOS)
}

testWith := func(r io.Reader) func(*testing.T) {
return func(t *testing.T) {
cmd := helperCommand(t, "echo", "foo")
Expand Down

0 comments on commit a3dc6da

Please sign in to comment.