From: Mikio Hara <mikioh.mikioh@gmail.com>
Date: Thu, 2 Jun 2016 08:17:02 +0000 (+0900)
Subject: syscall: deflake TestUnshare
X-Git-Tag: go1.7beta2~65
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=49c680f948310cfc7ab3062ca9a96a4adb6ae8cd;p=gostls13.git

syscall: deflake TestUnshare

Change-Id: I21a08c2ff5ebb74e158723cca323574432870ba8
Reviewed-on: https://go-review.googlesource.com/23662
Run-TryBot: Mikio Hara <mikioh.mikioh@gmail.com>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---

diff --git a/src/syscall/exec_linux_test.go b/src/syscall/exec_linux_test.go
index 1afe88cb1b..a562c9cbf2 100644
--- a/src/syscall/exec_linux_test.go
+++ b/src/syscall/exec_linux_test.go
@@ -145,7 +145,18 @@ func TestUnshare(t *testing.T) {
 		t.Skip("skipping test on Kubernetes-based builders; see Issue 12815")
 	}
 
-	cmd := exec.Command("cat", "/proc/net/dev")
+	path := "/proc/net/dev"
+	if _, err := os.Stat(path); err != nil {
+		if os.IsNotExist(err) {
+			t.Skip("kernel doesn't support proc filesystem")
+		}
+		if os.IsPermission(err) {
+			t.Skip("unable to test proc filesystem due to permissions")
+		}
+		t.Fatal(err)
+	}
+
+	cmd := exec.Command("cat", path)
 	cmd.SysProcAttr = &syscall.SysProcAttr{
 		Unshareflags: syscall.CLONE_NEWNET,
 	}