diff options
Diffstat (limited to 'source3/script/tests/tests_all.sh')
| -rwxr-xr-x | source3/script/tests/tests_all.sh | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh index dd593899e4..d001569c08 100755 --- a/source3/script/tests/tests_all.sh +++ b/source3/script/tests/tests_all.sh @@ -1,13 +1,7 @@ +#!/bin/sh +SCRIPTDIR=`dirname $0` +. $SCRIPTDIR/test_functions.sh -$SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?` -$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?` -$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?` - -SMBTORTURE4VERSION=`$SMBTORTURE4 --version` -if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then - echo "Running Tests with Samba4's smbtorture" - echo $SMBTORTURE4VERSION - $SCRIPTDIR/test_posix_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?` -else - echo "Skip Tests with Samba4's smbtorture" -fi +$SCRIPTDIR/test_local_s3.sh +$SCRIPTDIR/test_smbtorture_s3.sh +plantest "smbclient" dc $SCRIPTDIR/test_smbclient_s3.sh \$SERVER \$SERVER_IP |