diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
| commit | 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch) | |
| tree | e1810a4b135afce04b34862ef0fab2bfaeb8aeca /sys-apps/earlyoom/files | |
| parent | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff) | |
gentoo resync : 15.01.2020
Diffstat (limited to 'sys-apps/earlyoom/files')
| -rw-r--r-- | sys-apps/earlyoom/files/earlyoom | 6 | ||||
| -rw-r--r-- | sys-apps/earlyoom/files/earlyoom-1.3-test-fixed.patch | 34 |
2 files changed, 40 insertions, 0 deletions
diff --git a/sys-apps/earlyoom/files/earlyoom b/sys-apps/earlyoom/files/earlyoom new file mode 100644 index 000000000000..374c0d1af231 --- /dev/null +++ b/sys-apps/earlyoom/files/earlyoom @@ -0,0 +1,6 @@ +#!/sbin/openrc-run +name=earlyoom +command=/usr/bin/earlyoom +command_args=-k +command_background=1 +pidfile=/run/earlyoom.pid diff --git a/sys-apps/earlyoom/files/earlyoom-1.3-test-fixed.patch b/sys-apps/earlyoom/files/earlyoom-1.3-test-fixed.patch new file mode 100644 index 000000000000..8c6fc3ab6df5 --- /dev/null +++ b/sys-apps/earlyoom/files/earlyoom-1.3-test-fixed.patch @@ -0,0 +1,34 @@ +From 3648b351e88331f3f2e46af4ae0ddd19e27bc7c2 Mon Sep 17 00:00:00 2001 +From: Jakob Unterwurzacher <jakobunt@gmail.com> +Date: Mon, 8 Jul 2019 21:07:04 +0200 +Subject: [PATCH] tests: fix TestCli failure when all processes have badness 0 + +On a machine with a lot of RAM and no big processes running, +all processes may have badness 0, and we will get + + ^ new victim (higher vm_rss) + +in the debug output, but not + + ^ new victim (higher badness) + +. This is not a failure. + +Fixes https://github.com/rfjakob/earlyoom/issues/137 +--- + tests/cli_test.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/cli_test.go b/tests/cli_test.go +index 7085290..ef4abee 100644 +--- a/tests/cli_test.go ++++ b/tests/cli_test.go +@@ -72,7 +72,7 @@ func TestCli(t *testing.T) { + {args: nil, code: -1, stderrContains: startupMsg, stdoutContains: memReport}, + {args: []string{"-p"}, code: -1, stdoutContains: memReport}, + {args: []string{"-v"}, code: 0, stderrContains: "earlyoom v", stdoutEmpty: true}, +- {args: []string{"-d"}, code: -1, stdoutContains: "^ new victim (higher badness)"}, ++ {args: []string{"-d"}, code: -1, stdoutContains: "^ new victim"}, + {args: []string{"-m", "1"}, code: -1, stderrContains: " 1 %", stdoutContains: memReport}, + {args: []string{"-m", "0"}, code: 15, stderrContains: "fatal", stdoutEmpty: true}, + {args: []string{"-m", "-10"}, code: 15, stderrContains: "fatal", stdoutEmpty: true}, |