fix testing of busybox "applet" itself

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

diff --git a/testsuite/busybox.tests b/testsuite/busybox.tests
index 7595d061fdeaea9414b8c18a1842db6027745a78..6eeb3251da2448008d503f602f717b5fa63a6c94 100755 (executable)
--- a/testsuite/busybox.tests
+++ b/testsuite/busybox.tests
@@ -4,50 +4,43 @@
 # 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
+. ./testing.sh
 
-# Depends on nothing
-_BB_CONFIG_DEP=""
+HELPDUMP=`true | busybox 2>&1 | cat`
 
-# We'll assume "cat" is built in, because we need some other command to test.
+# We need to test under calling the binary under other names.
 
-HELPDUMP=`$COMMAND`
 
-# The gratuitous "\n"s are due to a shell idiosyncrasy: environment variables
-# seem to strip trailing whitespace, which makes cmp and diff unhappy.
+testing "busybox --help busybox" "true | busybox --help busybox 2>&1 | cat" "$HELPDUMP\n\n" "" ""
 
-ln -s `which "$COMMAND"` busybox-suffix
-ln -s `which "$COMMAND"` unknown
-
-testing "busybox --help 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 cat" "cat" "moo" "" "moo"
-
-       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" "" ""
 
-       testing "$i --help cat" "--help cat 2>&1 | grep prints" \
-               "Concatenates FILE(s) and prints them to stdout.\n" "" ""
+       optional CAT
+       testing "" "$i cat" "moo" "" "moo"
+       testing "$i --help cat" "$i --help cat 2>&1 | grep print" \
+               "Concatenate FILEs and print 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" "" ""
+ln -s `which busybox` unknown
 
-rm -f busybox-suffix unknown
+testing "busybox as unknown name" "./unknown 2>&1" \
+       "unknown: applet not found\n" "" ""
+rm unknown
 
 exit $FAILCOUNT