diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-05-01 20:55:55 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:16:26 -0500 |
| commit | d58fb60ddc5f21d629da61fbbb77bb1937770253 (patch) | |
| tree | 732550ebcb9dbbb1c4383094649961636b79d795 | |
| parent | 85e9412c4786ede6f94d879185d493756d37eebe (diff) | |
| download | samba-d58fb60ddc5f21d629da61fbbb77bb1937770253.tar.gz samba-d58fb60ddc5f21d629da61fbbb77bb1937770253.tar.bz2 samba-d58fb60ddc5f21d629da61fbbb77bb1937770253.zip | |
r6567: Use "real" prefix for 'make test'
(This used to be commit 195753b6afe3115762bcc4d579bc4a9f1c45af75)
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 4 | ||||
| -rwxr-xr-x | source4/script/tests/selftest.sh | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 43c40dc988..1ca3226d37 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -151,14 +151,14 @@ pch_clean: 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__ diff --git a/source4/script/tests/selftest.sh b/source4/script/tests/selftest.sh index 55e28696a8..7f51ce2c39 100755 --- a/source4/script/tests/selftest.sh +++ b/source4/script/tests/selftest.sh @@ -3,17 +3,17 @@ DOMAIN=SAMBADOMAIN 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 |