svn commit: trunk/busybox/testsuite
aldot at busybox.net
aldot at busybox.net
Thu May 25 13:24:04 UTC 2006
Author: aldot
Date: 2006-05-25 06:24:02 -0700 (Thu, 25 May 2006)
New Revision: 15167
Log:
make the testsuite a little less brittle:
- 'function fn_name\n{' breaks on older FreeBSD default shells, so use the more
widely supported 'fn_name () {'. This needs more fixing..
- test for integers ought to use the proper operators
- test for strings ought to use quoting of the strings to be fair to strange
implementations of test(1)
- make sure not to ignore return-codes != 0 from commands; Some shells exit
immediately on this (much like explicitely requesting set -e in e.g. bash)
TODO:
*) Some older shells do not allow a space after the test-condition in an "if"
statement. This doesn't work:
if [ $status -ne 0 ] ; then
as opposed to this:
if [ $status -ne 0 ]; then
or this
if [ $status -ne 0 ]
then
*) strict spacing between commands. In some shells you have to say:
foo ; bar ; baz
The affected shells barf on stuff like ommitting the space, so this doesn't
work:
foo; bar ;baz
*) $() vs. ``
The former isn't really portable as opposed to the latter.
*) fix frong assumption that the testsuite is run from the source-dir.
This is a complete misconception and renders the testsuite completely useless.
That said, i note that IMO a test-harness ought to do it's best to work in
a wide variety of environments, everything else defeats it's purpose.
Modified:
trunk/busybox/testsuite/runtest
trunk/busybox/testsuite/testing.sh
Changeset:
Modified: trunk/busybox/testsuite/runtest
===================================================================
--- trunk/busybox/testsuite/runtest 2006-05-24 18:26:46 UTC (rev 15166)
+++ trunk/busybox/testsuite/runtest 2006-05-25 13:24:02 UTC (rev 15167)
@@ -33,16 +33,15 @@
rm -rf tmp
mkdir -p tmp
- pushd tmp >/dev/null
+ pushd tmp > /dev/null
- d=$srcdir sh -x -e $testcase >.logfile.txt 2>&1
+ d=$srcdir sh -x -e $testcase >.logfile.txt 2>&1 || status=$?
- if [ $? != 0 ] ; then
+ if [ $status -ne 0 ] ; then
echo FAIL: $testname
if [ $verbose -gt 0 ]; then
cat .logfile.txt
- #exit 1;
- fi;
+ fi
status=$?
else
echo PASS: $testname
@@ -50,7 +49,7 @@
status=$?
fi
- popd >/dev/null
+ popd > /dev/null
rm -rf tmp
return $status
@@ -122,14 +121,18 @@
applet=$(echo "$applet" | sed -n 's/\.tests$//p')
if [ ${#applet} -ne 0 ]
then
- if [ ! -h "$LINKSDIR/$applet" ] && [ ${applet:0:4} != "all_" ]
+ if [ ! -h "$LINKSDIR/$applet" ] && [ "${applet:0:4}" != "all_" ]
then
echo "SKIPPED: $applet (not built)"
continue
fi
- PATH="$LINKSDIR":$srcdir:$bindir:$PATH \
+ if PATH="$LINKSDIR":$srcdir:$bindir:$PATH \
"${srcdir:-.}/$applet".tests
- if [ $? -ne 0 ]; then status=1; fi
+ then
+ :
+ else
+ status=1
+ fi
fi
done
Modified: trunk/busybox/testsuite/testing.sh
===================================================================
--- trunk/busybox/testsuite/testing.sh 2006-05-24 18:26:46 UTC (rev 15166)
+++ trunk/busybox/testsuite/testing.sh 2006-05-25 13:24:02 UTC (rev 15167)
@@ -37,7 +37,7 @@
# Helper functions
-optional()
+optional ()
{
option=`echo "$OPTIONFLAGS" | egrep "(^|:)$1(:|\$)"`
# Not set?
@@ -55,6 +55,7 @@
{
NAME="$1"
[ -z "$1" ] && NAME=$2
+ ret=0
if [ $# -ne 5 ]
then
@@ -76,12 +77,15 @@
echo -ne "$5" | eval "$2" > actual
RETVAL=$?
- cmp expected actual > /dev/null
- if [ $? -ne 0 ]
+ cmp expected actual > /dev/null || ret=$?
+ if [ $ret -ne 0 ]
then
FAILCOUNT=$[$FAILCOUNT+1]
echo "FAIL: $NAME"
- [ -n "$VERBOSE" ] && diff -u expected actual
+ if [ -n "$VERBOSE" ]
+ then
+ diff -u expected actual || /bin/true
+ fi
else
echo "PASS: $NAME"
fi
@@ -97,7 +101,7 @@
# the file is assumed to already be there and only its library dependencies
# are copied.
-function mkchroot
+mkchroot ()
{
[ $# -lt 2 ] && return
@@ -126,7 +130,7 @@
# Needed commands listed on command line
# Script fed to stdin.
-function dochroot
+dochroot ()
{
mkdir tmpdir4chroot
mount -t ramfs tmpdir4chroot tmpdir4chroot
More information about the busybox-cvs
mailing list