hush: remove forgotten commented-out block. no code changes

[oweals/busybox.git] / testsuite / pidof.tests

diff --git a/testsuite/pidof.tests b/testsuite/pidof.tests
index 0c303cf22f58fc7cdb8523957c32a110f93cef67..2a06d2b1c1f2966b9e03659a581a1e8a18701208 100755 (executable)
--- a/testsuite/pidof.tests
+++ b/testsuite/pidof.tests
@@ -1,29 +1,33 @@
 #!/bin/sh
 
 # pidof tests.
-# Copyright 2005 by Bernhard Fischer
-# Licensed under GPL v2, see file LICENSE for details.
+# Copyright 2005 by Bernhard Reutner-Fischer
+# Licensed under GPLv2, see file LICENSE in this source tree.
 
-# AUDIT: 
+# AUDIT:
 
-[ ${#COMMAND} -eq 0 ] && COMMAND=pidof
-. testing.sh
+. ./testing.sh
 
 # testing "test name" "options" "expected result" "file input" "stdin"
 
-testing "pidof (exit with error)" "veryunlikelyoccuringbinaryname ; echo \$?" \
-       "\n1\n" "" ""
-testing "pidof (exit with success)" "pidof > /dev/null; echo \$?" "0\n" "" ""
-
-
-# Depends on FEATURE_PIDOF_SINGLE
-_BB_CONFIG_DEP=FEATURE_PIDOF_SINGLE
-testing "pidof -s" "-s $(basename $0) ; echo -n \$?" \
-       "$(pidof -s $(basename $0) ; echo -n $?)" "" ""
-
-# Depends on FEATURE_PIDOF_OMIT
-_BB_CONFIG_DEP=FEATURE_PIDOF_OMIT
-testing "pidof -o %PPID" "$(basename $0) -o %PPID ; echo -n \$?" \
-       "$(pidof $(basename $0) -o %PPID ; echo -n $?)" "" ""
+testing "pidof (exit with error)" \
+       "pidof veryunlikelyoccuringbinaryname ; echo \$?" "1\n" "" ""
+testing "pidof (exit with success)" "pidof pidof > /dev/null; echo \$?" \
+       "0\n" "" ""
+# We can get away with this because it says #!/bin/sh up top.
+
+testing "pidof this" "pidof pidof.tests | grep -o -w $$" "$$\n" "" ""
+
+optional FEATURE_PIDOF_SINGLE
+testing "pidof -s" "pidof -s init" "1\n" "" ""
+SKIP=
+
+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" "" ""
+testing "pidof -o init" "pidof -o 1 init | grep -o -w 1" "" "" ""
+SKIP=
 
 exit $FAILCOUNT