[GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch.

[samba.git] / source / script / tests / selftest.sh

diff --git a/source/script/tests/selftest.sh b/source/script/tests/selftest.sh
index 44e0295c69d3b904d8c06cb5c76ed47120aa5053..8de6420b10abf4bfdef62b2644e8e55ec13ee97d 100755 (executable)
--- a/source/script/tests/selftest.sh
+++ b/source/script/tests/selftest.sh
@@ -95,8 +95,6 @@ cat >$COMMONCONFFILE<<EOF
        log file = $LOGDIR/log.%m
        log level = 0
 
-       passdb backend = tdbsam
-
        name resolve order = bcast
 EOF
 
@@ -106,8 +104,10 @@ cat >$CONFFILE<<EOF
 [global]
        netbios name = TORTURE_6
        interfaces = $TORTURE_INTERFACES
-       panic action = $SCRIPTDIR/gdb_backtrace %d
+       panic action = $SCRIPTDIR/gdb_backtrace %d %\$(MAKE_TEST_BINARY)
        include = $COMMONCONFFILE
+
+       passdb backend = tdbsam
 EOF
 
 cat >$SAMBA4CONFFILE<<EOF
@@ -123,15 +123,19 @@ cat >$SERVERCONFFILE<<EOF
        netbios name = $SERVER
        interfaces = $SERVER_IP/8
        bind interfaces only = yes
-       panic action = $SCRIPTDIR/gdb_backtrace %d
+       panic action = $SCRIPTDIR/gdb_backtrace %d %\$(MAKE_TEST_BINARY)
        include = $COMMONCONFFILE
 
+       passdb backend = tdbsam
+
        ; Necessary to add the build farm hacks
        add user script = /bin/false
        add machine script = /bin/false
 
        kernel oplocks = no
+       kernel change notify = no
 
+       syslog = no
        printing = bsd
        printcap name = /dev/null
 
@@ -139,12 +143,25 @@ cat >$SERVERCONFFILE<<EOF
        path = $PREFIX_ABS/tmp
        read only = no
        smbd:sharedelay = 100000
+       map hidden = yes
+       map system = yes
+       create mask = 755
 [hideunread]
        copy = tmp
        hide unreadable = yes
 [hideunwrite]
        copy = tmp
        hide unwriteable files = yes
+[print1]
+       copy = tmp
+       printable = yes
+       printing = test
+[print2]
+       copy = print1
+[print3]
+       copy = print1
+[print4]
+       copy = print1
 EOF
 
 ##
@@ -163,6 +180,9 @@ export NMBD_TEST_LOG
 SMBD_TEST_LOG="$PREFIX/smbd_test.log"
 export SMBD_TEST_LOG
 
+MAKE_TEST_BINARY=""
+export MAKE_TEST_BINARY
+
 # start off with 0 failures
 failed=0
 export failed
@@ -180,6 +200,7 @@ export SOCKET_WRAPPER_DEFAULT_IFACE
 TORTURE4_OPTIONS="$SAMBA4CONFIGURATION"
 TORTURE4_OPTIONS="$TORTURE4_OPTIONS --maximum-runtime=$TORTURE_MAXTIME"
 TORTURE4_OPTIONS="$TORTURE4_OPTIONS --target=samba3"
+TORTURE4_OPTIONS="$TORTURE4_OPTIONS --option=torture:localdir=$PREFIX_ABS/tmp"
 export TORTURE4_OPTIONS
 
 if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
@@ -195,7 +216,7 @@ START=`date`
 (
  # give time for nbt server to register its names
  echo "delaying for nbt name registration"
- sleep 4
+ sleep 10
  # This will return quickly when things are up, but be slow if we need to wait for (eg) SSL init 
  bin/nmblookup $CONFIGURATION -U $SERVER_IP __SAMBA__
  bin/nmblookup $CONFIGURATION __SAMBA__