From 75104237c82f943bffc41334acd179cf28f30ea2 Mon Sep 17 00:00:00 2001 From: Rémy Oudompheng Date: Sun, 27 Jan 2013 00:24:09 +0100 Subject: all: make tests able to run multiple times. It is now possible to run "go test -cpu=1,2,4 std" successfully. Fixes #3185. R=golang-dev, dave, minux.ma, bradfitz CC=golang-dev https://golang.org/cl/7196052 --- src/pkg/os/exec/exec_test.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/pkg/os/exec/exec_test.go') diff --git a/src/pkg/os/exec/exec_test.go b/src/pkg/os/exec/exec_test.go index 0702d3bdf6..ff8954fd02 100644 --- a/src/pkg/os/exec/exec_test.go +++ b/src/pkg/os/exec/exec_test.go @@ -144,6 +144,8 @@ func TestPipes(t *testing.T) { check("Wait", err) } +var testedAlreadyLeaked = false + func TestExtraFiles(t *testing.T) { if runtime.GOOS == "windows" { t.Skip("no operating system support; skipping") @@ -151,10 +153,13 @@ func TestExtraFiles(t *testing.T) { // Ensure that file descriptors have not already been leaked into // our environment. - for fd := os.Stderr.Fd() + 1; fd <= 101; fd++ { - err := os.NewFile(fd, "").Close() - if err == nil { - t.Logf("Something already leaked - closed fd %d", fd) + if !testedAlreadyLeaked { + testedAlreadyLeaked = true + for fd := os.Stderr.Fd() + 1; fd <= 101; fd++ { + err := os.NewFile(fd, "").Close() + if err == nil { + t.Logf("Something already leaked - closed fd %d", fd) + } } } -- cgit v1.3-5-g9baa