summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley2006-03-16 16:02:06 +0000
committerRob Landley2006-03-16 16:02:06 +0000
commit2824ded677802d8afd99d5d17543665491803486 (patch)
tree91e8c038b5c9f693067a1346784bcba69d023ba6
parent4bb1b04fd1d7d6fe410e1af14816d11da456aac5 (diff)
downloadbusybox-2824ded677802d8afd99d5d17543665491803486.zip
busybox-2824ded677802d8afd99d5d17543665491803486.tar.gz
More test updates.
-rwxr-xr-xtestsuite/runtest31
-rwxr-xr-xtestsuite/seq.tests25
2 files changed, 30 insertions, 26 deletions
diff --git a/testsuite/runtest b/testsuite/runtest
index b1f07fb..b8c6c77 100755
--- a/testsuite/runtest
+++ b/testsuite/runtest
@@ -4,7 +4,9 @@
[ -n "$bindir" ] || bindir=$(dirname $(pwd))
PATH=$bindir:$PATH
-run_applet_testcase ()
+# Run old-style test.
+
+function run_applet_testcase
{
local applet=$1
local testcase=$2
@@ -91,6 +93,16 @@ else
applets=$(ls $srcdir)
fi
+# Populate a directory with links to all busybox applets
+
+LINKSDIR="${bindir}/runtest-tempdir-links"
+rm -rf "$LINKSDIR" 2>/dev/null
+mkdir "$LINKSDIR"
+for i in $(sed 's@/[a-z0-9/\[]*/@@' $bindir/busybox.links)
+do
+ ln -s $bindir/busybox "$LINKSDIR"/$i
+done
+
# Set up option flags so tests can be selective.
configfile=${bindir:-../../}/.config
@@ -110,25 +122,16 @@ for applet in $applets; do
applet=$(echo "$applet" | sed -n 's/\.tests$//p')
if [ ${#applet} -ne 0 ]
then
- appcfg=`grep -i "^# CONFIG_$applet" $configfile`
- if [ -n "$appcfg" ]
+ if [ ! -h "$LINKSDIR/$applet" ]
then
- echo "SKIPPED: $applet (is configured out)"
+ echo "SKIPPED: $applet (not built)"
continue
fi
- # Setup environment for test.
- if [ -d links ]; then
- rm -f links/"$applet"
- else
- mkdir links 2> /dev/null
- fi
- ln -s ${bindir:-../..}/busybox links/"$applet"
- PATH="$srcdir:$PATH" COMMAND="links/$applet" \
+ PATH="$LINKSDIR":$srcdir:$bindir:$PATH \
"${srcdir:-.}/$applet".tests
if [ $? -ne 0 ]; then status=1; fi
fi
done
-rm -f links/*
-rmdir links
+rm -rf "$LINKSDIR"
exit $status
diff --git a/testsuite/seq.tests b/testsuite/seq.tests
index b40a6b5..fd6f33a 100755
--- a/testsuite/seq.tests
+++ b/testsuite/seq.tests
@@ -15,17 +15,18 @@
# Test exit status
-testing "seq (exit with error)" "2> /dev/null || echo yes" "yes\n" "" ""
-testing "seq (exit with error)" "1 2 3 4 2> /dev/null || echo yes" "yes\n" "" ""
-testing "seq one argument" "3" "1\n2\n3\n" "" ""
-testing "seq two arguments" "5 7" "5\n6\n7\n" "" ""
-testing "seq two arguments reversed" "7 5" "" "" ""
-testing "seq count up by 2" "4 2 8" "4\n6\n8\n" "" ""
-testing "seq count down by 2" "8 -2 4" "8\n6\n4\n" "" ""
-testing "seq count wrong way #1" "4 -2 8" "" "" ""
-testing "seq count wrong way #2" "8 2 4" "" "" ""
-testing "seq count by .3" "3 .3 4" "3\n3.3\n3.6\n3.9\n" "" ""
-testing "seq count by -.9" ".7 -.9 -2.2" "0.7\n-0.2\n-1.1\n-2\n" "" ""
-testing "seq count by zero" "4 0 8 | head -n 10" "" "" ""
+testing "seq (exit with error)" "seq 2> /dev/null || echo yes" "yes\n" "" ""
+testing "seq (exit with error)" "seq 1 2 3 4 2> /dev/null || echo yes" \
+ "yes\n" "" ""
+testing "seq one argument" "seq 3" "1\n2\n3\n" "" ""
+testing "seq two arguments" "seq 5 7" "5\n6\n7\n" "" ""
+testing "seq two arguments reversed" "seq 7 5" "" "" ""
+testing "seq count up by 2" "seq 4 2 8" "4\n6\n8\n" "" ""
+testing "seq count down by 2" "seq 8 -2 4" "8\n6\n4\n" "" ""
+testing "seq count wrong way #1" "seq 4 -2 8" "" "" ""
+testing "seq count wrong way #2" "seq 8 2 4" "" "" ""
+testing "seq count by .3" "seq 3 .3 4" "3\n3.3\n3.6\n3.9\n" "" ""
+testing "seq count by -.9" "seq .7 -.9 -2.2" "0.7\n-0.2\n-1.1\n-2\n" "" ""
+testing "seq count by zero" "seq 4 0 8 | head -n 10" "" "" ""
exit $FAILCOUNT