diff options
Diffstat (limited to 'libgo/go/os/exec/exec_test.go')
| -rw-r--r-- | libgo/go/os/exec/exec_test.go | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/libgo/go/os/exec/exec_test.go b/libgo/go/os/exec/exec_test.go index 11cfe79c724..d00d12008f7 100644 --- a/libgo/go/os/exec/exec_test.go +++ b/libgo/go/os/exec/exec_test.go @@ -17,6 +17,7 @@ import ( "runtime" "strconv" "strings" + "syscall" "testing" ) @@ -150,6 +151,15 @@ func TestExtraFiles(t *testing.T) { return } + // Ensure that file descriptors have not already been leaked into + // our environment. + for fd := os.Stderr.Fd() + 1; fd <= 101; fd++ { + err := syscall.Close(fd) + if err == nil { + t.Logf("Something already leaked - closed fd %d", fd) + } + } + // Force network usage, to verify the epoll (or whatever) fd // doesn't leak to the child, ln, err := net.Listen("tcp", "127.0.0.1:0") @@ -202,6 +212,13 @@ func TestHelperProcess(*testing.T) { } defer os.Exit(0) + // Determine which command to use to display open files. + ofcmd := "lsof" + switch runtime.GOOS { + case "freebsd", "netbsd", "openbsd": + ofcmd = "fstat" + } + args := os.Args for len(args) > 0 { if args[0] == "--" { @@ -282,7 +299,7 @@ func TestHelperProcess(*testing.T) { } if got := f.Fd(); got != wantfd { fmt.Printf("leaked parent file. fd = %d; want %d\n", got, wantfd) - out, _ := Command("lsof", "-p", fmt.Sprint(os.Getpid())).CombinedOutput() + out, _ := Command(ofcmd, "-p", fmt.Sprint(os.Getpid())).CombinedOutput() fmt.Print(string(out)) os.Exit(1) } @@ -292,6 +309,11 @@ func TestHelperProcess(*testing.T) { f.Close() } } + // Referring to fd3 here ensures that it is not + // garbage collected, and therefore closed, while + // executing the wantfd loop above. It doesn't matter + // what we do with fd3 as long as we refer to it; + // closing it is the easy choice. fd3.Close() os.Stderr.Write(bs) case "exit": |
