testprogs:subunit.sh: Add function for expected failures.

[ira/wip.git] / testprogs / blackbox / subunit.sh

diff --git a/testprogs/blackbox/subunit.sh b/testprogs/blackbox/subunit.sh
index 7a6b21e540e25936f37448fe8772ce0784c54d1f..e16aee76caa7aaa21f3980768485a2f22985348c 100755 (executable)
--- a/testprogs/blackbox/subunit.sh
+++ b/testprogs/blackbox/subunit.sh
@@ -56,12 +56,27 @@ testit () {
        shift
        cmdline="$*"
        subunit_start_test "$name"
-       $cmdline
+       output=`$cmdline 2>&1`
        status=$?
        if [ x$status = x0 ]; then
                subunit_pass_test "$name"
        else
-               subunit_fail_test "$name"
+               echo "$output" | subunit_fail_test "$name"
+       fi
+       return $status
+}
+
+testit_expect_failure () {
+       name="$1"
+       shift
+       cmdline="$*"
+       subunit_start_test "$name"
+       output=`$cmdline 2>&1`
+       status=$?
+       if [ x$status = x0 ]; then
+               echo "$output" | subunit_fail_test "$name"
+       else
+               subunit_pass_test "$name"
        fi
        return $status
 }