Patch from Kent Robotti to being fdisk in sync with v2.12 final.

[oweals/busybox.git] / testsuite / runtest

diff --git a/testsuite/runtest b/testsuite/runtest
index 2e8d391e04be5062fc111aeec97b20d0b920b04c..2cf85f5d8ee48cdb7f597c35ff25388876f71d07 100755 (executable)
--- a/testsuite/runtest
+++ b/testsuite/runtest
@@ -8,7 +8,7 @@ show_result ()
        local testcase=$2
        local status=0
 
-       if [ $resolution = UPASS -o $resolution = FAIL ]; then
+       if [ $resolution = XPASS -o $resolution = FAIL ]; then
                status=1
        fi
 
@@ -25,28 +25,26 @@ run_applet_testcase ()
        local testcase=$2
 
        local status=0
-       local U=
        local X=
 
        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
+               show_result 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
+                       show_result UNTESTED $testname
                        return 0
                fi
        fi
 
        if grep -q "^# XFAIL$" $testcase; then
-               U=U
                X=X
        fi
 
@@ -54,11 +52,11 @@ run_applet_testcase ()
        pushd tmp >/dev/null
 
        if . ../$testcase >/dev/null 2>&1; then
-               show_result ${U}PASS $testname
-               status=$!
+               show_result ${X}PASS $testname
+               status=$?
        else
                show_result ${X}FAIL $testname
-               status=$!
+               status=$?
        fi
 
        popd >/dev/null