diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-16 02:49:40 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-16 02:49:40 +0100 |
| commit | e208279722a7dc874b02e7ebf456667f26d6c8e2 (patch) | |
| tree | 83202f26c33304dc7b4f1fa777b7af140d566754 | |
| parent | 1e9bc2603dc6c9dc282058056e1c28bd817da488 (diff) | |
fix testing of busybox "applet" itself
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rwxr-xr-x | testsuite/busybox.tests | 8 | ||||
| -rwxr-xr-x | testsuite/runtest | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/testsuite/busybox.tests b/testsuite/busybox.tests index 7c44b1ed6..6eeb3251d 100755 --- a/testsuite/busybox.tests +++ b/testsuite/busybox.tests @@ -6,12 +6,12 @@ . ./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" "" "" +testing "busybox --help busybox" "true | busybox --help busybox 2>&1 | cat" "$HELPDUMP\n\n" "" "" ln -s `which busybox` busybox-suffix for i in busybox ./busybox-suffix @@ -28,8 +28,8 @@ do optional 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" "" "" + testing "$i --help cat" "$i --help cat 2>&1 | grep print" \ + "Concatenate FILEs and print them to stdout\n" "" "" optional "" testing "$i --help unknown" "$i --help unknown 2>&1" \ diff --git a/testsuite/runtest b/testsuite/runtest index 3ff4b96da..10563d7b2 100755 --- a/testsuite/runtest +++ b/testsuite/runtest @@ -92,6 +92,7 @@ if [ x"$1" = x"-v" ]; then fi implemented=$( + printf "busybox " # always implemented "$bindir/busybox" 2>&1 | while read line; do if [ x"$line" = x"Currently defined functions:" ]; then |