From d58fb60ddc5f21d629da61fbbb77bb1937770253 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 1 May 2005 20:55:55 +0000
Subject: r6567: Use "real" prefix for 'make test' (This used to be commit
 195753b6afe3115762bcc4d579bc4a9f1c45af75)

---
 source4/build/smb_build/makefile.pm |  4 ++--
 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
 
-- 
cgit