fix testing of busybox "applet" itself

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-01-16 02:49:40 +01:00
parent 1e9bc2603d
commit e208279722
2 changed files with 5 additions and 4 deletions

View File

@ -6,12 +6,12 @@
. ./testing.sh . ./testing.sh
HELPDUMP=`busybox` HELPDUMP=`true | busybox 2>&1 | cat`
# We need to test under calling the binary under other names. # 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 ln -s `which busybox` busybox-suffix
for i in busybox ./busybox-suffix for i in busybox ./busybox-suffix
@ -28,8 +28,8 @@ do
optional CAT optional CAT
testing "" "$i cat" "moo" "" "moo" testing "" "$i cat" "moo" "" "moo"
testing "$i --help cat" "$i --help cat 2>&1 | grep prints" \ testing "$i --help cat" "$i --help cat 2>&1 | grep print" \
"Concatenates FILE(s) and prints them to stdout.\n" "" "" "Concatenate FILEs and print them to stdout\n" "" ""
optional "" optional ""
testing "$i --help unknown" "$i --help unknown 2>&1" \ testing "$i --help unknown" "$i --help unknown 2>&1" \

View File

@ -92,6 +92,7 @@ if [ x"$1" = x"-v" ]; then
fi fi
implemented=$( implemented=$(
printf "busybox " # always implemented
"$bindir/busybox" 2>&1 | "$bindir/busybox" 2>&1 |
while read line; do while read line; do
if [ x"$line" = x"Currently defined functions:" ]; then if [ x"$line" = x"Currently defined functions:" ]; then