[git commit] testsuite/pidof.tests: fix false positive take 2

Denys Vlasenko vda.linux at googlemail.com
Wed Jun 27 12:50:00 UTC 2018


commit: https://git.busybox.net/busybox/commit/?id=4c58f246d400d59d21eb98e8d6b334e0447ebaaa
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 testsuite/pidof.tests | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/testsuite/pidof.tests b/testsuite/pidof.tests
index b360a127b..cd10de4e0 100755
--- a/testsuite/pidof.tests
+++ b/testsuite/pidof.tests
@@ -24,11 +24,16 @@ testing "pidof -s" "pidof -s init" "1\n" "" ""
 SKIP=
 }
 
+test x"`cat /proc/1/comm`" = x"init" && {
 optional FEATURE_PIDOF_OMIT FEATURE_PIDOF_SINGLE
 # This test fails now because process name matching logic has changed,
 # but new logic is not "wrong" either... see find_pid_by_name.c comments
 #testing "pidof -o %PPID" "pidof -o %PPID pidof.tests | grep -o -w $$" "" "" ""
 testing "pidof -o %PPID NOP" "pidof -o %PPID -s init" "1\n" "" ""
+SKIP=
+}
+
+optional FEATURE_PIDOF_OMIT
 testing "pidof -o init" "pidof -o 1 init | grep -o -w 1" "" "" ""
 SKIP=
 


More information about the busybox-cvs mailing list