From: Keith Randall <khr@golang.org>
Date: Thu, 6 Nov 2014 04:25:20 +0000 (-0800)
Subject: os/exec: tell lsof not to block
X-Git-Tag: go1.4rc1~42
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=23ecad07cd8cf07a21af07a1e96803f32536ab05;p=gostls13.git

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
---

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")
 	}