summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-06-03 09:51:59 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:17:18 -0500
commitfd1b550851d9b6c91e5c20a692572d454e61d618 (patch)
tree485cb4bd43922a0527a2703f7432463adb309f31
parent863aa313c161d206aba8ca3659607a141b8ea83b (diff)
downloadsamba-fd1b550851d9b6c91e5c20a692572d454e61d618.tar.gz
samba-fd1b550851d9b6c91e5c20a692572d454e61d618.tar.bz2
samba-fd1b550851d9b6c91e5c20a692572d454e61d618.zip
r16025: make sure the samba4's smbtorture can be executed
metze (This used to be commit bed220afb816138a3e806c5d20e812667f6994ae)
-rwxr-xr-xsource3/script/tests/tests_all.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index 64a7065ee9..059f9d1a37 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -2,9 +2,10 @@
$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
-if [ -n "$SMBTORTURE4" ];then
+SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
+if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
echo "Running Tests with Samba4's smbtorture"
- $SMBTORTURE4 --version
+ echo $SMBTORTURE4VERSION
$SCRIPTDIR/test_posix_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
else
echo "Skip Tests with Samba4's smbtorture"