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

diff --git a/testsuite/busybox.tests b/testsuite/busybox.tests
index 545cad5c0..beb17440c 100755
--- a/testsuite/busybox.tests
+++ b/testsuite/busybox.tests
@@ -5,6 +5,7 @@
 # Licensed under GPLv2, see file LICENSE in this source tree.
 
 . ./testing.sh
+test -f "$bindir/.config" && . "$bindir/.config"
 
 ln -s `which busybox` unknown
 
@@ -18,29 +19,24 @@ test x"$CONFIG_BUSYBOX" = x"y" \
 
 HELPDUMP=`true | busybox 2>&1 | cat`
 
-# We need to test under calling the binary under other names.
-
 optional FEATURE_VERBOSE_USAGE
-testing "busybox --help busybox" "true | busybox --help busybox 2>&1 | cat" "$HELPDUMP\n\n" "" ""
+testing "busybox --help busybox" "true | busybox --help busybox 2>&1 | cat" "$HELPDUMP\n" "" ""
 SKIP=
 
 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" "$i 2>&1 | cat" "$HELPDUMP\n" "" ""
 
 	testing "$i unknown" "$i unknown 2>&1" \
 		"unknown: applet not found\n" "" ""
 
-	testing "$i --help" "$i --help 2>&1" "$HELPDUMP\n\n" "" ""
+	testing "$i --help" "$i --help 2>&1" "$HELPDUMP\n" "" ""
 
 	optional FEATURE_VERBOSE_USAGE 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" "" ""
+	testing "$i --help cat" "$i --help cat 2>&1 | grep Print" \
+		"Print FILEs to stdout\n" "" ""
 	SKIP=
 
 	testing "$i --help unknown" "$i --help unknown 2>&1" \