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 2e8d391e04be5062fc111aeec97b20d0b920b04c..c1b1ec2f4ce5e59be5c66a21fde8ec923005264a 100755 (executable)
--- a/testsuite/runtest
+++ b/testsuite/runtest
@@ -1,23 +1,8 @@
 #!/bin/sh
 
-PATH=$(dirname $(pwd)):$PATH
-
-show_result ()
-{
-       local resolution=$1
-       local testcase=$2
-       local status=0
-
-       if [ $resolution = UPASS -o $resolution = FAIL ]; then
-               status=1
-       fi
-
-       if [ "$verbose" -o $status -eq 1 ]; then
-               echo "$resolution: $testcase"
-       fi
-
-       return $status
-}
+[ -n "$srcdir" ] || srcdir=$(pwd)
+[ -n "$bindir" ] || bindir=$(dirname $(pwd))
+PATH=$bindir:$PATH
 
 run_applet_testcase ()
 {
@@ -25,40 +10,42 @@ run_applet_testcase ()
        local testcase=$2
 
        local status=0
-       local U=
-       local X=
+       local RES=
 
        local uc_applet=$(echo $applet | tr a-z A-Z)
        local testname=$(basename $testcase)
 
-       if grep -q "^# CONFIG_${uc_applet} is not set$" ../.config; then
-               show_result UNSUPPORTED $testname
+       if grep -q "^# CONFIG_${uc_applet} is not set$" $bindir/.config; then
+               echo UNTESTED: $testname
                return 0
        fi
 
-       if grep -q "^# UNSUPPORTED: " $testcase; then
-               local feature=`sed -ne 's/.*UNSUPPORTED: //p' $testcase`
+       if grep -q "^# FEATURE: " $testcase; then
+               local feature=`sed -ne 's/^# FEATURE: //p' $testcase`
 
-               if grep -q "^# ${feature} is not set$" ../.config; then
-                       show_result UNSUPPORTED $testname
+               if grep -q "^# ${feature} is not set$" $bindir/.config; then
+                       echo UNTESTED: $testname
                        return 0
                fi
        fi
 
-       if grep -q "^# XFAIL$" $testcase; then
-               U=U
-               X=X
-       fi
-
-       mkdir tmp
+       rm -rf tmp
+       mkdir -p tmp
        pushd tmp >/dev/null
 
-       if . ../$testcase >/dev/null 2>&1; then
-               show_result ${U}PASS $testname
-               status=$!
+       d=$srcdir sh -x -e $testcase >.logfile.txt 2>&1
+
+       if [ $? != 0 ] ; then
+               echo FAIL: $testname
+               if [ $verbose -gt 0 ]; then
+                       cat .logfile.txt
+                       #exit 1;
+               fi;
+               status=$?
        else
-               show_result ${X}FAIL $testname
-               status=$!
+               echo PASS: $testname
+               rm -f .logfile.txt
+               status=$?
        fi
 
        popd >/dev/null
@@ -73,8 +60,8 @@ run_applet_tests ()
 
        local status=0
 
-       for testcase in $applet/*; do
-               if [ "$testcase" = "$applet/CVS" ]; then
+       for testcase in $srcdir/$applet/*; do
+               if [ "$testcase" = "$srcdir/$applet/CVS" ]; then
                        continue
                fi
 
@@ -90,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="*"
+       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 "$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