diff options
| author | Ian Lance Taylor <iant@golang.org> | 2019-10-22 00:54:22 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2019-10-22 08:54:50 +0000 |
| commit | 7f98c0eb031d678687a3c07f5e1f11cac12d4171 (patch) | |
| tree | a75625df24947cc049b3c3cb64b7ed65f0cf666e /src/os/exec/exec_test.go | |
| parent | 4ec51894eed186413c81c71772e3df55351ecbb9 (diff) | |
| download | go-7f98c0eb031d678687a3c07f5e1f11cac12d4171.tar.gz go-7f98c0eb031d678687a3c07f5e1f11cac12d4171.zip | |
os/exec: skip possible netpoll pipe in known FDs in test
Fixes #35045
Change-Id: I90ac29882c7d03936c98c4116a8bccdd2ecbf76b
Reviewed-on: https://go-review.googlesource.com/c/go/+/202445
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Tobias Klauser <tobias.klauser@gmail.com>
Diffstat (limited to 'src/os/exec/exec_test.go')
| -rw-r--r-- | src/os/exec/exec_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/os/exec/exec_test.go b/src/os/exec/exec_test.go index 60a8d0228b..19d2111743 100644 --- a/src/os/exec/exec_test.go +++ b/src/os/exec/exec_test.go @@ -453,13 +453,13 @@ var testedAlreadyLeaked = false // basefds returns the number of expected file descriptors // to be present in a process at start. -// stdin, stdout, stderr, epoll/kqueue, maybe testlog +// stdin, stdout, stderr, epoll/kqueue, epoll/kqueue pipe, maybe testlog func basefds() uintptr { n := os.Stderr.Fd() + 1 // The poll (epoll/kqueue) descriptor can be numerically // either between stderr and the testlog-fd, or after // testlog-fd. - if poll.IsPollDescriptor(n) { + for poll.IsPollDescriptor(n) { n++ } for _, arg := range os.Args { |