Merge pull request #5245 from mxpv/oom

Fix oom tests on non Linux
2021-03-23 12:34:32 -07:00 · 2021-03-23 12:34:32 -07:00 · 792336b09b
commit 792336b09b
parent d54225ccee eb7c7c71e2
3 changed files with 5 additions and 5 deletions
--- a/sys/oom_linux.go
+++ b/sys/oom_linux.go
@ -1,5 +1,3 @@
-// +build !windows
-
 /*
   Copyright The containerd Authors.

--- a/sys/oom_linux_test.go
+++ b/sys/oom_linux_test.go
@ -1,5 +1,3 @@
-// +build !windows
-
 /*
   Copyright The containerd Authors.

--- a/sys/oom_unsupported.go
+++ b/sys/oom_unsupported.go
@ -1,3 +1,5 @@
+// +build !linux
+
 /*
   Copyright The containerd Authors.

@ -17,7 +19,9 @@
 package sys

 const (
-	// OOMScoreAdjMax is not implemented on Windows
+	// OOMScoreMaxKillable is not implemented on non Linux
+	OOMScoreMaxKillable = 0
+	// OOMScoreAdjMax is not implemented on non Linux
 	OOMScoreAdjMax = 0
 )