r7485: - allow test_xxx.sh to run outside of 'make test' by ensuring $PREFIX is setup

- use loopback interface only, otherwise nbtd will answer with a real
  ip, which the socket wrapper code will fail to connect to

- enable eadb for posix testing

- sleeping to wait for smbd to start is pointless, as smbd won't start
  till its fifo is opened due to the fifo redirection on stdin

- sleep for a few seconds to allow for nbt server to register names after opening fifo

- use bcast name resolution, so we don't rely on /etc/hosts being right
(This used to be commit 9ce2b9a79ba34705bcd8c32db1e084763702faec)

2 files changed, 12 insertions, 2 deletions

diff --git a/source4/script/tests/selftest.sh b/source4/script/tests/selftest.sh
index c974decd6c..ac3fd71f94 100755
--- a/source4/script/tests/selftest.sh
+++ b/source4/script/tests/selftest.sh
@@ -50,12 +50,15 @@ cat >$CONFFILE<<EOF
 	ncalrpc dir = $NCALRPCDIR
 	lock dir = $LOCKDIR
 	sam database = tdb://$PRIVATEDIR/sam.ldb
+	name resolve order = bcast
+	interfaces = lo
 
 [tmp]
 	path = $TMPDIR
 	read only = no
 	ntvfs handler = posix
 	posix:sharedelay = 100000
+	posix:eadb = $LOCKDIR/eadb.tdb
 EOF
 
 ADDARG="-s $CONFFILE"
@@ -67,6 +70,10 @@ smbd_check_or_start
 
 START=`date`
 (
+ # give time for nbt server to register its names
+ echo delaying for nbt name registration
+ sleep 4
+
  failed=0
  $SRCDIR/script/tests/test_rpc.sh localhost $USERNAME $PASSWORD $DOMAIN $ADDARG || failed=`expr $failed + $?`
  $SRCDIR/script/tests/test_binding_string.sh localhost $USERNAME $PASSWORD $DOMAIN $ADDARG || failed=`expr $failed + $?`
diff --git a/source4/script/tests/test_functions.sh b/source4/script/tests/test_functions.sh
index a2636b3354..e24e1062b0 100644
--- a/source4/script/tests/test_functions.sh
+++ b/source4/script/tests/test_functions.sh
@@ -29,7 +29,6 @@ smbd_check_or_start() {
 			echo "smbd exists with status $ret" >>$SMBD_TEST_LOG;
 			exit $ret;
 		) || exit $? &) 2>/dev/null || exit $?
-		sleep 2
 		echo  "DONE"
 	fi
 	return 0;
@@ -55,7 +54,11 @@ smbd_have_test_log() {
 }
 
 testit() {
-        name=$1
+	if [ -z "$PREFIX" ]; then
+	    PREFIX=test_prefix
+	    mkdir -p $PREFIX
+	fi
+	name=$1
 	shift 1
 	SMBD_IS_UP="no"
 	TEST_LOG="$PREFIX/test_log.$$"