Merge pull request #5245 from mxpv/oom

mxpv · web-flow · commit 792336b09be5 · 2021-03-23T12:34:32.000-07:00
Fix oom tests on non Linux
diff --git a/sys/oom_linux.go b/sys/oom_linux.go
@@ -1,5 +1,3 @@
-// +build !windows
-
 /*
    Copyright The containerd Authors.
 
diff --git a/sys/oom_linux_test.go b/sys/oom_linux_test.go
@@ -1,5 +1,3 @@
-// +build !windows
-
 /*
    Copyright The containerd Authors.
 
diff --git 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
 )
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// +build !windows`
`2`		`-`
`3`	`1`	`/*`
`4`	`2`	`Copyright The containerd Authors.`
`5`	`3`