From 595f2582fae9939a2be3e7ec053674c35b6e86e0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Thu, 15 Sep 2016 22:35:45 +0200 Subject: [PATCH] Update golang.org/x/sys/unix --- vendor/manifest | 2 +- .../golang.org/x/sys/unix/syscall_bsd_test.go | 29 ++++++++++++++----- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/vendor/manifest b/vendor/manifest index 02baeb009..7bc3f9542 100644 --- a/vendor/manifest +++ b/vendor/manifest @@ -87,7 +87,7 @@ { "importpath": "golang.org/x/sys/unix", "repository": "https://go.googlesource.com/sys", - "revision": "a646d33e2ee3172a661fc09bca23bb4889a41bc8", + "revision": "30de6d19a3bd89a5f38ae4028e23aaa5582648af", "branch": "master", "path": "/unix" } diff --git a/vendor/src/golang.org/x/sys/unix/syscall_bsd_test.go b/vendor/src/golang.org/x/sys/unix/syscall_bsd_test.go index 2ad51290c..d8085a072 100644 --- a/vendor/src/golang.org/x/sys/unix/syscall_bsd_test.go +++ b/vendor/src/golang.org/x/sys/unix/syscall_bsd_test.go @@ -7,6 +7,7 @@ package unix_test import ( + "os/exec" "runtime" "testing" @@ -14,23 +15,37 @@ import ( ) const MNT_WAIT = 1 +const MNT_NOWAIT = 2 func TestGetfsstat(t *testing.T) { - n, err := unix.Getfsstat(nil, MNT_WAIT) + const flags = MNT_NOWAIT // see golang.org/issue/16937 + n, err := unix.Getfsstat(nil, flags) if err != nil { t.Fatal(err) } data := make([]unix.Statfs_t, n) - n, err = unix.Getfsstat(data, MNT_WAIT) + n2, err := unix.Getfsstat(data, flags) if err != nil { t.Fatal(err) } - - empty := unix.Statfs_t{} - for _, stat := range data { - if stat == empty { - t.Fatal("an empty Statfs_t struct was returned") + if n != n2 { + t.Errorf("Getfsstat(nil) = %d, but subsequent Getfsstat(slice) = %d", n, n2) + } + for i, stat := range data { + if stat == (unix.Statfs_t{}) { + t.Errorf("index %v is an empty Statfs_t struct", i) + } + } + if t.Failed() { + for i, stat := range data[:n2] { + t.Logf("data[%v] = %+v", i, stat) + } + mount, err := exec.Command("mount").CombinedOutput() + if err != nil { + t.Logf("mount: %v\n%s", err, mount) + } else { + t.Logf("mount: %s", mount) } } }