Redo test suite to be able to test more than one command at a time. Eliminate

$COMMAND environment variable, instead put full command line (including
command to run) in second argument.  Modify $PATH to have test versions of
commands at start of path.  (Also more infrastructure for testing as root,
work in progress...)

1 files changed, 10 insertions, 8 deletions

diff --git a/testsuite/pidof.tests b/testsuite/pidof.tests
index 0515522f8..831dd2483 100755
--- a/testsuite/pidof.tests
+++ b/testsuite/pidof.tests
@@ -6,22 +6,24 @@
 
 # AUDIT: 
 
-[ ${#COMMAND} -eq 0 ] && COMMAND=pidof
 . 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" "" ""
+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" "-s $(basename $0) ; echo -n \$?" \
-        "$(pidof -s $(basename $0) ; echo -n $?)" "" ""
+testing "pidof -s" "pidof -s init" "1\n" "" ""
 
 optional FEATURE_PIDOF_OMIT
-testing "pidof -o %PPID" "$(basename $0) -o %PPID ; echo -n \$?" \
-        "$(pidof $(basename $0) -o %PPID ; echo -n $?)" "" ""
+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" "" "" "" 
 
 exit $FAILCOUNT