Merge pull request #5245 from mxpv/oom

Fix oom tests on non Linux
containerd · Mar 23, 2021 · 792336b · 792336b
2 parents d54225c + eb7c7c7
commit 792336b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/sys/oom_unix.go → sys/oom_linux.go b/sys/oom_unix.go → sys/oom_linux.go
@@ -1,5 +1,3 @@
-// +build !windows
-
 /*
    Copyright The containerd Authors.
 

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

diff --git a/sys/oom_windows.go → sys/oom_unsupported.go b/sys/oom_windows.go → 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
 )