X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=testsuite%2Fbusybox.tests;h=beb17440ceb2e9fa83e6251b82536ffb79f4b24a;hb=d8799b90f314469c10ada3008856cfdeb98b92f9;hp=f31f38f06824683f254c62035bceaf1a9af075d6;hpb=23ca7253becac95df6580e1ead1356dbe9bb212f;p=oweals%2Fbusybox.git

diff --git a/testsuite/busybox.tests b/testsuite/busybox.tests
index f31f38f06..beb17440c 100755
--- a/testsuite/busybox.tests
+++ b/testsuite/busybox.tests
@@ -2,59 +2,46 @@
 
 # Tests for busybox applet itself.
 # Copyright 2005 by Rob Landley <rob@landley.net>
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 
-if [ ${#COMMAND} -eq 0 ]; then COMMAND=busybox; fi
-. testing.sh
+. ./testing.sh
+test -f "$bindir/.config" && . "$bindir/.config"
 
-HELPDUMP=`$COMMAND`
+ln -s `which busybox` unknown
 
-# We need to test under calling the binary under other names.
+testing "busybox as unknown name" "./unknown 2>&1" \
+	"unknown: applet not found\n" "" ""
+rm unknown
 
-ln -s `which "$COMMAND"` busybox-suffix
-ln -s `which "$COMMAND"` unknown
+# We need busybox --help to be enabled for the rest of tests
+test x"$CONFIG_BUSYBOX" = x"y" \
+|| { echo "SKIPPED: busybox --help"; exit 0; }
 
-testing "busybox --help busybox" "--help busybox" "$HELPDUMP\n\n" "" ""
+HELPDUMP=`true | busybox 2>&1 | cat`
 
-for i in busybox busybox-suffix
-do
-	# The gratuitous "\n"s are due to a shell idiosyncrasy:
-	# environment variables seem to strip trailing whitespace.
+optional FEATURE_VERBOSE_USAGE
+testing "busybox --help busybox" "true | busybox --help busybox 2>&1 | cat" "$HELPDUMP\n" "" ""
+SKIP=
 
-	testing "$i" "" "$HELPDUMP\n\n" "" ""
+ln -s `which busybox` busybox-suffix
+for i in busybox ./busybox-suffix
+do
+	testing "$i" "$i 2>&1 | cat" "$HELPDUMP\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" "" ""
 
-	optional CAT
-	testing "$i cat" "cat" "moo" "" "moo"
-	testing "$i --help cat" "--help cat 2>&1 | grep prints" \
-		"Concatenates FILE(s) and prints them to stdout.\n" "" ""
-	optional ""
+	optional FEATURE_VERBOSE_USAGE CAT
+	testing "" "$i cat" "moo" "" "moo"
+	testing "$i --help cat" "$i --help cat 2>&1 | grep Print" \
+		"Print FILEs to stdout\n" "" ""
+	SKIP=
 
-	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
-
-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
-
+rm busybox-suffix
 
 exit $FAILCOUNT