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

[oweals/busybox.git] / testsuite / testing.sh

diff --git a/testsuite/testing.sh b/testsuite/testing.sh
index 420cfa1efba4fcc729a73b6691031c86c4322fd0..c1002a6aa8c6c1f0ea245171ca82c4ae88542570 100755 (executable)
--- a/testsuite/testing.sh
+++ b/testsuite/testing.sh
@@ -4,10 +4,18 @@
 #
 # License is GPLv2, see LICENSE in the busybox tarball for full license text.
 
-# The "testing" function uses one environment variable:
-#      COMMAND = command to execute
+# This file defines two functions, "testing" and "optionflag"
+
+# The "testing" function must have the following environment variable set:
+#    COMMAND = command to execute
+#
+# The following environment variables may be set to enable optional behavior
+# in "testing":
+#    VERBOSE - Print the diff -u of each failed test case.
+#    DEBUG - Enable command tracing.
+#    SKIP - do not perform this test (this is set by "optionflag")
 #
-# The function takes five arguments:
+# The "testing" function takes five arguments:
 #      $1) Description to display when running command
 #      $2) Command line arguments to command"
 #      $3) Expected result (on stdout)"
@@ -17,30 +25,36 @@
 # The exit value of testing is the exit value of the command it ran.
 #
 # The environment variable "FAILCOUNT" contains a cumulative total of the
-# 
+# number of failed tests.
 
-# The command line parsing is ugly and should be improved.
-
-if [ "$1" == "-v" ]
-then
-  verbose=1
-fi
+# The "optional" function is used to skip certain tests, ala:
+#   optionflag CONFIG_FEATURE_THINGY
+#
+# The "optional" function checks the environment variable "OPTIONFLAGS",
+# which is either empty (in which case it always clears SKIP) or
+# else contains a colon-separated list of features (in which case the function
+# clears SKIP if the flag was found, or sets it to 1 if the flag was not found).
 
 export FAILCOUNT=0
+export SKIP=
 
 # Helper functions
 
-config_is_set ()
+optional()
 {
-  local uc_what=$(echo ${1?} | tr a-z A-Z)
-  grep -q "^[  ]*CONFIG_${uc_what}" ${bindir:-..}/.config || \
-    grep -q "^[        ]*BB_CONFIG_${uc_what}" ${bindir:-..}/.config
-  return $?
+  option="$OPTIONFLAGS" | egrep "(^|:)$1(:|\$)"
+  # Not set?
+  if [[ -z "$1" || -z "$OPTIONFLAGS" || ${#option} -ne 0 ]]
+  then
+    SKIP=""
+    return
+  fi
+  SKIP=1
 }
 
 # The testing function
 
-testing()
+testing ()
 {
   if [ $# -ne 5 ]
   then
@@ -48,16 +62,16 @@ testing()
     exit
   fi
 
-  if [ ${force_tests:-0} -ne 1 -a -n "$_BB_CONFIG_DEP" ]
+  if [ -n "$DEBUG" ] ; then
+    set -x
+  fi
+
+  if [ -n "$SKIP" ]
   then
-    if ! config_is_set "$_BB_CONFIG_DEP"
-    then
-      echo "UNTESTED: $1"
-      return 0
-    fi
+    echo "SKIPPED: $1"
+    return 0
   fi
 
-  f=$FAILCOUNT
   echo -ne "$3" > expected
   echo -ne "$4" > input
   echo -n -e "$5" | eval "$COMMAND $2" > actual
@@ -66,16 +80,21 @@ testing()
   cmp expected actual > /dev/null
   if [ $? -ne 0 ]
   then
-       FAILCOUNT=$[$FAILCOUNT+1]
-       echo "FAIL: $1"
-       if [ $verbose ]
-       then
-               diff -u expected actual
-       fi
+    FAILCOUNT=$[$FAILCOUNT+1]
+    echo "FAIL: $1"
+    if [ -n "$VERBOSE" ]
+    then
+      diff -u expected actual
+    fi
   else
-       echo "PASS: $1"
+    echo "PASS: $1"
   fi
   rm -f input expected actual
 
+  if [ -n "$DEBUG" ]
+  then
+    set +x
+  fi
+
   return $RETVAL
 }