diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/samba4.mk | 3 | ||||
| -rwxr-xr-x | source3/script/tests/selftest.sh | 16 |
2 files changed, 10 insertions, 9 deletions
diff --git a/source3/samba4.mk b/source3/samba4.mk index e15d60255d..3f4fff4d35 100644 --- a/source3/samba4.mk +++ b/source3/samba4.mk @@ -166,7 +166,7 @@ modules:: $(PLUGINS) pythonmods:: $(PYTHON_PYS) $(PYTHON_SO) -all:: bin/samba4 bin/regpatch4 bin/regdiff4 bin/regshell4 bin/regtree4 bin/smbclient4 bin/wbinfo4 pythonmods setup +all:: bin/samba4 bin/regpatch4 bin/regdiff4 bin/regshell4 bin/regtree4 bin/smbclient4 bin/wbinfo4 pythonmods setup plugins torture:: bin/smbtorture4 everything:: $(patsubst %,%4,$(BINARIES)) setup: @@ -250,3 +250,4 @@ gdbtest4-env:: everything SMBD_VALGRIND="xterm -n server -e $(selftestdir)/gdb_run $(LD_LIBPATH_OVERRIDE)" \ $(SELFTEST4) $(SELFTEST4_NOSLOW_OPTS) --socket-wrapper --testenv +plugins: $(PLUGINS) diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh index 3b65aaa760..e8adc32c7c 100755 --- a/source3/script/tests/selftest.sh +++ b/source3/script/tests/selftest.sh @@ -68,20 +68,20 @@ export WINBINDD_SOCKET_DIR WINBINDD_PRIV_PIPE_DIR PATH=bin:$PATH export PATH -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 +if test x"$LD_LIBRARY_PATH" != x""; then + LD_LIBRARY_PATH="$BINDIR:$SAMBA4SHAREDDIR:$LD_LIBRARY_PATH" +else + LD_LIBRARY_PATH="$BINDIR:$SAMBA4SHAREDDIR" +fi +echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" +export LD_LIBRARY_PATH + ## ## verify that we were built with --enable-socket-wrapper ## |