summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-01-30 22:23:17 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:51:36 -0500
commitd778912c3a14287f9f78a852defeb2ca86d95e17 (patch)
tree9d378134679f487cb90c58accc47eff09264fab9
parentc06911376cffa0b305962f600833324eecad9806 (diff)
downloadsamba-d778912c3a14287f9f78a852defeb2ca86d95e17.tar.gz
samba-d778912c3a14287f9f78a852defeb2ca86d95e17.tar.bz2
samba-d778912c3a14287f9f78a852defeb2ca86d95e17.zip
r13240: Make the test scripts use the new smb.conf location (in PREFIX/etc).
Andrew Bartlett (This used to be commit ea0a53d6795488ed530c3436343587595221cb78)
-rwxr-xr-xsource4/script/tests/selftest.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/script/tests/selftest.sh b/source4/script/tests/selftest.sh
index a4f38cb9dc..67797b17f4 100755
--- a/source4/script/tests/selftest.sh
+++ b/source4/script/tests/selftest.sh
@@ -51,9 +51,10 @@ export TEST_DATA_PREFIX
TMPDIR=$PREFIX_ABS/tmp
LIBDIR=$PREFIX_ABS/lib
+ETCDIR=$PREFIX_ABS/etc
PIDDIR=$PREFIX_ABS/pid
-CONFFILE=$LIBDIR/smb.conf
-KRB5_CONFIG=$LIBDIR/krb5.conf
+CONFFILE=$ETCDIR/smb.conf
+KRB5_CONFIG=$ETCDIR/krb5.conf
PRIVATEDIR=$PREFIX_ABS/private
NCALRPCDIR=$PREFIX_ABS/ncalrpc
LOCKDIR=$PREFIX_ABS/lockdir
@@ -85,7 +86,7 @@ PATH=bin:$PATH
export PATH
rm -rf $PREFIX/*
-mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $NCALRPCDIR $LOCKDIR $TMPDIR $TLSDIR
+mkdir -p $PRIVATEDIR $ETCDIR $LIBDIR $PIDDIR $NCALRPCDIR $LOCKDIR $TMPDIR $TLSDIR
cat >$PRIVATEDIR/wins_config.ldif<<EOF
dn: name=TORTURE_26,CN=PARTNERS