From 4e53afccb1470b8d889f7300ad77a497f38ed418 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sun, 23 Dec 2007 20:09:16 +0100
Subject: selftest: also export LD_LIBRARY_PATH for samba4's smbtorture

metze
(This used to be commit f5570dcf503a4b28ebf624d06fd090f3b6b0a560)
---
 source3/script/tests/selftest.sh  | 13 +++++++++++--
 source3/script/tests/tests_all.sh |  3 +++
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'source3/script')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index d4264bab8c..86abb15ed1 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -62,7 +62,6 @@ export PATH SOCKET_WRAPPER_DIR DOMAIN
 export PRIVATEDIR LIBDIR PIDDIR LOCKDIR LOGDIR SERVERCONFFILE
 export SRCDIR SCRIPTDIR BINDIR
 export USERNAME PASSWORD
-export SMBTORTURE4
 export WORKGROUP SERVER SERVER_IP
 export NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
 export WINBINDD_SOCKET_DIR WINBINDD_PRIV_PIPE_DIR
@@ -70,10 +69,20 @@ export WINBINDD_SOCKET_DIR WINBINDD_PRIV_PIPE_DIR
 PATH=bin:$PATH
 export PATH
 
-LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"$BINDIR"
+if test x"$LD_LIBRARY_PATH" != x""; then
+	LD_LIBRARY_PATH="$BINDIR:$LD_LIBRARY_PATH"
+else
+	LD_LIBRARY_PATH="$BINDIR"
+fi
 echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
 export LD_LIBRARY_PATH
 
+SAMBA4BINDIR=`dirname $SMBTORTURE4`
+SAMBA4SHAREDDIR="$SAMBA4BINDIR/shared"
+
+export SAMBA4SHAREDDIR
+export SMBTORTURE4
+
 ##
 ## verify that we were built with --enable-socket-wrapper
 ##
diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index 12789aa926..109e9c2920 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -4,6 +4,9 @@ $SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || fail
 $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
 $SCRIPTDIR/test_wbinfo_s3.sh $WORKGROUP $SERVER $USERNAME $PASSWORD || failed=`expr $failed + $?`
 
+LD_LIBRARY_PATH="$SAMBA4SHAREDDIR:$LD_LIBRARY_PATH"
+echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH
 SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
 if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
 	echo "Running Tests with Samba4's smbtorture"
-- 
cgit