From 81f69a593146f61d3f6568403168ba28b1714f97 Mon Sep 17 00:00:00 2001 From: Christopher Crone Date: Wed, 13 Sep 2017 14:49:32 +0200 Subject: [PATCH] Fix Windows build Signed-off-by: Christopher Crone --- integration-cli/utils_test.go | 13 ------------- integration-cli/utils_unix_test.go | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 13 deletions(-) create mode 100644 integration-cli/utils_unix_test.go diff --git a/integration-cli/utils_test.go b/integration-cli/utils_test.go index f6f111ec25..d176c7f062 100644 --- a/integration-cli/utils_test.go +++ b/integration-cli/utils_test.go @@ -7,7 +7,6 @@ import ( "path/filepath" "strings" - "github.com/docker/docker/pkg/parsers/kernel" "github.com/docker/docker/pkg/stringutils" "github.com/go-check/check" "github.com/gotestyourself/gotestyourself/icmd" @@ -182,15 +181,3 @@ func RemoveOutputForExistingElements(output string, existing []string) string { res := RemoveLinesForExistingElements(strings.Split(output, "\n"), existing) return strings.Join(res, "\n") } - -// GetKernelVersion gets the current kernel version. -func GetKernelVersion() *kernel.VersionInfo { - v, _ := kernel.ParseRelease(testEnv.DaemonInfo.KernelVersion) - return v -} - -// CheckKernelVersion checks if current kernel is newer than (or equal to) -// the given version. -func CheckKernelVersion(k, major, minor int) bool { - return kernel.CompareKernelVersion(*GetKernelVersion(), kernel.VersionInfo{Kernel: k, Major: major, Minor: minor}) > 0 -} diff --git a/integration-cli/utils_unix_test.go b/integration-cli/utils_unix_test.go new file mode 100644 index 0000000000..b32e3baf3d --- /dev/null +++ b/integration-cli/utils_unix_test.go @@ -0,0 +1,19 @@ +// +build linux freebsd solaris openbsd + +package main + +import ( + "github.com/docker/docker/pkg/parsers/kernel" +) + +// GetKernelVersion gets the current kernel version. +func GetKernelVersion() *kernel.VersionInfo { + v, _ := kernel.ParseRelease(testEnv.DaemonInfo.KernelVersion) + return v +} + +// CheckKernelVersion checks if current kernel is newer than (or equal to) +// the given version. +func CheckKernelVersion(k, major, minor int) bool { + return kernel.CompareKernelVersion(*GetKernelVersion(), kernel.VersionInfo{Kernel: k, Major: major, Minor: minor}) > 0 +}