svn commit: samba r18380 - in
branches/SAMBA_3_0/source/script/tests: .
metze at samba.org
metze at samba.org
Mon Sep 11 12:46:14 GMT 2006
Author: metze
Date: 2006-09-11 12:46:13 +0000 (Mon, 11 Sep 2006)
New Revision: 18380
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18380
Log:
the panic action command needs to be different in samba4
samba4 uses %PID% where samba3 uses %d
metze
Modified:
branches/SAMBA_3_0/source/script/tests/selftest.sh
Changeset:
Modified: branches/SAMBA_3_0/source/script/tests/selftest.sh
===================================================================
--- branches/SAMBA_3_0/source/script/tests/selftest.sh 2006-09-11 11:49:32 UTC (rev 18379)
+++ branches/SAMBA_3_0/source/script/tests/selftest.sh 2006-09-11 12:46:13 UTC (rev 18380)
@@ -39,6 +39,7 @@
LIBDIR=$PREFIX_ABS/lib
PIDDIR=$PREFIX_ABS/pid
CONFFILE=$LIBDIR/client.conf
+SAMBA4CONFFILE=$LIBDIR/samba4client.conf
SERVERCONFFILE=$LIBDIR/server.conf
COMMONCONFFILE=$LIBDIR/common.conf
PRIVATEDIR=$PREFIX_ABS/private
@@ -46,8 +47,11 @@
LOGDIR=$PREFIX_ABS/logs
SOCKET_WRAPPER_DIR=$PREFIX/sw
CONFIGURATION="-s $CONFFILE"
+SAMBA4CONFIGURATION="-s $SAMBA4CONFFILE"
-export PREFIX PREFIX_ABS CONFIGURATION CONFFILE PATH SOCKET_WRAPPER_DIR DOMAIN
+export PREFIX PREFIX_ABS
+export CONFIGURATION CONFFILE SAMBA4CONFIGURATION SAMBA4CONFFILE
+export PATH SOCKET_WRAPPER_DIR DOMAIN
export PRIVATEDIR LIBDIR PIDDIR LOCKDIR LOGDIR SERVERCONFFILE
export SRCDIR SCRIPTDIR BINDIR
export USERNAME PASSWORD
@@ -94,14 +98,21 @@
passdb backend = tdbsam
name resolve order = bcast
+EOF
+cat >$CONFFILE<<EOF
+[global]
+ netbios name = TORTURE26
+ interfaces = 127.0.0.26/8
panic action = $SCRIPTDIR/gdb_backtrace %d
+ include = $COMMONCONFFILE
EOF
-cat >$CONFFILE<<EOF
+cat >$SAMBA4CONFFILE<<EOF
[global]
netbios name = TORTURE26
interfaces = 127.0.0.26/8
+ panic action = $SCRIPTDIR/gdb_backtrace %PID% %PROG%
include = $COMMONCONFFILE
EOF
@@ -110,6 +121,7 @@
netbios name = $SERVER
interfaces = $SERVER_IP/8
bind interfaces only = yes
+ panic action = $SCRIPTDIR/gdb_backtrace %d
include = $COMMONCONFFILE
; Necessary to add the build farm hacks
@@ -133,7 +145,6 @@
hide unwriteable files = yes
EOF
-
##
## create a test account
##
@@ -143,10 +154,6 @@
echo "DONE";
-if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
- CONFIGURATION="$CONFIGURATION --option=\"torture:progress=no\""
-fi
-
SERVER_TEST_FIFO="$PREFIX/server_test.fifo"
export SERVER_TEST_FIFO
NMBD_TEST_LOG="$PREFIX/nmbd_test.log"
@@ -169,14 +176,15 @@
SOCKET_WRAPPER_DEFAULT_IFACE=26
export SOCKET_WRAPPER_DEFAULT_IFACE
TORTURE4_INTERFACES='127.0.0.26/8,127.0.0.27/8,127.0.0.28/8,127.0.0.29/8,127.0.0.30/8,127.0.0.31/8'
-TORTURE4_OPTIONS="--maximum-runtime=$TORTURE_MAXTIME --option=interfaces=$TORTURE4_INTERFACES $CONFIGURATION"
+TORTURE4_OPTIONS="--option=interfaces=$TORTURE4_INTERFACES $SAMBA4CONFIGURATION"
+TORTURE4_OPTIONS="$TORTURE4_OPTIONS --maximum-runtime=$TORTURE_MAXTIME"
+TORTURE4_OPTIONS="$TORTURE4_OPTIONS --target=samba3"
export TORTURE4_OPTIONS
if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
TORTURE4_OPTIONS="$TORTURE4_OPTIONS --option=torture:progress=no"
fi
-TORTURE4_OPTIONS="$TORTURE4_OPTIONS --option=target:samba3=yes"
##
## ready to go...now loop through the tests
More information about the samba-cvs
mailing list