testprogs/blackbox: use subunit_ helper functions in test_smbclient_*

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12709

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/testprogs/blackbox/common_test_fns.inc b/testprogs/blackbox/common_test_fns.inc
index aff1aa9dc79e26a3c6c499b93d46510af97a7e21..7e54c67377771da79b16d99fb6583a7561da97e5 100755 (executable)
--- a/testprogs/blackbox/common_test_fns.inc
+++ b/testprogs/blackbox/common_test_fns.inc
@@ -8,13 +8,13 @@ test_smbclient() {
        shift
        shift
        shift
-       echo "test: $name"
-       $VALGRIND $smbclient $CONFIGURATION "$unc" -c "$cmd" $@
+       subunit_start_test "$name"
+       output=`$VALGRIND $smbclient $CONFIGURATION "$unc" -c "$cmd" $@ 2>&1`
        status=$?
        if [ x$status = x0 ]; then
-               echo "success: $name"
+               subunit_pass_test "$name"
        else
-               echo "failure: $name"
+               echo "$output" | subunit_fail_test "$name"
        fi
        return $status
 }
@@ -26,13 +26,13 @@ test_smbclient_expect_failure() {
        shift
        shift
        shift
-       echo "test: $name"
-       $VALGRIND $smbclient $CONFIGURATION "$unc" -c "$cmd" $@
+       subunit_start_test "$name"
+       output=`$VALGRIND $smbclient $CONFIGURATION "$unc" -c "$cmd" $@ 2>&1`
        status=$?
        if [ x$status = x0 ]; then
-               echo "failure: $name"
+               echo "$output" | subunit_fail_test "$name"
        else
-               echo "success: $name"
+               subunit_pass_test "$name"
        fi
        return $status
 }