diff options
author | Keith Randall <khr@golang.org> | 2014-11-05 20:25:20 -0800 |
---|---|---|
committer | Keith Randall <khr@golang.org> | 2014-11-05 20:25:20 -0800 |
commit | 23ecad07cd8cf07a21af07a1e96803f32536ab05 (patch) | |
tree | 08ccceb24c17b12abc22a75b993d328cf178caba | |
parent | 908dcab6f854503a4616b6a20aa1e9eba9ecea66 (diff) | |
download | go-23ecad07cd8cf07a21af07a1e96803f32536ab05.tar.gz go-23ecad07cd8cf07a21af07a1e96803f32536ab05.zip |
os/exec: tell lsof not to block
For some reason lsof is now hanging on my workstation
without the -b (avoid blocking in the kernel) option.
Adding -b makes the test pass and shouldn't hurt.
I don't know how recent the -b option is. If the builders
are ok with it, it's probably ok.
LGTM=rsc
R=golang-codereviews, bradfitz, rsc
CC=golang-codereviews
https://golang.org/cl/166220043
-rw-r--r-- | src/os/exec/exec_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/os/exec/exec_test.go b/src/os/exec/exec_test.go index bc9c00effe..197d3e8b40 100644 --- a/src/os/exec/exec_test.go +++ b/src/os/exec/exec_test.go @@ -246,7 +246,7 @@ func TestPipeLookPathLeak(t *testing.T) { } func numOpenFDS(t *testing.T) (n int, lsof []byte) { - lsof, err := exec.Command("lsof", "-n", "-p", strconv.Itoa(os.Getpid())).Output() + lsof, err := exec.Command("lsof", "-b", "-n", "-p", strconv.Itoa(os.Getpid())).Output() if err != nil { t.Skip("skipping test; error finding or running lsof") } |