find:: get rid of nested function (it's a gcc-ism)

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

diff --git a/testsuite/busybox.tests b/testsuite/busybox.tests
index 30d96f946664e34b34ca26101226ca47e03b2366..04fea3ea24e2e4f0befb28ca31979787ae4c674a 100755 (executable)
--- a/testsuite/busybox.tests
+++ b/testsuite/busybox.tests
@@ -2,28 +2,17 @@
 
 # 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.
 
-. testing.sh
+. ./testing.sh
 
-# verify the applet order is correct in applets.h, otherwise applets won't
-# be called properly.
-#sed -n -e '/^USE_^\tAPPLET/{s:.*(::;s:,.*::;s:"::g;p}' 
-#      ../include/applets.h > applet.order1
-#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
-
-
-
-
-HELPDUMP=`busybox`
+HELPDUMP=`true | busybox 2>&1 | cat`
 
 # We need to test under calling the binary under other names.
 
-
-testing "busybox --help busybox" "busybox --help busybox" "$HELPDUMP\n\n" "" ""
+optional FEATURE_VERBOSE_USAGE
+testing "busybox --help busybox" "true | busybox --help busybox 2>&1 | cat" "$HELPDUMP\n\n" "" ""
+SKIP=
 
 ln -s `which busybox` busybox-suffix
 for i in busybox ./busybox-suffix
@@ -38,11 +27,11 @@ do
 
        testing "$i --help" "$i --help 2>&1" "$HELPDUMP\n\n" "" ""
 
-       optional CAT
+       optional FEATURE_VERBOSE_USAGE CAT
        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 cat" "$i --help cat 2>&1 | grep print" \
+               "Concatenate FILEs and print them to stdout\n" "" ""
+       SKIP=
 
        testing "$i --help unknown" "$i --help unknown 2>&1" \
                "unknown: applet not found\n" "" ""