diff options
| author | Karolin Seeger <kseeger@samba.org> | 2008-05-13 14:01:52 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-06-23 14:19:06 +0200 |
| commit | e8611cb56675259749dcaa51645f9956d1612caa (patch) | |
| tree | d662dfdb2f19b9576bd37007e5fb509752b0089d | |
| parent | e59cffb75e29270ba0f566d743e18090132c85ea (diff) | |
| download | samba-e8611cb56675259749dcaa51645f9956d1612caa.tar.gz | |
tests_all.sh: Do not execute $SMB4TORTURE --version if it is not available.
Improve error message if no SMB4TORTURE is available.
Karolin
(cherry picked from commit 443691eb2614919043406f94e9c71b49230612d5)
(cherry picked from commit 4de981e5174dffd9a21431017cfa75fc73910b48)
| -rwxr-xr-x | source/script/tests/tests_all.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/script/tests/tests_all.sh b/source/script/tests/tests_all.sh index 5a6b4678b1a..fa62a5129cc 100755 --- a/source/script/tests/tests_all.sh +++ b/source/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 } |