svn commit: samba r6567 - in branches/SAMBA_4_0/source:
build/smb_build script/tests
jelmer at samba.org
jelmer at samba.org
Sun May 1 20:55:55 GMT 2005
Author: jelmer
Date: 2005-05-01 20:55:55 +0000 (Sun, 01 May 2005)
New Revision: 6567
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6567
Log:
Use "real" prefix for 'make test'
Modified:
branches/SAMBA_4_0/source/build/smb_build/makefile.pm
branches/SAMBA_4_0/source/script/tests/selftest.sh
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2005-05-01 20:05:16 UTC (rev 6566)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2005-05-01 20:55:55 UTC (rev 6567)
@@ -151,14 +151,14 @@
basics: idl proto_exists
test: all
- ./script/tests/selftest.sh
+ ./script/tests/selftest.sh $(prefix)
SOCKET_WRAPPER_DIR=`pwd`/sockdir
test-swrap: all
export SOCKET_WRAPPER_DIR
mkdir -p $(SOCKET_WRAPPER_DIR)
- ./script/tests/selftest.sh
+ ./script/tests/selftest.sh $(prefix)
__EOD__
Modified: branches/SAMBA_4_0/source/script/tests/selftest.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/selftest.sh 2005-05-01 20:05:16 UTC (rev 6566)
+++ branches/SAMBA_4_0/source/script/tests/selftest.sh 2005-05-01 20:55:55 UTC (rev 6567)
@@ -3,17 +3,17 @@
REALM=$DOMAIN
PASSWORD=penguin
SRCDIR=`pwd`
-PREFIX=$SRCDIR/prefix
SOCKET_WRAPPER_DIR=$PREFIX/sockdir
TMPDIR=$PREFIX/tmp
-if [ ! -z "$BUILD" ]
+if [ $# -lt 1 ]
then
- ./configure --prefix=$PREFIX --enable-socket-wrapper
- mkdir -p $PREFIX $TMPDIR
- make proto all install
+ echo "$0 PREFIX"
+ exit
fi
+PREFIX=$1
+
rm -f $PREFIX/private/*
./setup/provision.pl --quiet --outputdir $PREFIX/private --domain $DOMAIN --realm $REALM --adminpass $PASSWORD
More information about the samba-cvs
mailing list