X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=testsuite%2Fbusybox.tests;h=6eeb3251da2448008d503f602f717b5fa63a6c94;hb=e208279722a7dc874b02e7ebf456667f26d6c8e2;hp=91dbc797eea17bc0a7e7a741d1480e9012b92bd9;hpb=f6acb660eaf5e1a6bfbcedb871d1f7d9ba4b8db4;p=oweals%2Fbusybox.git

diff --git a/testsuite/busybox.tests b/testsuite/busybox.tests
index 91dbc797e..6eeb3251d 100755
--- a/testsuite/busybox.tests
+++ b/testsuite/busybox.tests
@@ -4,47 +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
 
-# We'll assume "cat" is built in, because we need some other command to test.
+HELPDUMP=`true | busybox 2>&1 | cat`
 
-HELPDUMP=`$COMMAND`
+# We need to test under calling the binary under other names.
 
-# The gratuitous "\n"s are due to a shell idiosyncrasy: environment variables
-# seem to strip trailing whitespace, which makes cmp and diff unhappy.
 
-ln -s `which "$COMMAND"` busybox-suffix
-ln -s `which "$COMMAND"` unknown
+testing "busybox --help busybox" "true | busybox --help busybox 2>&1 | cat" "$HELPDUMP\n\n" "" ""
 
-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 cat" "cat" "moo" "" "moo"
+	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" "" ""
 
-	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