diff options
author | Stefan Metzmacher <metze@samba.org> | 2009-01-30 11:03:45 +0100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2009-01-30 13:33:34 +0100 |
commit | 6b128f03d500b13468c666db51c87eb2e194f2ca (patch) | |
tree | e6c05d1151c263ec809102f6b8f55b5ce4658b45 /source4 | |
parent | 4b541c6f030e9459df35337bce3d8ce7ba92a2c6 (diff) | |
download | samba-6b128f03d500b13468c666db51c87eb2e194f2ca.tar.gz samba-6b128f03d500b13468c666db51c87eb2e194f2ca.tar.bz2 samba-6b128f03d500b13468c666db51c87eb2e194f2ca.zip |
selftest: don't export $CONFIGURATION anymore only $SMB_CONF_PATH
metze
Diffstat (limited to 'source4')
-rwxr-xr-x | source4/selftest/tests.sh | 9 |
1 files changed, 2 insertions, 7 deletions
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 |