sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

selftest: don't export $CONFIGURATION anymore only $SMB_CONF_PATH

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher 2009-01-30 11:03:45 +01:00
parent 4b541c6f03
commit 6b128f03d5
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
selftest/selftest.pl
View File

@ -648,7 +648,6 @@ if ($opt_quick) {
}
$ENV{SELFTEST_TARGET} = $opt_target;
$ENV{SELFTEST_MAXTIME} = $torture_maxtime;
$ENV{SELFTEST_CONFFILE} = $conffile;
my @available = ();
foreach my $fn (@testlists) {
@ -852,7 +851,7 @@ server is pid `cat \$PIDDIR/samba.pid`
Some useful environment variables:
TORTURE_OPTIONS=\$TORTURE_OPTIONS
CONFIGURATION=\$CONFIGURATION
SMB_CONF_PATH=\$SMB_CONF_PATH
$envvarstr
\" && LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH} bash'");

2
source3/selftest/tests.sh
View File

@ -51,7 +51,7 @@ export SCRIPTDIR
plantest "talloctort3" none $VALGRIND $BINDIR/talloctort
plantest "replacetort3" none $VALGRIND $BINDIR/replacetort
plantest "tdbtorture3" none $VALGRIND $BINDIR/tdbtorture
plantest "smbconftort3" none $VALGRIND $BINDIR/smbconftort $CONFIGURATION
plantest "smbconftort3" none $VALGRIND $BINDIR/smbconftort -s \$SMB_CONF_PATH
tests="FDPASS LOCK1 LOCK2 LOCK3 LOCK4 LOCK5 LOCK6 LOCK7"
tests="$tests UNLINK BROWSE ATTR TRANS2 TORTURE "

9
source4/selftest/tests.sh
View File

@ -60,12 +60,12 @@ smb4torture="$samba4bindir/smbtorture${EXEEXT}"
$smb4torture -V
prefix_abs="$SELFTEST_PREFIX/s4client"
CONFIGURATION="--configfile=\$SMB_CONF_PATH"
test -d "$prefix_abs" || mkdir "$prefix_abs"
conffile="$SELFTEST_CONFFILE"
TORTURE_OPTIONS=""
TORTURE_OPTIONS="$TORTURE_OPTIONS --configfile=$conffile"
TORTURE_OPTIONS="$TORTURE_OPTIONS $CONFIGURATION"
TORTURE_OPTIONS="$TORTURE_OPTIONS --maximum-runtime=$SELFTEST_MAXTIME"
TORTURE_OPTIONS="$TORTURE_OPTIONS --target=$SELFTEST_TARGET"
TORTURE_OPTIONS="$TORTURE_OPTIONS --basedir=$prefix_abs"
@ -80,11 +80,6 @@ smb4torture="$smb4torture $TORTURE_OPTIONS"
echo "OPTIONS $TORTURE_OPTIONS"
SMB_CONF_PATH="$conffile"
export SMB_CONF_PATH
CONFIGURATION="--configfile=$conffile"
export CONFIGURATION
# Simple tests for LDAP and CLDAP
for options in "" "--option=socket:testnonblock=true" "-U\$USERNAME%\$PASSWORD --option=socket:testnonblock=true" "-U\$USERNAME%\$PASSWORD"; do