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, 27 insertions, 29 deletions

diff --git a/testsuite/busybox.tests b/testsuite/busybox.tests
index f31f38f06..30d96f946 100755
--- a/testsuite/busybox.tests
+++ b/testsuite/busybox.tests
@@ -4,57 +4,55 @@
 # Copyright 2005 by Rob Landley <rob@landley.net>
 # Licensed under GPL v2, see file LICENSE for details.
 
-if [ ${#COMMAND} -eq 0 ]; then COMMAND=busybox; fi
 . testing.sh
 
-HELPDUMP=`$COMMAND`
+# verify the applet order is correct in applets.h, otherwise applets won't
+# be called properly.
+#sed -n -e '/^USE_^\tAPPLET/{s:.*(::;s:,.*::;s:"::g;p}' 
+#       ../include/applets.h > applet.order1
+#LC_ALL=C sort applet.order.current > applet.order.correct
+#diff -u applet.order.current applet.order.correct
+#FAILCOUNT=$[$FAILCOUNT+$?]
+#rm -f applet.order.current applet.order.correct
+
+
+
+
+HELPDUMP=`busybox`
 
 # We need to test under calling the binary under other names.
 
-ln -s `which "$COMMAND"` busybox-suffix
-ln -s `which "$COMMAND"` unknown
 
-testing "busybox --help busybox" "--help busybox" "$HELPDUMP\n\n" "" ""
+testing "busybox --help busybox" "busybox --help busybox" "$HELPDUMP\n\n" "" ""
 
-for i in busybox busybox-suffix
+ln -s `which busybox` busybox-suffix
+for i in busybox ./busybox-suffix
 do
         # The gratuitous "\n"s are due to a shell idiosyncrasy:
         # environment variables seem to strip trailing whitespace.
 
-        testing "$i" "" "$HELPDUMP\n\n" "" ""
+        testing "" "$i" "$HELPDUMP\n\n" "" ""
 
-        testing "$i unknown" "unknown 2>&1" \
+        testing "$i unknown" "$i unknown 2>&1" \
                 "unknown: applet not found\n" "" ""
 
-        testing "$i --help" "--help 2>&1" "$HELPDUMP\n\n" "" ""
+        testing "$i --help" "$i --help 2>&1" "$HELPDUMP\n\n" "" ""
 
         optional CAT
-        testing "$i cat" "cat" "moo" "" "moo"
-        testing "$i --help cat" "--help cat 2>&1 | grep prints" \
+        testing "" "$i cat" "moo" "" "moo"
+        testing "$i --help cat" "$i --help cat 2>&1 | grep prints" \
                 "Concatenates FILE(s) and prints them to stdout.\n" "" ""
         optional ""
 
-        testing "$i --help unknown" "--help unknown 2>&1" \
+        testing "$i --help unknown" "$i --help unknown 2>&1" \
                 "unknown: applet not found\n" "" ""
-
-        COMMAND=./busybox-suffix
 done
+rm busybox-suffix
 
-COMMAND="./unknown"
-testing "busybox as unknown name" "2>&1" "unknown: applet not found\n" "" ""
-
-rm -f busybox-suffix unknown
-
-
-# verify the applet order is correct in applets.h
-# otherwise applets wont be called properly
-sed -n \
-        -e '/^\tAPPLET/{s:.*(::;s:,.*::;s:"::g;p}' \
-        ../include/applets.h > applet.order.current
-LC_ALL=C sort applet.order.current > applet.order.correct
-diff -u applet.order.current applet.order.correct
-FAILCOUNT=$[$FAILCOUNT+$?]
-rm -f applet.order.current applet.order.correct
+ln -s `which busybox` unknown
 
+testing "busybox as unknown name" "./unknown 2>&1" \
+        "unknown: applet not found\n" "" ""
+rm unknown
 
 exit $FAILCOUNT