X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=testsuite%2Fbusybox.tests;h=26536c656e3c0500d0e77d7afa4f260f37829ac1;hb=52933d47bd86d6d992f7290fad93d63b53f7a15f;hp=b69272593a66bc610ae5efaff3ec5f100420b524;hpb=48c6157eb9c10bdca89af2792177afc0380ef9c5;p=oweals%2Fbusybox.git

diff --git a/testsuite/busybox.tests b/testsuite/busybox.tests
index b69272593..26536c656 100755
--- a/testsuite/busybox.tests
+++ b/testsuite/busybox.tests
@@ -4,45 +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
 
-HELPDUMP=`$COMMAND`
+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" "" ""
+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