diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-06-26 00:22:33 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:18:49 -0500 |
| commit | 71f057adb763ca08ed26846ab8f30b3ecaa6538c (patch) | |
| tree | f7f4b9122106f71ccaaf25a98b1907cea0e59da9 /source4/script/tests/selftest.sh | |
| parent | eb11eeb5dbeccd7710f92dc0639df36aad06c46b (diff) | |
| download | samba-71f057adb763ca08ed26846ab8f30b3ecaa6538c.tar.gz samba-71f057adb763ca08ed26846ab8f30b3ecaa6538c.tar.bz2 samba-71f057adb763ca08ed26846ab8f30b3ecaa6538c.zip | |
r7914: - we don't need to override the database locations in selftest any more
- make sure we create the tls directory
(This used to be commit 0b1323f086acff331be20ee341966113a288393e)
Diffstat (limited to 'source4/script/tests/selftest.sh')
| -rwxr-xr-x | source4/script/tests/selftest.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source4/script/tests/selftest.sh b/source4/script/tests/selftest.sh index 349efa285a..80aaae0b3c 100755 --- a/source4/script/tests/selftest.sh +++ b/source4/script/tests/selftest.sh @@ -24,6 +24,7 @@ CONFFILE=$LIBDIR/smb.conf PRIVATEDIR=$PREFIX/private NCALRPCDIR=$PREFIX/ncalrpc LOCKDIR=$PREFIX/lockdir +TLSDIR=$PRIVATEDIR/tls CONFIGURATION="--configfile=$CONFFILE" export CONFIGURATION @@ -39,11 +40,15 @@ if [ x"$DO_SOCKET_WRAPPER" = x"SOCKET_WRAPPER" ];then echo "SOCKET_WRAPPER_DIR=$SOCKET_WRAPPER_DIR" fi +# start off with 0 failures +failed=0 +export failed + incdir=`dirname $0` . $incdir/test_functions.sh rm -rf $PREFIX/* -mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $NCALRPCDIR $LOCKDIR $TMPDIR +mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $NCALRPCDIR $LOCKDIR $TMPDIR $TLSDIR ./setup/provision.pl --quiet --outputdir $PRIVATEDIR --domain $DOMAIN --realm $REALM \ --adminpass $PASSWORD --root=$ROOT @@ -56,10 +61,6 @@ cat >$CONFFILE<<EOF pid directory = $PIDDIR ncalrpc dir = $NCALRPCDIR lock dir = $LOCKDIR - sam database = tdb://$PRIVATEDIR/sam.ldb - spoolss database = tdb://$PRIVATEDIR/spoolss.ldb - wins database = tdb://$PRIVATEDIR/wins.ldb - registry:HKEY_LOCAL_MACHINE = tdb://$PRIVATEDIR/hklm.ldb name resolve order = bcast interfaces = lo* |