ifupdown: save some 100+ bytes of code in addstr()

[oweals/busybox.git] / testsuite / runtest

diff --git a/testsuite/runtest b/testsuite/runtest
index 6a0dc9d3e68af2ed50dc34d2dd05dfb65ee4aadd..84cd6a7f3f879afef9798dd66ae474a0c174bd05 100755 (executable)
--- 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
@@ -31,16 +33,15 @@ run_applet_testcase ()
 
        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" = 1 ]; then
+               if [ $verbose -gt 0 ]; then
                        cat .logfile.txt
-                       #exit 1;
-               fi;
+               fi
                status=$?
        else
                echo PASS: $testname
@@ -48,7 +49,7 @@ run_applet_testcase ()
                status=$?
        fi
 
-       popd >/dev/null
+       popd > /dev/null
        rm -rf tmp
 
        return $status
@@ -77,36 +78,63 @@ run_applet_tests ()
 
 
 status=0
+verbose=0
 
 if [ x"$1" = x"-v" ]; then
        verbose=1
+       export VERBOSE=$verbose
        shift
 fi
 
 if [ $# -ne 0 ]; then
-       applets="$@"
+       applets=$(cd $srcdir ; for i in $@; do ls ${i}* ; done)
 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 2>/dev/null)
+do
+       ln -s $bindir/busybox "$LINKSDIR"/$i
+done
+
+# Set up option flags so tests can be selective.
+
+configfile=${bindir:-../../}/.config
+export OPTIONFLAGS=:$(echo $(sed -nr 's/^CONFIG_(.*)=.*/\1/p' $configfile) | sed 's/ /:/g')
+
 for applet in $applets; do
-       if [ "$applet" != CVS -a -d "$srcdir/$applet" ]; then
+       if [ "$applet" = "links" ]; then continue; fi
+       if [ "$applet" != "CVS" -a -d "$srcdir/$applet" ]; then
                if run_applet_tests $applet; then
                        :
                else
                        status=1
                fi
        fi
-       applet=`echo "$applet" | sed -n 's/\.tests$//p'`
-       if [ ${#applet} != 0 ]
+
+       # Is this a new-style test?
+       applet=$(echo "$applet" | sed -n 's/\.tests$//p')
+       if [ ${#applet} -ne 0 ]
        then
-               rm -f links/"$applet"
-               ln -s ../../busybox links/"$applet"
-               PATH=links:$PATH ./"$applet".tests
-               if [ $? -ne 0 ]; then status=1; fi
+               if [ ! -h "$LINKSDIR/$applet" ] && [ "${applet:0:4}" != "all_" ]
+               then
+                       echo "SKIPPED: $applet (not built)"
+                       continue
+               fi
+               if PATH="$LINKSDIR":$srcdir:$bindir:$PATH \
+                       "${srcdir:-.}/$applet".tests
+               then
+                 :
+               else
+                 status=1
+               fi
        fi
 
-
 done
-
+rm -rf "$LINKSDIR"
 exit $status