Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/testsuite/busybox.tests

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/testsuite/busybox.tests (modified) (2 diffs)

branches/2.2.9/mindi-busybox/testsuite/busybox.tests

@@ -3 +3 @@
 # 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
 
-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
@@ -27 +28 @@
     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" \