cleanup style ... just because you use less spaces doesnt mean the resulting code...

[oweals/busybox.git] / testsuite / runtest

diff --git a/testsuite/runtest b/testsuite/runtest
index 6ba334bcee0b863e99e4cc01c7bc49f46f374b4c..c1b1ec2f4ce5e59be5c66a21fde8ec923005264a 100755 (executable)
--- a/testsuite/runtest
+++ b/testsuite/runtest
@@ -37,7 +37,7 @@ run_applet_testcase ()
 
        if [ $? != 0 ] ; then
                echo FAIL: $testname
-               if [ "$verbose" = 1 ]; then
+               if [ $verbose -gt 0 ]; then
                        cat .logfile.txt
                        #exit 1;
                fi;
@@ -77,26 +77,58 @@ 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
 
+# Set up option flags so tests can be selective.
+
+configfile=${bindir:-../../}/.config
+export OPTIONFLAGS=:$(echo $(sed -nr 's/^CONFIG_(.*)=.*/\1/p' $configfile) | sed 's/ /:/')
+
 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
-done
 
+       # Is this a new-style test?
+       applet=$(echo "$applet" | sed -n 's/\.tests$//p')
+       if [ ${#applet} -ne 0 ]
+       then
+               appcfg=`grep -i "^# CONFIG_$applet" $configfile`
+               if [ -n "$appcfg" ]
+               then
+                       echo "SKIPPED: $applet (is configured out)"
+                       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" \
+                       "${srcdir:-.}/$applet".tests
+               if [ $? -ne 0 ]; then status=1; fi
+       fi
+
+done
+rm -f links/*
+rmdir links
 exit $status