summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-01-30 11:03:45 +0100
committerStefan Metzmacher <metze@samba.org>2009-01-30 13:33:34 +0100
commit6b128f03d500b13468c666db51c87eb2e194f2ca (patch)
treee6c05d1151c263ec809102f6b8f55b5ce4658b45
parent4b541c6f030e9459df35337bce3d8ce7ba92a2c6 (diff)
downloadsamba-6b128f03d500b13468c666db51c87eb2e194f2ca.tar.gz
samba-6b128f03d500b13468c666db51c87eb2e194f2ca.tar.bz2
samba-6b128f03d500b13468c666db51c87eb2e194f2ca.zip
selftest: don't export $CONFIGURATION anymore only $SMB_CONF_PATH
metze
-rwxr-xr-xselftest/selftest.pl3
-rwxr-xr-xsource3/selftest/tests.sh2
-rwxr-xr-xsource4/selftest/tests.sh9
3 files changed, 4 insertions, 10 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index b4cc4c1719..d4fd57e494 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -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'");
diff --git a/source3/selftest/tests.sh b/source3/selftest/tests.sh
index 7f2c8f2203..e07dee6f8a 100755
--- a/source3/selftest/tests.sh
+++ b/source3/selftest/tests.sh
@@ -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 "
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 5c2b0792eb..a45a3bf3e0 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -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