r6567: Use "real" prefix for 'make test'

diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index 43c40dc9881399a7b125454e45ff4b7b6287e5b7..1ca3226d377ea00143872bbdd01d2e1ae423c1a9 100644 (file)
--- a/source/build/smb_build/makefile.pm
+++ b/source/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/source/script/tests/selftest.sh b/source/script/tests/selftest.sh
index 55e28696a8df37b36094a9f5e0efb748be43c981..7f51ce2c39a508c60196929fad6e4ae5cae42144 100755 (executable)
--- a/source/script/tests/selftest.sh
+++ b/source/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