diff options
| author | David du Colombier <0intro@gmail.com> | 2014-10-20 23:01:32 +0200 |
|---|---|---|
| committer | David du Colombier <0intro@gmail.com> | 2014-10-20 23:01:32 +0200 |
| commit | 29ef42251272a7835a1d5c5dab545c0484d7fa90 (patch) | |
| tree | 1b2875e6d7498769fef404c66a20e35191b78a83 /src/os | |
| parent | 4c904f2331687ac15fc16c29a1ffa576a4441ec0 (diff) | |
| download | go-29ef42251272a7835a1d5c5dab545c0484d7fa90.tar.gz | |
os/exec: fix number of expected file descriptors on Plan 9
Since CL 104570043 and 112720043, we are using the
nsec system call instead of /dev/bintime on Plan 9.
LGTM=rsc
R=rsc
CC=aram, golang-codereviews
https://codereview.appspot.com/155590043
Diffstat (limited to 'src/os')
| -rw-r--r-- | src/os/exec/exec_test.go | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/os/exec/exec_test.go b/src/os/exec/exec_test.go index 5fd439b8b..bc9c00eff 100644 --- a/src/os/exec/exec_test.go +++ b/src/os/exec/exec_test.go @@ -258,15 +258,7 @@ var testedAlreadyLeaked = false // basefds returns the number of expected file descriptors // to be present in a process at start. func basefds() uintptr { - n := os.Stderr.Fd() + 1 - - // Go runtime for 32-bit Plan 9 requires that /dev/bintime - // be kept open. - // See ../../runtime/time_plan9_386.c:/^runtime·nanotime - if runtime.GOOS == "plan9" && runtime.GOARCH == "386" { - n++ - } - return n + return os.Stderr.Fd() + 1 } func closeUnexpectedFds(t *testing.T, m string) { |