os/exec: enable inherited file descriptor test

Fixes #2596.

R=golang-dev
CC=golang-dev
https://golang.org/cl/5498061

diff --git a/src/pkg/os/exec/exec_test.go b/src/pkg/os/exec/exec_test.go
index 2b4166cc3eafd98d95cc992c055948fef60f5501..a015cbe96cc051d541bd718d9e28713e9bd45785 100644 (file)
--- a/src/pkg/os/exec/exec_test.go
+++ b/src/pkg/os/exec/exec_test.go
@@ -256,13 +256,6 @@ func TestHelperProcess(*testing.T) {
                        fmt.Printf("ReadAll from fd 3: %v", err)
                        os.Exit(1)
                }
-               // TODO(bradfitz): remove this block once the builders are restarted
-               // with a new binary including be47ea17bea0 (set CLOEXEC on epoll/kqueue fds)
-               // and 5500053 (don't trust O_CLOEXEC on OS X).
-               {
-                       os.Stderr.Write(bs)
-                       os.Exit(0)
-               }
                // Now verify that there are no other open fds.
                var files []*os.File
                for wantfd := os.Stderr.Fd() + 2; wantfd <= 100; wantfd++ {