diff options
Diffstat (limited to 'source3/script/tests')
| -rwxr-xr-x | source3/script/tests/selftest.sh | 13 | ||||
| -rwxr-xr-x | source3/script/tests/test_smbtorture_s3.sh | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh index 94621841f5..a430d01a0e 100755 --- a/source3/script/tests/selftest.sh +++ b/source3/script/tests/selftest.sh @@ -104,13 +104,14 @@ 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" +if [ -z "$LIB_PATH_VAR" ] ; then + echo "Warning: LIB_PATH_VAR not set. Using best guess LD_LIBRARY_PATH." >&2 + LIB_PATH_VAR=LD_LIBRARY_PATH + export LIB_PATH_VAR fi -echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" -export LD_LIBRARY_PATH + +eval $LIB_PATH_VAR=$BINDIR:$SAMBA4SHAREDDIR:\$$LIB_PATH_VAR +export $LIB_PATH_VAR ## ## verify that we were built with --enable-socket-wrapper diff --git a/source3/script/tests/test_smbtorture_s3.sh b/source3/script/tests/test_smbtorture_s3.sh index 842277b357..70c6d34c88 100755 --- a/source3/script/tests/test_smbtorture_s3.sh +++ b/source3/script/tests/test_smbtorture_s3.sh @@ -27,7 +27,7 @@ tests="$tests UNLINK BROWSE ATTR TRANS2 TORTURE " tests="$tests OPLOCK1 OPLOCK2 OPLOCK3" tests="$tests DIR DIR1 TCON TCONDEV RW1 RW2 RW3" tests="$tests OPEN XCOPY RENAME DELETE PROPERTIES W2K" -tests="$tests TCON2 IOCTL CHKPATH FDSESS LOCAL-SUBSTITUTE" +tests="$tests TCON2 IOCTL CHKPATH FDSESS LOCAL-SUBSTITUTE CHAIN1" skipped1="RANDOMIPC NEGNOWAIT NBENCH ERRMAPEXTRACT TRANS2SCAN NTTRANSSCAN" skipped2="DENY1 DENY2 OPENATTR CASETABLE EATEST" |