diff options
Diffstat (limited to 'testprogs')
| -rwxr-xr-x | testprogs/blackbox/subunit.sh | 4 | ||||
| -rwxr-xr-x | testprogs/blackbox/test_kinit.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/testprogs/blackbox/subunit.sh b/testprogs/blackbox/subunit.sh index 7a6b21e540..100dfd1a46 100755 --- a/testprogs/blackbox/subunit.sh +++ b/testprogs/blackbox/subunit.sh @@ -56,12 +56,12 @@ 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 } diff --git a/testprogs/blackbox/test_kinit.sh b/testprogs/blackbox/test_kinit.sh index db4b65f327..d3cece0af7 100755 --- a/testprogs/blackbox/test_kinit.sh +++ b/testprogs/blackbox/test_kinit.sh @@ -23,7 +23,7 @@ samba4bindir=`dirname $0`/../../source/bin smbclient=$samba4bindir/smbclient samba4kinit=$samba4bindir/samba4kinit net=$samba4bindir/net -enableaccount="$samba4bindir/smbpython `dirname $0`/../../source/setup/enableaccount" +enableaccount="$PYTHON `dirname $0`/../../source/setup/enableaccount" . `dirname $0`/subunit.sh |