msh: aliased to hush

[oweals/busybox.git] / testsuite / runtest

diff --git a/testsuite/runtest b/testsuite/runtest
index d9de8799f66e3ed4f6b2920a32d029fb85f0f870..3ff4b96dab64a3e936aa543b238d2e6cefaca1ad 100755 (executable)
--- a/testsuite/runtest
+++ b/testsuite/runtest
@@ -1,8 +1,9 @@
 #!/bin/sh
-
 # Usage:
 # runtest [applet1] [applet2...]
 
+. ./testing.sh
+
 # Run one old-style test.
 # Tests are stored in applet/testcase shell scripts.
 # They are run using "sh -x -e applet/testcase".
@@ -12,7 +13,7 @@ run_applet_testcase()
        local applet="$1"
        local testcase="$2"
 
-       local status
+       local status=0
        local uc_applet=$(echo "$applet" | tr a-z A-Z)
        local testname="$testcase"
 
@@ -36,8 +37,8 @@ run_applet_testcase()
        cd ".tmpdir.$applet" || return 1
 
 #      echo "Running testcase $testcase"
-       d="$tsdir" sh -x -e "$testcase" >"$testname.stdout.txt" 2>&1
-       status=$?
+       d="$tsdir" \
+               sh -x -e "$testcase" >"$testname.stdout.txt" 2>&1 || status=$?
        if [ $status -ne 0 ]; then
                echo "FAIL: $testname"
                if [ x"$VERBOSE" != x ]; then
@@ -69,8 +70,7 @@ run_oldstyle_applet_tests()
                        *.mine) continue ;;    # svn-produced junk
                        *.r[0-9]*) continue ;; # svn-produced junk
                esac
-               run_applet_testcase "$applet" "$testcase"
-               test $? -eq 0 || status=1
+               run_applet_testcase "$applet" "$testcase" || status=1
        done
        return $status
 }
@@ -109,10 +109,17 @@ fi
 # Populate a directory with links to all busybox applets
 
 LINKSDIR="$bindir/runtest-tempdir-links"
+
+# Comment this line out if you have put a different binary in $LINKSDIR
+# (say, a "standard" tool's binary) in order to run tests against it:
 rm -rf "$LINKSDIR" 2>/dev/null
-mkdir "$LINKSDIR"
+
+mkdir "$LINKSDIR" 2>/dev/null
 for i in $implemented; do
-       ln -s "$bindir/busybox" "$LINKSDIR/$i"
+       # Note: if $LINKSDIR/applet exists, we do not overwrite it.
+       # Useful if one wants to run tests against a standard utility,
+       # not an applet.
+       ln -s "$bindir/busybox" "$LINKSDIR/$i" 2>/dev/null
 done
 
 # Set up option flags so tests can be selective.
@@ -125,13 +132,12 @@ status=0
 for applet in $applets; do
        # Any old-style tests for this applet?
        if [ -d "$tsdir/$applet" ]; then
-               run_oldstyle_applet_tests "$applet"
-               test $? -eq 0 || status=1
+               run_oldstyle_applet_tests "$applet" || status=1
        fi
 
        # Is this a new-style test?
        if [ -f "$applet.tests" ]; then
-               if [ ! -h "$LINKSDIR/$applet" ]; then
+               if [ ! -e "$LINKSDIR/$applet" ]; then
                        # (avoiding bash'ism "${applet:0:4}")
                        if ! echo "$applet" | grep "^all_" >/dev/null; then
                                echo "SKIPPED: $applet (not built)"
@@ -139,8 +145,8 @@ for applet in $applets; do
                        fi
                fi
 #              echo "Running test $tsdir/$applet.tests"
-               PATH="$LINKSDIR:$tsdir:$bindir:$PATH" "$tsdir/$applet.tests"
-               test $? -eq 0 || status=1
+               PATH="$LINKSDIR:$tsdir:$bindir:$PATH" \
+                       "$tsdir/$applet.tests" || status=1
        fi
 done