From: Alexander Morozov Date: Mon, 31 Aug 2015 16:40:25 +0000 (-0700) Subject: syscall: remove unused kernelVersion function from tests X-Git-Tag: go1.6beta1~1218 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=5483761c130dcd7e985c01dd82af93758732b3a7;p=gostls13.git syscall: remove unused kernelVersion function from tests Change-Id: If0d00999c58f7421e4da06e1822ba5abccf72cac Reviewed-on: https://go-review.googlesource.com/14111 Reviewed-by: Ian Lance Taylor Run-TryBot: Ian Lance Taylor TryBot-Result: Gobot Gobot --- diff --git a/src/syscall/exec_linux_test.go b/src/syscall/exec_linux_test.go index bbfd6d03df..e4ed6adff9 100644 --- a/src/syscall/exec_linux_test.go +++ b/src/syscall/exec_linux_test.go @@ -10,8 +10,6 @@ import ( "io/ioutil" "os" "os/exec" - "regexp" - "strconv" "strings" "syscall" "testing" @@ -72,22 +70,6 @@ func TestCloneNEWUSERAndRemapRootEnableSetgroups(t *testing.T) { testNEWUSERRemap(t, 0, 0, false) } -// kernelVersion returns the major and minor versions of the Linux -// kernel version. It calls t.Skip if it can't figure it out. -func kernelVersion(t *testing.T) (int, int) { - bytes, err := ioutil.ReadFile("/proc/version") - if err != nil { - t.Skipf("can't get kernel version: %v", err) - } - matches := regexp.MustCompile("([0-9]+).([0-9]+)").FindSubmatch(bytes) - if len(matches) < 3 { - t.Skipf("can't get kernel version from %s", bytes) - } - major, _ := strconv.Atoi(string(matches[1])) - minor, _ := strconv.Atoi(string(matches[2])) - return major, minor -} - func TestCloneNEWUSERAndRemapNoRootDisableSetgroups(t *testing.T) { if os.Getuid() == 0 { t.Skip("skipping unprivileged user only test")