aboutsummaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-02-25 00:40:37 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-02-25 00:40:37 +0000
commit018e085d44206305f1d20e0111236f96f8d78c80 (patch)
tree148484a341996d5f6fb12e336505624aafc5bcf6 /testsuite
parent629563b5d7baee9a2008cd102924be6d55321bb7 (diff)
downloadbusybox-018e085d44206305f1d20e0111236f96f8d78c80.tar.gz
busybox-018e085d44206305f1d20e0111236f96f8d78c80.tar.bz2
stop using bash'isms ('function')
runtest: do not depend on busybox.links
Diffstat (limited to 'testsuite')
-rwxr-xr-xtestsuite/runtest24
1 files changed, 17 insertions, 7 deletions
diff --git a/testsuite/runtest b/testsuite/runtest
index 84cd6a7f3..279f51fbd 100755
--- a/testsuite/runtest
+++ b/testsuite/runtest
@@ -6,7 +6,7 @@ PATH=$bindir:$PATH
# Run old-style test.
-function run_applet_testcase
+run_applet_testcase()
{
local applet=$1
local testcase=$2
@@ -55,7 +55,7 @@ function run_applet_testcase
return $status
}
-run_applet_tests ()
+run_applet_tests()
{
local applet=$1
@@ -94,10 +94,20 @@ fi
# Populate a directory with links to all busybox applets
-LINKSDIR="${bindir}/runtest-tempdir-links"
+LINKSDIR="$bindir/runtest-tempdir-links"
+implemented=$($bindir/busybox 2>&1 |
+ while read line
+ do
+ if test x"$line" = x"Currently defined functions:"
+ then
+ xargs | sed 's/,//g'
+ break
+ fi
+ done
+ )
rm -rf "$LINKSDIR" 2>/dev/null
mkdir "$LINKSDIR"
-for i in $(sed 's@/[a-z0-9/\[]*/@@' $bindir/busybox.links 2>/dev/null)
+for i in $implemented
do
ln -s $bindir/busybox "$LINKSDIR"/$i
done
@@ -127,11 +137,11 @@ for applet in $applets; do
continue
fi
if PATH="$LINKSDIR":$srcdir:$bindir:$PATH \
- "${srcdir:-.}/$applet".tests
+ "${srcdir:-.}/$applet".tests
then
- :
+ :
else
- status=1
+ status=1
fi
fi