Use metze's approach.

(This used to be commit 126cc075995ffaeb65317627acae05c1b96cebd0)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 2214292854dfede40ff194c2b8d1d2dcdc4ed750..b10425b934095215da7cf4258ed8bdd641fc5ccc 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2161,11 +2161,11 @@ test_pam_modules: pam_modules
 ##
 test: all torture timelimit
        @echo Running Test suite
-       @$(LIB_PATH_VAR)=`dirname ${smbtorture4_path}`/shared PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix}/st all "${smbtorture4_path}"
+       @LIB_PATH_VAR=$(LIB_PATH_VAR) PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix}/st all "${smbtorture4_path}"
 
 valgrindtest: all torture timelimit
        @echo Running Test suite with valgrind
-       @$(LIB_PATH_VAR)=`dirname ${smbtorture4_path}`/shared \
+       @LIB_PATH_VAR=$(LIB_PATH_VAR) \
         NMBD_VALGRIND="xterm -n nmbd -e valgrind -q --db-attach=yes --num-callers=30" \
         WINBINDD_VALGRIND="xterm -n winbindd -e valgrind -q --db-attach=yes --num-callers=30" \
         SMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes --num-callers=30" \

diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index 2edc0250175c748a5690ccdedb3dc253f7f2d26b..3871b3394463fb8cfc89e1cfa78cf26c9e92efd2 100755 (executable)
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -1,4 +1,3 @@
-
 $SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?`
 $SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
 echo "Testing encrypted"
@@ -8,9 +7,8 @@ echo "Testing encrypted"
 $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP "-e" || 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
+eval "$LIB_PATH_VAR="\$SAMBA4SHAREDDIR:\$LIB_PATH_VAR"; export $LIB_PATH_VAR"
+echo "$LIB_PATH_VAR=$LD_LIBRARY_PATH"
 SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
 if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
        echo "Running Tests with Samba4's smbtorture"
@@ -19,3 +17,4 @@ if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
 else
        echo "Skip Tests with Samba4's smbtorture"
 fi
+