From 4e5e42a1c1a9eb757743648c48df70cbd42635db Mon Sep 17 00:00:00 2001 From: Ondřej Surý Date: Mon, 23 May 2011 09:45:29 +0200 Subject: Imported Upstream version 2011.05.22 --- src/pkg/os/os_test.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/pkg/os/os_test.go') diff --git a/src/pkg/os/os_test.go b/src/pkg/os/os_test.go index 65475c118..b06d57b85 100644 --- a/src/pkg/os/os_test.go +++ b/src/pkg/os/os_test.go @@ -236,11 +236,14 @@ func smallReaddirnames(file *File, length int, t *testing.T) []string { count := 0 for { d, err := file.Readdirnames(1) + if err == EOF { + break + } if err != nil { - t.Fatalf("readdir %q failed: %v", file.Name(), err) + t.Fatalf("readdirnames %q failed: %v", file.Name(), err) } if len(d) == 0 { - break + t.Fatalf("readdirnames %q returned empty slice and no error", file.Name()) } names[count] = d[0] count++ -- cgit v1.2.3