summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarolin Seeger <kseeger@samba.org>2008-05-13 14:01:52 +0200
committerKarolin Seeger <kseeger@samba.org>2008-05-13 14:17:59 +0200
commit5d6528e44fc49924b99ac9b49db298d5fa6ac920 (patch)
treee828108cfd5c8b69c81f359d7fb3a505b0d56d9a
parent0559d923ec752331bade6797a9f05d30d652beb7 (diff)
downloadsamba-5d6528e44fc49924b99ac9b49db298d5fa6ac920.tar.gz
samba-5d6528e44fc49924b99ac9b49db298d5fa6ac920.tar.bz2
samba-5d6528e44fc49924b99ac9b49db298d5fa6ac920.zip
tests_all.sh: Do not execute $SMB4TORTURE --version if it is not available.
Improve error message if no SMB4TORTURE is available. Karolin (This used to be commit 443691eb2614919043406f94e9c71b49230612d5)
-rwxr-xr-xsource3/script/tests/tests_all.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index 5a6b4678b1..fa62a5129c 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -52,7 +52,9 @@ posix_s3() {
echo "RUNNING TESTS posix_s3"
eval "$LIB_PATH_VAR="\$SAMBA4SHAREDDIR:\$$LIB_PATH_VAR"; export $LIB_PATH_VAR"
eval echo "$LIB_PATH_VAR=\$$LIB_PATH_VAR"
- SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
+ if [ -x "$SMBTORTURE4" ]; then
+ SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
+ fi
if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
echo "Running Tests with Samba4's smbtorture"
echo $SMBTORTURE4VERSION
@@ -61,6 +63,7 @@ posix_s3() {
|| failed=`expr $failed + $?`
else
echo "Skip Tests with Samba4's smbtorture"
+ echo "Try to compile with --with-smbtorture4-path=PATH to enable"
fi
}