r6568: Some more small 'make test' fixes

diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index 1ca3226d377ea00143872bbdd01d2e1ae423c1a9..bc5690ddf31f947ef5fba6125cc284158311bb4e 100644 (file)
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -153,10 +153,9 @@ basics: idl proto_exists
 test: all
        ./script/tests/selftest.sh $(prefix)
        
-SOCKET_WRAPPER_DIR=`pwd`/sockdir
+export SOCKET_WRAPPER_DIR=$(shell pwd)/sockdir
 
 test-swrap: all
-       export SOCKET_WRAPPER_DIR
        mkdir -p $(SOCKET_WRAPPER_DIR)
        ./script/tests/selftest.sh $(prefix)
 

diff --git a/source/script/tests/selftest.sh b/source/script/tests/selftest.sh
index 7f51ce2c39a508c60196929fad6e4ae5cae42144..a52f38b3b1b8aca5b69dd801803a4cbe16fb2f63 100755 (executable)
--- a/source/script/tests/selftest.sh
+++ b/source/script/tests/selftest.sh
@@ -3,7 +3,6 @@ DOMAIN=SAMBADOMAIN
 REALM=$DOMAIN
 PASSWORD=penguin
 SRCDIR=`pwd`
-SOCKET_WRAPPER_DIR=$PREFIX/sockdir
 TMPDIR=$PREFIX/tmp
 
 if [ $# -lt 1 ]
@@ -17,7 +16,6 @@ PREFIX=$1
 rm -f $PREFIX/private/*
 ./setup/provision.pl --quiet --outputdir $PREFIX/private --domain $DOMAIN --realm $REALM --adminpass $PASSWORD
 
-mkdir -p $SOCKET_WRAPPER_DIR
 cat >$PREFIX/lib/smb.conf <<EOF
 [global]
        workgroup = $DOMAIN
@@ -31,9 +29,9 @@ export SOCKET_WRAPPER_DIR
 cd $PREFIX
 ./sbin/smbd
 sleep 2
-$PREFIX/bin/smbtorture ncalrpc: LOCAL-*
-$SRCDIR/script/tests/test_rpc.sh localhost administrator $PASSWORD $DOMAIN
-$SRCDIR/script/tests/test_binding_string.sh localhost administrator $PASSWORD $DOMAIN
-$SRCDIR/script/tests/test_echo.sh localhost administrator $PASSWORD $DOMAIN
-$SRCDIR/script/tests/test_posix.sh //localhost/tmp administrator $PASSWORD 
+$SRCDIR/script/tests/test_rpc.sh localhost administrator $PASSWORD $DOMAIN || exit 1
+$SRCDIR/script/tests/test_binding_string.sh localhost administrator $PASSWORD $DOMAIN || exit 1
+$SRCDIR/script/tests/test_echo.sh localhost administrator $PASSWORD $DOMAIN || exit 1
+$SRCDIR/script/tests/test_posix.sh //localhost/tmp administrator $PASSWORD || exit 1
+$PREFIX/bin/smbtorture ncalrpc: LOCAL-* || exit 1
 kill `cat $PREFIX/var/locks/smbd.pid`