From c731d11471ea9edd762b4cdb67bac06e77cb6f45 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 3 Aug 2005 05:46:43 +0000
Subject: r8990: First trivial example of 'make test' (This used to be commit
 11c886394970713a226d1fe46a4931ef97bb39a8)

---
 source3/script/tests/gdb_backtrace | 41 ++++++++++++++++++++++++++++++++++++++
 source3/script/tests/runtests.sh   | 41 ++++++++++++++++++++++++++++++++++++++
 source3/script/tests/t_listing.sh  | 28 ++++++++++++++++++++++++++
 3 files changed, 110 insertions(+)
 create mode 100644 source3/script/tests/gdb_backtrace
 create mode 100644 source3/script/tests/runtests.sh
 create mode 100644 source3/script/tests/t_listing.sh

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/gdb_backtrace b/source3/script/tests/gdb_backtrace
new file mode 100644
index 0000000000..2ea6a4d00a
--- /dev/null
+++ b/source3/script/tests/gdb_backtrace
@@ -0,0 +1,41 @@
+#! /bin/sh
+#
+# Author: Andrew Tridgell <tridge at samba dot org>
+
+# we want everything on stderr, so the program is not disturbed
+exec 1>&2
+
+BASENAME=$( basename $0)
+
+test -z ${GDB_BIN} && GDB_BIN=$( type -p gdb)
+if [ -z ${GDB_BIN} ]; then
+	echo "ERROR: ${BASENAME} needs an installed gdb. "
+	exit 1
+fi
+
+if [ -z $1 ]; then
+	echo "ERROR: ${BASENAME} needs a PID. "
+	exit 1
+fi
+PID=$1
+
+# use /dev/shm as default temp directory
+test -d /dev/shm && \
+	TMP_BASE_DIR=/dev/shm || \
+	TMP_BASE_DIR=/var/tmp
+TMPFILE=$( mktemp -p ${TMP_BASE_DIR} backtrace.XXXXXX)
+if [ $? -ne 0 ]; then
+	echo "ERROR: ${basename} can't create temp file in ${TMP_BASE_DIR}. "
+	exit 1
+fi
+
+cat << EOF  > "${TMPFILE}"
+set height 0
+up 8
+bt full
+quit
+EOF
+
+${GDB_BIN} -x "${TMPFILE}" "/proc/${PID}/exe" "${PID}"
+
+/bin/rm -f "${TMPFILE}"
diff --git a/source3/script/tests/runtests.sh b/source3/script/tests/runtests.sh
new file mode 100644
index 0000000000..2483de97ca
--- /dev/null
+++ b/source3/script/tests/runtests.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+DOMAIN=SAMBA-TEST
+export DOMAIN
+
+if [ "x$1" == "x" ]; then
+	echo "$0 <directory>"
+	exit 1
+fi
+
+PREFIX=`echo $1 | sed s+//+/+`
+
+mkdir -p $PREFIX || exit $?
+OLD_PWD=`pwd`
+cd $PREFIX || exit $?
+export PREFIX_ABS=`pwd`
+cd $OLD_PWD
+
+TMPDIR=$PREFIX_ABS/tmp
+LIBDIR=$PREFIX_ABS/lib
+PIDDIR=$PREFIX_ABS/pid
+CONFFILE=$LIBDIR/smb.conf
+PRIVATEDIR=$PREFIX_ABS/private
+LOCKDIR=$PREFIX_ABS/lockdir
+LOGDIR=$PREFIX_ABS/logs
+SOCKET_WRAPPER_DIR=$PREFIX_ABS/sockwrap
+CONFIGURATION="-s $CONFFILE"
+
+PATH=`pwd`/bin:$PATH
+
+rm -rf $PREFIX/*
+mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $LOCKDIR $TMPDIR $LOGDIR $SOCKET_WRAPPER_DIR
+
+export PREFIX_ABS CONFIGURATION CONFFILE PATH SOCKET_WRAPPER_DIR
+export PRIVATEDIR LIBDIR PIDDIR LOCKDIR TMPDIR LOGDIR
+
+cd script/tests
+for testfile in t_*sh; do
+	sh $testfile
+done
+
diff --git a/source3/script/tests/t_listing.sh b/source3/script/tests/t_listing.sh
new file mode 100644
index 0000000000..0689807671
--- /dev/null
+++ b/source3/script/tests/t_listing.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+cat >$CONFFILE<<EOF
+[global]
+	netbios name = LOCALHOST
+	workgroup = $DOMAIN
+
+	private dir = $PRIVATEDIR
+	pid directory = $PIDDIR
+	lock directory = $LOCKDIR
+	log file = $LOGDIR/log.%m
+
+	interfaces = lo
+	bind interfaces only = yes
+
+	panic action = $PREFIX_ABS/script/tests/gdb_backtrace /proc/%d/exe %d
+
+[test]
+	path = $TMPDIR
+	read only = no
+EOF
+
+
+smbd $CONFIGURATION || exit $?
+sleep 1
+smbclient $CONFIGURATION -L localhost -N -p 139
+
+killall smbd
-- 
cgit 


From b549e4903dd8d3df5197fd1a025ee68b8d6b2da7 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 3 Aug 2005 06:24:28 +0000
Subject: r8992: More make test work.  Adding a way to order tests (might
 change my mind on this later). (This used to be commit
 136fe3f15e74686882f7c1e5a46fcc0bcf7d51a6)

---
 source3/script/tests/functions    |  4 ++++
 source3/script/tests/runtests.sh  | 27 ++++++++++++++++++++-------
 source3/script/tests/t_001.sh     | 30 ++++++++++++++++++++++++++++++
 source3/script/tests/t_listing.sh | 28 ----------------------------
 4 files changed, 54 insertions(+), 35 deletions(-)
 create mode 100644 source3/script/tests/functions
 create mode 100644 source3/script/tests/t_001.sh
 delete mode 100644 source3/script/tests/t_listing.sh

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/functions b/source3/script/tests/functions
new file mode 100644
index 0000000000..0969c98724
--- /dev/null
+++ b/source3/script/tests/functions
@@ -0,0 +1,4 @@
+##
+## library file for test functions
+##
+
diff --git a/source3/script/tests/runtests.sh b/source3/script/tests/runtests.sh
index 2483de97ca..6ee6d3a32b 100644
--- a/source3/script/tests/runtests.sh
+++ b/source3/script/tests/runtests.sh
@@ -1,21 +1,28 @@
 #!/bin/sh
 
-DOMAIN=SAMBA-TEST
-export DOMAIN
-
 if [ "x$1" == "x" ]; then
 	echo "$0 <directory>"
 	exit 1
 fi
 
+##
+## create the test directory
+##
 PREFIX=`echo $1 | sed s+//+/+`
-
 mkdir -p $PREFIX || exit $?
 OLD_PWD=`pwd`
 cd $PREFIX || exit $?
 export PREFIX_ABS=`pwd`
 cd $OLD_PWD
 
+##
+## setup the various environment variables we need
+##
+
+DOMAIN=SAMBA-TEST
+
+SRCDIR=`pwd`
+SCRIPTDIR=$SRCDIR/script/tests
 TMPDIR=$PREFIX_ABS/tmp
 LIBDIR=$PREFIX_ABS/lib
 PIDDIR=$PREFIX_ABS/pid
@@ -31,11 +38,17 @@ PATH=`pwd`/bin:$PATH
 rm -rf $PREFIX/*
 mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $LOCKDIR $TMPDIR $LOGDIR $SOCKET_WRAPPER_DIR
 
-export PREFIX_ABS CONFIGURATION CONFFILE PATH SOCKET_WRAPPER_DIR
+export PREFIX_ABS CONFIGURATION CONFFILE PATH SOCKET_WRAPPER_DIR DOMAIN
 export PRIVATEDIR LIBDIR PIDDIR LOCKDIR TMPDIR LOGDIR
+export SRCDIR SCRIPTDIR
 
-cd script/tests
-for testfile in t_*sh; do
+for testfile in `ls $SCRIPTDIR/t_*sh | sort`; do
+	echo ">>>>>> Starting test driver `basename $testfile` <<<<<"
 	sh $testfile
+	if [ $? = 0 ]; then
+		echo ">>>>> test ok <<<<<"
+	else
+		echo ">>>>> test failed <<<<<"
+	fi
 done
 
diff --git a/source3/script/tests/t_001.sh b/source3/script/tests/t_001.sh
new file mode 100644
index 0000000000..86837050c7
--- /dev/null
+++ b/source3/script/tests/t_001.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+. $SCRIPTDIR/functions
+
+cat >$CONFFILE<<EOF
+[global]
+	netbios name = LOCALHOST
+	workgroup = $DOMAIN
+
+	private dir = $PRIVATEDIR
+	pid directory = $PIDDIR
+	lock directory = $LOCKDIR
+	log file = $LOGDIR/log.%m
+
+	interfaces = lo
+	bind interfaces only = yes
+
+	panic action = $PREFIX_ABS/script/tests/gdb_backtrace /proc/%d/exe %d
+
+[test]
+	path = $TMPDIR
+	read only = no
+EOF
+
+
+smbd $CONFIGURATION || exit $?
+sleep 1
+smbclient $CONFIGURATION -L localhost -N -p 139
+
+killall smbd
diff --git a/source3/script/tests/t_listing.sh b/source3/script/tests/t_listing.sh
deleted file mode 100644
index 0689807671..0000000000
--- a/source3/script/tests/t_listing.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-cat >$CONFFILE<<EOF
-[global]
-	netbios name = LOCALHOST
-	workgroup = $DOMAIN
-
-	private dir = $PRIVATEDIR
-	pid directory = $PIDDIR
-	lock directory = $LOCKDIR
-	log file = $LOGDIR/log.%m
-
-	interfaces = lo
-	bind interfaces only = yes
-
-	panic action = $PREFIX_ABS/script/tests/gdb_backtrace /proc/%d/exe %d
-
-[test]
-	path = $TMPDIR
-	read only = no
-EOF
-
-
-smbd $CONFIGURATION || exit $?
-sleep 1
-smbclient $CONFIGURATION -L localhost -N -p 139
-
-killall smbd
-- 
cgit 


From 35f12fd94db0b89d6670945f6f27c3b8d316118b Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Tue, 23 Aug 2005 22:10:44 +0000
Subject: r9548: more additions to make test; better checks for starting and
 stopping smbd (This used to be commit
 dbaaf81cec59aae01e71bbb639e1937ebee2454d)

---
 source3/script/tests/functions   | 38 ++++++++++++++++++++++++++++++++++++++
 source3/script/tests/runtests.sh | 37 +++++++++++++++++++++++++++++++------
 source3/script/tests/t_001.sh    | 22 +++++++---------------
 3 files changed, 76 insertions(+), 21 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/functions b/source3/script/tests/functions
index 0969c98724..4cc8d4a2c0 100644
--- a/source3/script/tests/functions
+++ b/source3/script/tests/functions
@@ -2,3 +2,41 @@
 ## library file for test functions
 ##
 
+##
+## start/stop smbd daemon
+##
+check_smbd_running()
+{
+	## the smbcontrol ping will return a 0 on success
+	smbcontrol $CONFIGURATION smbd ping 2>&1 > /dev/null
+}
+
+start_smbd()
+{
+	echo "Starting smbd...."
+
+	smbd $CONFIGURATION || return $?
+
+	sleep 1
+
+	smbcontrol $CONFIGURATION `cat $PIDDIR/smbd.pid` ping 2>&1 > /dev/null || return $?
+}
+
+stop_smbd()
+{
+	smbd_pid=`cat $PIDDIR/smbd.pid`
+	echo "Shutting down smbd (pid $smbd_pid)..."
+
+	## belt and braces; first kill and then send a shutdown message
+
+	kill -TERM $smbd_pid
+	smbcontrol $CONFIGURATION smbd shutdown
+
+	## check to see if smbd is already running
+	check_smbd_running
+	if test $? == 0; then
+		echo "Unable to stop smbd!"
+		exit 2
+	fi
+}
+
diff --git a/source3/script/tests/runtests.sh b/source3/script/tests/runtests.sh
index 6ee6d3a32b..e8594f5199 100644
--- a/source3/script/tests/runtests.sh
+++ b/source3/script/tests/runtests.sh
@@ -19,8 +19,6 @@ cd $OLD_PWD
 ## setup the various environment variables we need
 ##
 
-DOMAIN=SAMBA-TEST
-
 SRCDIR=`pwd`
 SCRIPTDIR=$SRCDIR/script/tests
 TMPDIR=$PREFIX_ABS/tmp
@@ -32,16 +30,43 @@ LOCKDIR=$PREFIX_ABS/lockdir
 LOGDIR=$PREFIX_ABS/logs
 SOCKET_WRAPPER_DIR=$PREFIX_ABS/sockwrap
 CONFIGURATION="-s $CONFFILE"
-
 PATH=`pwd`/bin:$PATH
 
-rm -rf $PREFIX/*
-mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $LOCKDIR $TMPDIR $LOGDIR $SOCKET_WRAPPER_DIR
-
 export PREFIX_ABS CONFIGURATION CONFFILE PATH SOCKET_WRAPPER_DIR DOMAIN
 export PRIVATEDIR LIBDIR PIDDIR LOCKDIR TMPDIR LOGDIR
 export SRCDIR SCRIPTDIR
 
+## 
+## create the test directory layout
+##
+
+/bin/rm -rf $PREFIX/*
+mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $LOCKDIR $TMPDIR $LOGDIR $SOCKET_WRAPPER_DIR
+
+##
+## Create the common config include file with the basic settings
+##
+
+cat >$LIBDIR/common.conf<<EOF
+	netbios name = LOCALHOST
+	workgroup = SAMBA-TEST
+
+	private dir = $PRIVATEDIR
+	pid directory = $PIDDIR
+	lock directory = $LOCKDIR
+	log file = $LOGDIR/log.%m
+	log level = 0
+
+	interfaces = lo
+	bind interfaces only = yes
+
+	panic action = $PREFIX_ABS/script/tests/gdb_backtrace /proc/%d/exe %d
+EOF
+
+##
+## ready to go...now loop through the tests
+##
+
 for testfile in `ls $SCRIPTDIR/t_*sh | sort`; do
 	echo ">>>>>> Starting test driver `basename $testfile` <<<<<"
 	sh $testfile
diff --git a/source3/script/tests/t_001.sh b/source3/script/tests/t_001.sh
index 86837050c7..f9f530c974 100644
--- a/source3/script/tests/t_001.sh
+++ b/source3/script/tests/t_001.sh
@@ -4,27 +4,19 @@
 
 cat >$CONFFILE<<EOF
 [global]
-	netbios name = LOCALHOST
-	workgroup = $DOMAIN
-
-	private dir = $PRIVATEDIR
-	pid directory = $PIDDIR
-	lock directory = $LOCKDIR
-	log file = $LOGDIR/log.%m
-
-	interfaces = lo
-	bind interfaces only = yes
-
-	panic action = $PREFIX_ABS/script/tests/gdb_backtrace /proc/%d/exe %d
+	include = $LIBDIR/common.conf
 
 [test]
 	path = $TMPDIR
 	read only = no
 EOF
 
+##
+## Test code 
+##
+
+start_smbd || exit $?
 
-smbd $CONFIGURATION || exit $?
-sleep 1
 smbclient $CONFIGURATION -L localhost -N -p 139
 
-killall smbd
+stop_smbd
-- 
cgit 


From 024a46c8fa93a1f219930a329cf7548390a61c2a Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 24 Aug 2005 03:09:49 +0000
Subject: r9562: successfully get the samba 3 smbtorture working (as a test
 case for infrastructre) (This used to be commit
 c64f5666b8d1f9fb617b1cf89d6157a0c3fa9da9)

---
 source3/script/tests/functions   | 40 ++++++++++++++++++++++++++++++++++++++++
 source3/script/tests/runtests.sh | 40 +++++++++++++++++++++++++++++++++++++++-
 source3/script/tests/t_001.sh    |  3 +++
 source3/script/tests/t_002.sh    | 25 +++++++++++++++++++++++++
 4 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 source3/script/tests/t_002.sh

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/functions b/source3/script/tests/functions
index 4cc8d4a2c0..40e185e153 100644
--- a/source3/script/tests/functions
+++ b/source3/script/tests/functions
@@ -40,3 +40,43 @@ stop_smbd()
 	fi
 }
 
+
+##
+## start/stop smbd daemon
+##
+check_nmbd_running()
+{
+	## the smbcontrol ping will return a 0 on success
+	smbcontrol $CONFIGURATION nmbd ping 2>&1 > /dev/null
+}
+
+start_nmbd()
+{
+	echo "Starting nmbd...."
+
+	nmbd $CONFIGURATION || return $?
+
+	sleep 1
+
+	# smbcontrol $CONFIGURATION `cat $PIDDIR/nmbd.pid` ping 2>&1 > /dev/null || return $?
+	kill -0 `cat $PIDDIR/nmbd.pid`
+}
+
+stop_nmbd()
+{
+	nmbd_pid=`cat $PIDDIR/nmbd.pid`
+	echo "Shutting down nmbd (pid $nmbd_pid)..."
+
+	## belt and braces; first kill and then send a shutdown message
+
+	kill -TERM $nmbd_pid 2> /dev/null
+	sleep 1
+
+	## check to see if smbd is already running
+	kill -0 $nmbd_pid 2> /dev/null
+	if test $? == 0; then
+		echo "Unable to stop nmbd!"
+		exit 2
+	fi
+}
+
diff --git a/source3/script/tests/runtests.sh b/source3/script/tests/runtests.sh
index e8594f5199..b814ad91e7 100644
--- a/source3/script/tests/runtests.sh
+++ b/source3/script/tests/runtests.sh
@@ -5,6 +5,10 @@ if [ "x$1" == "x" ]; then
 	exit 1
 fi
 
+if [ $# == 2 ]; then
+	testnum=$2
+fi
+
 ##
 ## create the test directory
 ##
@@ -19,6 +23,9 @@ cd $OLD_PWD
 ## setup the various environment variables we need
 ##
 
+USERNAME=`whoami`
+PASSWORD=test
+
 SRCDIR=`pwd`
 SCRIPTDIR=$SRCDIR/script/tests
 TMPDIR=$PREFIX_ABS/tmp
@@ -35,6 +42,7 @@ PATH=`pwd`/bin:$PATH
 export PREFIX_ABS CONFIGURATION CONFFILE PATH SOCKET_WRAPPER_DIR DOMAIN
 export PRIVATEDIR LIBDIR PIDDIR LOCKDIR TMPDIR LOGDIR
 export SRCDIR SCRIPTDIR
+export USERNAME PASSWORD
 
 ## 
 ## create the test directory layout
@@ -42,6 +50,7 @@ export SRCDIR SCRIPTDIR
 
 /bin/rm -rf $PREFIX/*
 mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $LOCKDIR $TMPDIR $LOGDIR $SOCKET_WRAPPER_DIR
+chmod 1777 $TMPDIR
 
 ##
 ## Create the common config include file with the basic settings
@@ -57,17 +66,46 @@ cat >$LIBDIR/common.conf<<EOF
 	log file = $LOGDIR/log.%m
 	log level = 0
 
+	passdb backend = tdbsam
+
 	interfaces = lo
 	bind interfaces only = yes
 
-	panic action = $PREFIX_ABS/script/tests/gdb_backtrace /proc/%d/exe %d
+	panic action = $SCRIPTDIR/gdb_backtrace %d
+EOF
+
+cat >$LIBDIR/smb.conf<<EOF
+[global]
+	include = $LIBDIR/common.conf
 EOF
 
+
+##
+## create a test account
+##
+
+(echo $PASSWORD; echo $PASSWORD) | smbpasswd -c $LIBDIR/smb.conf -L -s -a $USERNAME
+
+
 ##
 ## ready to go...now loop through the tests
 ##
 
+if [ -f $SCRIPTDIR/t_$testnum.sh ]; then
+	testfile=$SCRIPTDIR/t_$testnum.sh
+	echo ">>>>>> Starting test driver `basename $testfile` <<<<<"
+	sh $testfile
+	if [ $? = 0 ]; then
+		echo ">>>>> test ok <<<<<"
+	else
+		echo ">>>>> test failed <<<<<"
+	fi
+
+	exit 0
+fi
+
 for testfile in `ls $SCRIPTDIR/t_*sh | sort`; do
+	echo " "
 	echo ">>>>>> Starting test driver `basename $testfile` <<<<<"
 	sh $testfile
 	if [ $? = 0 ]; then
diff --git a/source3/script/tests/t_001.sh b/source3/script/tests/t_001.sh
index f9f530c974..77b023c4c4 100644
--- a/source3/script/tests/t_001.sh
+++ b/source3/script/tests/t_001.sh
@@ -18,5 +18,8 @@ EOF
 start_smbd || exit $?
 
 smbclient $CONFIGURATION -L localhost -N -p 139
+ret=$?
 
 stop_smbd
+
+exit $ret
diff --git a/source3/script/tests/t_002.sh b/source3/script/tests/t_002.sh
new file mode 100644
index 0000000000..48987262a7
--- /dev/null
+++ b/source3/script/tests/t_002.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+. $SCRIPTDIR/functions
+
+cat >$CONFFILE<<EOF
+[global]
+	include = $LIBDIR/common.conf
+
+[test]
+	path = $TMPDIR
+	read only = no
+EOF
+
+##
+## Test code 
+##
+
+start_smbd || exit $?
+
+smbtorture //localhost/test -U${USERNAME}%${PASSWORD} FDPASS
+ret=$?
+
+stop_smbd
+
+exit $ret
-- 
cgit 


From e2a5b7da6a10e54a8ab8b41b64544794aaddbeb4 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 24 Aug 2005 13:09:13 +0000
Subject: r9583: ensure that Samba was with with --enable-socket-wrapper for
 running 'make test' (This used to be commit
 019155e748d9e04150bae39676362b794c1b6043)

---
 source3/script/tests/runtests.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/runtests.sh b/source3/script/tests/runtests.sh
index b814ad91e7..bb599ea3ec 100644
--- a/source3/script/tests/runtests.sh
+++ b/source3/script/tests/runtests.sh
@@ -44,6 +44,19 @@ export PRIVATEDIR LIBDIR PIDDIR LOCKDIR TMPDIR LOGDIR
 export SRCDIR SCRIPTDIR
 export USERNAME PASSWORD
 
+
+##
+## verify that we were built with --enable-socket-wrapper
+##
+
+if test "x`smbd -b | grep SOCKET_WRAPPER`" == "x"; then
+	echo "***"
+	echo "*** You must include --enable-socket-wrapper when compiling Samba"
+	echo "*** in order to execute 'make test'.  Exiting...."
+	echo "***"
+	exit 1
+fi
+
 ## 
 ## create the test directory layout
 ##
-- 
cgit 


From 38d08ad68c44304fe151b518f41a232bcc762261 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 24 Aug 2005 13:27:24 +0000
Subject: r9585: update test #1 (This used to be commit
 7a150ffde5cb8eb5198ac351161c3d651fb279a9)

---
 source3/script/tests/t_001.sh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/t_001.sh b/source3/script/tests/t_001.sh
index 77b023c4c4..995cfb11eb 100644
--- a/source3/script/tests/t_001.sh
+++ b/source3/script/tests/t_001.sh
@@ -5,6 +5,7 @@
 cat >$CONFFILE<<EOF
 [global]
 	include = $LIBDIR/common.conf
+	smb ports = 139
 
 [test]
 	path = $TMPDIR
-- 
cgit 


From 78f6ccebc584446823bdf3ae8435827328a74448 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Thu, 25 Aug 2005 12:44:37 +0000
Subject: r9613: remove TMPDIR from 'make test' scripts (after comments by Don
 Watson) (This used to be commit 0626bb68411225d5402221ec9b305390393c38e5)

---
 source3/script/tests/runtests.sh | 7 +++----
 source3/script/tests/t_001.sh    | 6 +++++-
 source3/script/tests/t_002.sh    | 7 ++++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/runtests.sh b/source3/script/tests/runtests.sh
index bb599ea3ec..a5dc3ecfb4 100644
--- a/source3/script/tests/runtests.sh
+++ b/source3/script/tests/runtests.sh
@@ -28,7 +28,7 @@ PASSWORD=test
 
 SRCDIR=`pwd`
 SCRIPTDIR=$SRCDIR/script/tests
-TMPDIR=$PREFIX_ABS/tmp
+SHRDIR=$PREFIX_ABS/tmp
 LIBDIR=$PREFIX_ABS/lib
 PIDDIR=$PREFIX_ABS/pid
 CONFFILE=$LIBDIR/smb.conf
@@ -40,7 +40,7 @@ CONFIGURATION="-s $CONFFILE"
 PATH=`pwd`/bin:$PATH
 
 export PREFIX_ABS CONFIGURATION CONFFILE PATH SOCKET_WRAPPER_DIR DOMAIN
-export PRIVATEDIR LIBDIR PIDDIR LOCKDIR TMPDIR LOGDIR
+export PRIVATEDIR LIBDIR PIDDIR LOCKDIR LOGDIR
 export SRCDIR SCRIPTDIR
 export USERNAME PASSWORD
 
@@ -62,8 +62,7 @@ fi
 ##
 
 /bin/rm -rf $PREFIX/*
-mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $LOCKDIR $TMPDIR $LOGDIR $SOCKET_WRAPPER_DIR
-chmod 1777 $TMPDIR
+mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $LOCKDIR $LOGDIR $SOCKET_WRAPPER_DIR
 
 ##
 ## Create the common config include file with the basic settings
diff --git a/source3/script/tests/t_001.sh b/source3/script/tests/t_001.sh
index 995cfb11eb..6d54d0e489 100644
--- a/source3/script/tests/t_001.sh
+++ b/source3/script/tests/t_001.sh
@@ -8,7 +8,7 @@ cat >$CONFFILE<<EOF
 	smb ports = 139
 
 [test]
-	path = $TMPDIR
+	path = $PREFIX_ABS/tmp
 	read only = no
 EOF
 
@@ -16,6 +16,10 @@ EOF
 ## Test code 
 ##
 
+/bin/rm -rf $PREFIX_ABS/tmp
+mkdir $PREFIX_ABS/tmp
+chmod 1777 $PREFIX_ABS/tmp
+
 start_smbd || exit $?
 
 smbclient $CONFIGURATION -L localhost -N -p 139
diff --git a/source3/script/tests/t_002.sh b/source3/script/tests/t_002.sh
index 48987262a7..42070bed80 100644
--- a/source3/script/tests/t_002.sh
+++ b/source3/script/tests/t_002.sh
@@ -7,7 +7,7 @@ cat >$CONFFILE<<EOF
 	include = $LIBDIR/common.conf
 
 [test]
-	path = $TMPDIR
+	path = $PREFIX_ABS/tmp
 	read only = no
 EOF
 
@@ -15,6 +15,11 @@ EOF
 ## Test code 
 ##
 
+/bin/rm -rf $PREFIX_ABS/tmp
+mkdir $PREFIX_ABS/tmp
+chmod 1777 $PREFIX_ABS/tmp
+
+
 start_smbd || exit $?
 
 smbtorture //localhost/test -U${USERNAME}%${PASSWORD} FDPASS
-- 
cgit 


From dffa98b761a0dc663be9b1d64b3fe1fc180440fb Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Thu, 25 Aug 2005 13:53:09 +0000
Subject: r9615: trying a 3 second timeout on smbcontrol (This used to be
 commit 4e62a51bf68e8ef19beed63a7520e0db20321b11)

---
 source3/script/tests/functions | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/functions b/source3/script/tests/functions
index 40e185e153..13139f6d8f 100644
--- a/source3/script/tests/functions
+++ b/source3/script/tests/functions
@@ -2,13 +2,16 @@
 ## library file for test functions
 ##
 
+
+SMBCONTROL="smbcontrol -t 3"
+
 ##
 ## start/stop smbd daemon
 ##
 check_smbd_running()
 {
 	## the smbcontrol ping will return a 0 on success
-	smbcontrol $CONFIGURATION smbd ping 2>&1 > /dev/null
+	$SMBCONTROL $CONFIGURATION smbd ping 2>&1 > /dev/null
 }
 
 start_smbd()
@@ -19,7 +22,7 @@ start_smbd()
 
 	sleep 1
 
-	smbcontrol $CONFIGURATION `cat $PIDDIR/smbd.pid` ping 2>&1 > /dev/null || return $?
+	$SMBCONTROL $CONFIGURATION `cat $PIDDIR/smbd.pid` ping 2>&1 > /dev/null || return $?
 }
 
 stop_smbd()
@@ -30,7 +33,7 @@ stop_smbd()
 	## belt and braces; first kill and then send a shutdown message
 
 	kill -TERM $smbd_pid
-	smbcontrol $CONFIGURATION smbd shutdown
+	$SMBCONTROL $CONFIGURATION smbd shutdown
 
 	## check to see if smbd is already running
 	check_smbd_running
@@ -47,7 +50,7 @@ stop_smbd()
 check_nmbd_running()
 {
 	## the smbcontrol ping will return a 0 on success
-	smbcontrol $CONFIGURATION nmbd ping 2>&1 > /dev/null
+	$SMBCONTROL $CONFIGURATION nmbd ping 2>&1 > /dev/null
 }
 
 start_nmbd()
-- 
cgit 


From 013ac99a9dce268dcc46bccb8754aacced931157 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Thu, 25 Aug 2005 17:15:23 +0000
Subject: r9618: adding get/put tests from Don Watson (This used to be commit
 a94de276aec174bc05406ff52568e9fcd05c114e)

---
 source3/script/tests/functions | 11 ++++++++++-
 source3/script/tests/t_001.sh  | 22 ++++++++++++++++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/functions b/source3/script/tests/functions
index 13139f6d8f..0981d9e29e 100644
--- a/source3/script/tests/functions
+++ b/source3/script/tests/functions
@@ -43,9 +43,18 @@ stop_smbd()
 	fi
 }
 
+check_ret_value()
+{
+	ret=$@
+
+	if test $ret != 0; then
+		stop_smbd
+		exit $ret
+	fi
+}
 
 ##
-## start/stop smbd daemon
+## start/stop nmbd daemon
 ##
 check_nmbd_running()
 {
diff --git a/source3/script/tests/t_001.sh b/source3/script/tests/t_001.sh
index 6d54d0e489..7db2abe226 100644
--- a/source3/script/tests/t_001.sh
+++ b/source3/script/tests/t_001.sh
@@ -22,9 +22,27 @@ chmod 1777 $PREFIX_ABS/tmp
 
 start_smbd || exit $?
 
+## share enumeration
+
 smbclient $CONFIGURATION -L localhost -N -p 139
-ret=$?
+check_ret_value $? 
+
+testfile=`echo $CONFIGURATION | awk '{print $2}'`
+filename=`basename $testfile`
+dirname=`dirname $testfile`
+
+
+# file get/put
+
+smbclient //localhost/test $PASSWORD $CONFIGURATION -c "lcd $dirname; put $filename"
+check_ret_value $? 
+
+smbclient //localhost/test $PASSWORD $CONFIGURATION -c "get $filename; rm $filename"
+check_ret_value $? 
+
+diff $filename $testfile 2> /dev/null > /dev/null
+check_ret_value $?
 
 stop_smbd
+exit 0
 
-exit $ret
-- 
cgit 


From 54abd2aa66069e6baf7769c496f46d9dba18db39 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 30 Sep 2005 17:13:37 +0000
Subject: r10656: BIG merge from trunk.  Features not copied over

* \PIPE\unixinfo
* winbindd's {group,alias}membership new functions
* winbindd's lookupsids() functionality
* swat (trunk changes to be reverted as per discussion with Deryck)
(This used to be commit 939c3cb5d78e3a2236209b296aa8aba8bdce32d3)
---
 source3/script/tests/functions | 22 +++++-----------------
 source3/script/tests/t_001.sh  | 22 ++--------------------
 2 files changed, 7 insertions(+), 37 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/functions b/source3/script/tests/functions
index 0981d9e29e..40e185e153 100644
--- a/source3/script/tests/functions
+++ b/source3/script/tests/functions
@@ -2,16 +2,13 @@
 ## library file for test functions
 ##
 
-
-SMBCONTROL="smbcontrol -t 3"
-
 ##
 ## start/stop smbd daemon
 ##
 check_smbd_running()
 {
 	## the smbcontrol ping will return a 0 on success
-	$SMBCONTROL $CONFIGURATION smbd ping 2>&1 > /dev/null
+	smbcontrol $CONFIGURATION smbd ping 2>&1 > /dev/null
 }
 
 start_smbd()
@@ -22,7 +19,7 @@ start_smbd()
 
 	sleep 1
 
-	$SMBCONTROL $CONFIGURATION `cat $PIDDIR/smbd.pid` ping 2>&1 > /dev/null || return $?
+	smbcontrol $CONFIGURATION `cat $PIDDIR/smbd.pid` ping 2>&1 > /dev/null || return $?
 }
 
 stop_smbd()
@@ -33,7 +30,7 @@ stop_smbd()
 	## belt and braces; first kill and then send a shutdown message
 
 	kill -TERM $smbd_pid
-	$SMBCONTROL $CONFIGURATION smbd shutdown
+	smbcontrol $CONFIGURATION smbd shutdown
 
 	## check to see if smbd is already running
 	check_smbd_running
@@ -43,23 +40,14 @@ stop_smbd()
 	fi
 }
 
-check_ret_value()
-{
-	ret=$@
-
-	if test $ret != 0; then
-		stop_smbd
-		exit $ret
-	fi
-}
 
 ##
-## start/stop nmbd daemon
+## start/stop smbd daemon
 ##
 check_nmbd_running()
 {
 	## the smbcontrol ping will return a 0 on success
-	$SMBCONTROL $CONFIGURATION nmbd ping 2>&1 > /dev/null
+	smbcontrol $CONFIGURATION nmbd ping 2>&1 > /dev/null
 }
 
 start_nmbd()
diff --git a/source3/script/tests/t_001.sh b/source3/script/tests/t_001.sh
index 7db2abe226..6d54d0e489 100644
--- a/source3/script/tests/t_001.sh
+++ b/source3/script/tests/t_001.sh
@@ -22,27 +22,9 @@ chmod 1777 $PREFIX_ABS/tmp
 
 start_smbd || exit $?
 
-## share enumeration
-
 smbclient $CONFIGURATION -L localhost -N -p 139
-check_ret_value $? 
-
-testfile=`echo $CONFIGURATION | awk '{print $2}'`
-filename=`basename $testfile`
-dirname=`dirname $testfile`
-
-
-# file get/put
-
-smbclient //localhost/test $PASSWORD $CONFIGURATION -c "lcd $dirname; put $filename"
-check_ret_value $? 
-
-smbclient //localhost/test $PASSWORD $CONFIGURATION -c "get $filename; rm $filename"
-check_ret_value $? 
-
-diff $filename $testfile 2> /dev/null > /dev/null
-check_ret_value $?
+ret=$?
 
 stop_smbd
-exit 0
 
+exit $ret
-- 
cgit 


From e2de656314c8d50bfd5f14b24826a2df962fe704 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 18 Jan 2006 04:44:59 +0000
Subject: r12990: BUG 3329: patch from David May <mayd@cygnus.uwa.edu.au> for
 Solaris shell script portability issues in 'make test' (This used to be
 commit 19339a9510467b4b2cf3889bc6a08563cdc940f4)

---
 source3/script/tests/functions   | 4 ++--
 source3/script/tests/runtests.sh | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/functions b/source3/script/tests/functions
index 40e185e153..8cb8f0b155 100644
--- a/source3/script/tests/functions
+++ b/source3/script/tests/functions
@@ -34,7 +34,7 @@ stop_smbd()
 
 	## check to see if smbd is already running
 	check_smbd_running
-	if test $? == 0; then
+	if test $? = 0; then
 		echo "Unable to stop smbd!"
 		exit 2
 	fi
@@ -74,7 +74,7 @@ stop_nmbd()
 
 	## check to see if smbd is already running
 	kill -0 $nmbd_pid 2> /dev/null
-	if test $? == 0; then
+	if test $? = 0; then
 		echo "Unable to stop nmbd!"
 		exit 2
 	fi
diff --git a/source3/script/tests/runtests.sh b/source3/script/tests/runtests.sh
index a5dc3ecfb4..ddaf94e8ac 100644
--- a/source3/script/tests/runtests.sh
+++ b/source3/script/tests/runtests.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-if [ "x$1" == "x" ]; then
+if [ "x$1" = "x" ]; then
 	echo "$0 <directory>"
 	exit 1
 fi
 
-if [ $# == 2 ]; then
+if [ $# = 2 ]; then
 	testnum=$2
 fi
 
@@ -49,7 +49,7 @@ export USERNAME PASSWORD
 ## verify that we were built with --enable-socket-wrapper
 ##
 
-if test "x`smbd -b | grep SOCKET_WRAPPER`" == "x"; then
+if test "x`smbd -b | grep SOCKET_WRAPPER`" = "x"; then
 	echo "***"
 	echo "*** You must include --enable-socket-wrapper when compiling Samba"
 	echo "*** in order to execute 'make test'.  Exiting...."
-- 
cgit 


From 9b277916445e6c1bdc60e06c382067c209287aaf Mon Sep 17 00:00:00 2001
From: Lars Müller <lmuelle@samba.org>
Date: Mon, 13 Mar 2006 16:10:26 +0000
Subject: r14325: Add pam_modules rule which builds the configure(d) pam
 modules.  This is called as part of the all rule (again only if pam modules
 are requested by configure).

Add pam_winbind rule.

Ensure proto_exists before we build the pam modules.

Add test_pam_modules rule to test if the built pam modules have any
unresolved symbols.  For test_pam_modules we use script/tests/dlopen.sh
which was written by Nalin Dahyabhai <nalin@redhat.com>.  Thanks Nalin!
RedHat and SuSE use this script to test nss and pam modules since
several years.
(This used to be commit 71b2eb55adcd28f3796254ea1ce0bcee6098e712)
---
 source3/script/tests/dlopen.sh | 91 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100755 source3/script/tests/dlopen.sh

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/dlopen.sh b/source3/script/tests/dlopen.sh
new file mode 100755
index 0000000000..6127953692
--- /dev/null
+++ b/source3/script/tests/dlopen.sh
@@ -0,0 +1,91 @@
+#!/bin/sh
+#
+# Copyright (C) Nalin Dahyabhai <nalin@redhat.com> 2003
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+tempdir=`mktemp -d /tmp/dlopenXXXXXX`
+test -n "$tempdir" || exit 1
+cat >> $tempdir/dlopen.c << _EOF
+#include <dlfcn.h>
+#include <stdio.h>
+#include <limits.h>
+#include <sys/stat.h>
+/* Simple program to see if dlopen() would succeed. */
+int main(int argc, char **argv)
+{
+	int i;
+	struct stat st;
+	char buf[PATH_MAX];
+	for (i = 1; i < argc; i++) {
+		if (dlopen(argv[i], RTLD_NOW)) {
+			fprintf(stdout, "dlopen() of \"%s\" succeeded.\n",
+				argv[i]);
+		} else {
+			snprintf(buf, sizeof(buf), "./%s", argv[i]);
+			if ((stat(buf, &st) == 0) && dlopen(buf, RTLD_NOW)) {
+				fprintf(stdout, "dlopen() of \"./%s\" "
+					"succeeded.\n", argv[i]);
+			} else {
+				fprintf(stdout, "dlopen() of \"%s\" failed: "
+					"%s\n", argv[i], dlerror());
+				return 1;
+			}
+		}
+	}
+	return 0;
+}
+_EOF
+
+for arg in $@ ; do
+	case "$arg" in
+	"")
+		;;
+	-I*|-D*|-f*|-m*|-g*|-O*|-W*)
+		cflags="$cflags $arg"
+		;;
+	-l*|-L*)
+		ldflags="$ldflags $arg"
+		;;
+	/*)
+		modules="$modules $arg"
+		;;
+	*)
+		modules="$modules $arg"
+		;;
+	esac
+done
+
+${CC:-gcc} $RPM_OPT_FLAGS $CFLAGS -o $tempdir/dlopen $cflags $tempdir/dlopen.c $ldflags -ldl
+
+retval=0
+for module in $modules ; do
+	case "$module" in
+	"")
+		;;
+	/*)
+		$tempdir/dlopen "$module"
+		retval=$?
+		;;
+	*)
+		$tempdir/dlopen ./"$module"
+		retval=$?
+		;;
+	esac
+done
+
+rm -f $tempdir/dlopen $tempdir/dlopen.c
+rmdir $tempdir
+exit $retval
-- 
cgit 


From b40e2588707d2b7c44ee91da91872e4f9dc5209b Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 21 Mar 2006 15:33:14 +0000
Subject: r14624: - add timelimit.c - add configure tests
 --with-selftest-prefix=/tmp/samba-test   this is needed because the path name
 of unix socket can only be 108 chars long - add configure test
 --with-smbtorture4-path=/home/foo/prefix/samba4/bin/smbtorture   this will be
 used to run samba4's smbtorture inside samba3's make test later

metze
(This used to be commit d9df1853b947c70f747ea30a353162f2985ef250)
---
 source3/script/tests/timelimit.c | 78 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 source3/script/tests/timelimit.c

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/timelimit.c b/source3/script/tests/timelimit.c
new file mode 100644
index 0000000000..93d7f6497e
--- /dev/null
+++ b/source3/script/tests/timelimit.c
@@ -0,0 +1,78 @@
+/* run a command with a limited timeout
+   tridge@samba.org, June 2005
+
+   attempt to be as portable as possible (fighting posix all the way)
+*/
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <signal.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+static void usage(void)
+{
+	printf("usage: timelimit <time> <command>\n");
+}
+
+static void sig_alrm(int sig)
+{
+	kill(0, SIGKILL);
+	exit(1);
+}
+
+static void sig_term_kill(int sig)
+{
+	static int c = 0;
+
+	if (c > 2) {
+		kill(0, SIGKILL);
+		exit(0);
+	}
+
+	c++;
+}
+
+static void sig_term(int sig)
+{
+	kill(0, SIGTERM);
+	signal(SIGTERM, sig_term_kill);
+}
+
+int main(int argc, char *argv[])
+{
+	int maxtime, ret=1;
+
+	if (argc < 3) {
+		usage();
+		exit(1);
+	}
+
+	if (setpgrp() == -1) {
+		perror("setpgrp");
+		exit(1);
+	}
+
+	maxtime = atoi(argv[1]);
+	signal(SIGALRM, sig_alrm);
+	alarm(maxtime);
+	signal(SIGTERM, sig_term);
+
+	if (fork() == 0) {
+		execvp(argv[2], argv+2);
+	}
+
+	do {
+		int status;
+		pid_t pid = wait(&status);
+		if (pid != -1) {
+			ret = WEXITSTATUS(status);
+		} else if (errno == ECHILD) {
+			break;
+		}
+	} while (1);
+
+	exit(ret);
+}
-- 
cgit 


From 906c19faca757561e55d7d5470940535810779d5 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 21 Mar 2006 21:25:29 +0000
Subject: r14628: sync timelimit.c with the version from the build-farm
 repository

metze
(This used to be commit 1b6a64378553008127a85131fa4139842de4128b)
---
 source3/script/tests/timelimit.c | 59 ++++++++++++++++++++++++++--------------
 1 file changed, 39 insertions(+), 20 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/timelimit.c b/source3/script/tests/timelimit.c
index 93d7f6497e..af8ff27454 100644
--- a/source3/script/tests/timelimit.c
+++ b/source3/script/tests/timelimit.c
@@ -12,57 +12,74 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
+static pid_t child_pid;
+
 static void usage(void)
 {
 	printf("usage: timelimit <time> <command>\n");
+	printf("   SIGALRM - passes SIGKILL to command's process group and exit(1)\n");
+	printf("   SIGUSR1 - passes SIGTERM to command's process group\n");
+	printf("   SIGTERM - passes SIGTERM to command's process group and exit(0)\n");
 }
 
 static void sig_alrm(int sig)
 {
-	kill(0, SIGKILL);
+	fprintf(stderr, "\nMaximum time expired in timelimit - killing\n");
+	kill(-child_pid, SIGKILL);
 	exit(1);
 }
 
-static void sig_term_kill(int sig)
+static void sig_term(int sig)
 {
-	static int c = 0;
-
-	if (c > 2) {
-		kill(0, SIGKILL);
-		exit(0);
-	}
+	kill(-child_pid, SIGTERM);
+	exit(0);
+}
 
-	c++;
+static void sig_usr1(int sig)
+{
+	kill(-child_pid, SIGTERM);
 }
 
-static void sig_term(int sig)
+static void new_process_group(void)
 {
-	kill(0, SIGTERM);
-	signal(SIGTERM, sig_term_kill);
+#ifdef BSD_SETPGRP
+	if (setpgrp(0,0) == -1) {
+		perror("setpgrp");
+		exit(1);
+	}
+#else
+	if (setpgrp() == -1) {
+		perror("setpgrp");
+		exit(1);
+	}
+#endif
 }
 
+
 int main(int argc, char *argv[])
 {
 	int maxtime, ret=1;
+	pid_t pgid;
 
 	if (argc < 3) {
 		usage();
 		exit(1);
 	}
 
-	if (setpgrp() == -1) {
-		perror("setpgrp");
+	maxtime = atoi(argv[1]);
+
+	child_pid = fork();
+	if (child_pid == 0) {
+		new_process_group();
+		execvp(argv[2], argv+2);
+		perror(argv[2]);
 		exit(1);
 	}
 
-	maxtime = atoi(argv[1]);
+	signal(SIGTERM, sig_term);
+	signal(SIGUSR1, sig_usr1);
 	signal(SIGALRM, sig_alrm);
 	alarm(maxtime);
-	signal(SIGTERM, sig_term);
-
-	if (fork() == 0) {
-		execvp(argv[2], argv+2);
-	}
 
 	do {
 		int status;
@@ -74,5 +91,7 @@ int main(int argc, char *argv[])
 		}
 	} while (1);
 
+	kill(-child_pid, SIGKILL);
+
 	exit(ret);
 }
-- 
cgit 


From ed9ad1827bcead21483ce59464b5e3da7a509d29 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 21 Mar 2006 22:16:44 +0000
Subject: r14632: add basic 'make test' using samba4's smbtorture

I'll try to add some tests using samba3's smbtorture and smbclient
later.

can someone check if this would be save to run on the build-farm
without leaking child processes...

metze
(This used to be commit 899fd6808ebd04d039caf7199c60d34a4987b43a)
---
 source3/script/tests/functions         |  82 ------------
 source3/script/tests/runtests.sh       | 129 -------------------
 source3/script/tests/selftest.sh       | 194 +++++++++++++++++++++++++++++
 source3/script/tests/t_001.sh          |  30 -----
 source3/script/tests/t_002.sh          |  30 -----
 source3/script/tests/test_functions.sh | 221 +++++++++++++++++++++++++++++++++
 source3/script/tests/test_posix_s3.sh  |  52 ++++++++
 source3/script/tests/tests_all.sh      |   8 ++
 8 files changed, 475 insertions(+), 271 deletions(-)
 delete mode 100644 source3/script/tests/functions
 delete mode 100644 source3/script/tests/runtests.sh
 create mode 100755 source3/script/tests/selftest.sh
 delete mode 100644 source3/script/tests/t_001.sh
 delete mode 100644 source3/script/tests/t_002.sh
 create mode 100644 source3/script/tests/test_functions.sh
 create mode 100755 source3/script/tests/test_posix_s3.sh
 create mode 100755 source3/script/tests/tests_all.sh

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/functions b/source3/script/tests/functions
deleted file mode 100644
index 8cb8f0b155..0000000000
--- a/source3/script/tests/functions
+++ /dev/null
@@ -1,82 +0,0 @@
-##
-## library file for test functions
-##
-
-##
-## start/stop smbd daemon
-##
-check_smbd_running()
-{
-	## the smbcontrol ping will return a 0 on success
-	smbcontrol $CONFIGURATION smbd ping 2>&1 > /dev/null
-}
-
-start_smbd()
-{
-	echo "Starting smbd...."
-
-	smbd $CONFIGURATION || return $?
-
-	sleep 1
-
-	smbcontrol $CONFIGURATION `cat $PIDDIR/smbd.pid` ping 2>&1 > /dev/null || return $?
-}
-
-stop_smbd()
-{
-	smbd_pid=`cat $PIDDIR/smbd.pid`
-	echo "Shutting down smbd (pid $smbd_pid)..."
-
-	## belt and braces; first kill and then send a shutdown message
-
-	kill -TERM $smbd_pid
-	smbcontrol $CONFIGURATION smbd shutdown
-
-	## check to see if smbd is already running
-	check_smbd_running
-	if test $? = 0; then
-		echo "Unable to stop smbd!"
-		exit 2
-	fi
-}
-
-
-##
-## start/stop smbd daemon
-##
-check_nmbd_running()
-{
-	## the smbcontrol ping will return a 0 on success
-	smbcontrol $CONFIGURATION nmbd ping 2>&1 > /dev/null
-}
-
-start_nmbd()
-{
-	echo "Starting nmbd...."
-
-	nmbd $CONFIGURATION || return $?
-
-	sleep 1
-
-	# smbcontrol $CONFIGURATION `cat $PIDDIR/nmbd.pid` ping 2>&1 > /dev/null || return $?
-	kill -0 `cat $PIDDIR/nmbd.pid`
-}
-
-stop_nmbd()
-{
-	nmbd_pid=`cat $PIDDIR/nmbd.pid`
-	echo "Shutting down nmbd (pid $nmbd_pid)..."
-
-	## belt and braces; first kill and then send a shutdown message
-
-	kill -TERM $nmbd_pid 2> /dev/null
-	sleep 1
-
-	## check to see if smbd is already running
-	kill -0 $nmbd_pid 2> /dev/null
-	if test $? = 0; then
-		echo "Unable to stop nmbd!"
-		exit 2
-	fi
-}
-
diff --git a/source3/script/tests/runtests.sh b/source3/script/tests/runtests.sh
deleted file mode 100644
index ddaf94e8ac..0000000000
--- a/source3/script/tests/runtests.sh
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/bin/sh
-
-if [ "x$1" = "x" ]; then
-	echo "$0 <directory>"
-	exit 1
-fi
-
-if [ $# = 2 ]; then
-	testnum=$2
-fi
-
-##
-## create the test directory
-##
-PREFIX=`echo $1 | sed s+//+/+`
-mkdir -p $PREFIX || exit $?
-OLD_PWD=`pwd`
-cd $PREFIX || exit $?
-export PREFIX_ABS=`pwd`
-cd $OLD_PWD
-
-##
-## setup the various environment variables we need
-##
-
-USERNAME=`whoami`
-PASSWORD=test
-
-SRCDIR=`pwd`
-SCRIPTDIR=$SRCDIR/script/tests
-SHRDIR=$PREFIX_ABS/tmp
-LIBDIR=$PREFIX_ABS/lib
-PIDDIR=$PREFIX_ABS/pid
-CONFFILE=$LIBDIR/smb.conf
-PRIVATEDIR=$PREFIX_ABS/private
-LOCKDIR=$PREFIX_ABS/lockdir
-LOGDIR=$PREFIX_ABS/logs
-SOCKET_WRAPPER_DIR=$PREFIX_ABS/sockwrap
-CONFIGURATION="-s $CONFFILE"
-PATH=`pwd`/bin:$PATH
-
-export PREFIX_ABS CONFIGURATION CONFFILE PATH SOCKET_WRAPPER_DIR DOMAIN
-export PRIVATEDIR LIBDIR PIDDIR LOCKDIR LOGDIR
-export SRCDIR SCRIPTDIR
-export USERNAME PASSWORD
-
-
-##
-## verify that we were built with --enable-socket-wrapper
-##
-
-if test "x`smbd -b | grep SOCKET_WRAPPER`" = "x"; then
-	echo "***"
-	echo "*** You must include --enable-socket-wrapper when compiling Samba"
-	echo "*** in order to execute 'make test'.  Exiting...."
-	echo "***"
-	exit 1
-fi
-
-## 
-## create the test directory layout
-##
-
-/bin/rm -rf $PREFIX/*
-mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $LOCKDIR $LOGDIR $SOCKET_WRAPPER_DIR
-
-##
-## Create the common config include file with the basic settings
-##
-
-cat >$LIBDIR/common.conf<<EOF
-	netbios name = LOCALHOST
-	workgroup = SAMBA-TEST
-
-	private dir = $PRIVATEDIR
-	pid directory = $PIDDIR
-	lock directory = $LOCKDIR
-	log file = $LOGDIR/log.%m
-	log level = 0
-
-	passdb backend = tdbsam
-
-	interfaces = lo
-	bind interfaces only = yes
-
-	panic action = $SCRIPTDIR/gdb_backtrace %d
-EOF
-
-cat >$LIBDIR/smb.conf<<EOF
-[global]
-	include = $LIBDIR/common.conf
-EOF
-
-
-##
-## create a test account
-##
-
-(echo $PASSWORD; echo $PASSWORD) | smbpasswd -c $LIBDIR/smb.conf -L -s -a $USERNAME
-
-
-##
-## ready to go...now loop through the tests
-##
-
-if [ -f $SCRIPTDIR/t_$testnum.sh ]; then
-	testfile=$SCRIPTDIR/t_$testnum.sh
-	echo ">>>>>> Starting test driver `basename $testfile` <<<<<"
-	sh $testfile
-	if [ $? = 0 ]; then
-		echo ">>>>> test ok <<<<<"
-	else
-		echo ">>>>> test failed <<<<<"
-	fi
-
-	exit 0
-fi
-
-for testfile in `ls $SCRIPTDIR/t_*sh | sort`; do
-	echo " "
-	echo ">>>>>> Starting test driver `basename $testfile` <<<<<"
-	sh $testfile
-	if [ $? = 0 ]; then
-		echo ">>>>> test ok <<<<<"
-	else
-		echo ">>>>> test failed <<<<<"
-	fi
-done
-
diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
new file mode 100755
index 0000000000..caaf1e1df1
--- /dev/null
+++ b/source3/script/tests/selftest.sh
@@ -0,0 +1,194 @@
+#!/bin/sh
+
+if [ $# != 3 ]; then
+	echo "$0 <directory> <all | quick> <smbtorture4>"
+	exit 1
+fi
+
+SMBTORTURE4=$3
+TESTS=$2
+
+##
+## create the test directory
+##
+PREFIX=`echo $1 | sed s+//+/+`
+mkdir -p $PREFIX || exit $?
+OLD_PWD=`pwd`
+cd $PREFIX || exit $?
+export PREFIX_ABS=`pwd`
+cd $OLD_PWD
+
+if [ -z "$TORTURE_MAXTIME" ]; then
+    TORTURE_MAXTIME=300
+fi
+
+##
+## setup the various environment variables we need
+##
+
+SERVER=localhost
+USERNAME=`whoami`
+PASSWORD=test
+
+SRCDIR=`pwd`
+SCRIPTDIR=$SRCDIR/script/tests
+SHRDIR=$PREFIX_ABS/tmp
+LIBDIR=$PREFIX_ABS/lib
+PIDDIR=$PREFIX_ABS/pid
+CONFFILE=$LIBDIR/smb.conf
+COMMONCONFFILE=$LIBDIR/common.conf
+PRIVATEDIR=$PREFIX_ABS/private
+LOCKDIR=$PREFIX_ABS/lockdir
+LOGDIR=$PREFIX_ABS/logs
+SOCKET_WRAPPER_DIR=$PREFIX/sw
+CONFIGURATION="-s $CONFFILE"
+
+export PREFIX_ABS CONFIGURATION CONFFILE PATH SOCKET_WRAPPER_DIR DOMAIN
+export PRIVATEDIR LIBDIR PIDDIR LOCKDIR LOGDIR
+export SRCDIR SCRIPTDIR
+export USERNAME PASSWORD
+export SMBTORTURE4
+
+PATH=bin:$PATH
+export PATH
+
+##
+## verify that we were built with --enable-socket-wrapper
+##
+
+if test "x`smbd -b | grep SOCKET_WRAPPER`" = "x"; then
+	echo "***"
+	echo "*** You must include --enable-socket-wrapper when compiling Samba"
+	echo "*** in order to execute 'make test'.  Exiting...."
+	echo "***"
+	exit 1
+fi
+
+## 
+## create the test directory layout
+##
+echo -n "CREATE TEST ENVIRONMENT IN '$PREFIX'"...
+/bin/rm -rf $PREFIX/*
+mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $LOCKDIR $LOGDIR $SOCKET_WRAPPER_DIR
+mkdir -p $PREFIX_ABS/tmp
+chmod 777 $PREFIX_ABS/tmp
+
+##
+## Create the common config include file with the basic settings
+##
+
+cat >$COMMONCONFFILE<<EOF
+	netbios name = LOCALHOST
+	workgroup = SAMBA-TEST
+
+	private dir = $PRIVATEDIR
+	pid directory = $PIDDIR
+	lock directory = $LOCKDIR
+	log file = $LOGDIR/log.%m
+	log level = 0
+
+	passdb backend = tdbsam
+
+	name resolve order = bcast
+
+	interfaces = 127.0.0.1/8
+	bind interfaces only = yes
+
+	panic action = $SCRIPTDIR/gdb_backtrace %d
+EOF
+
+cat >$CONFFILE<<EOF
+[global]
+	include = $COMMONCONFFILE
+
+[tmp]
+	path = $PREFIX_ABS/tmp
+	read only = no
+EOF
+
+
+##
+## create a test account
+##
+
+(echo $PASSWORD; echo $PASSWORD) | \
+	smbpasswd -c $CONFFILE -L -s -a $USERNAME >/dev/null || exit 1
+
+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"
+export NMBD_TEST_LOG
+SMBD_TEST_LOG="$PREFIX/smbd_test.log"
+export SMBD_TEST_LOG
+
+# start off with 0 failures
+failed=0
+export failed
+
+. $SCRIPTDIR/test_functions.sh
+
+SOCKET_WRAPPER_DEFAULT_IFACE=1
+export SOCKET_WRAPPER_DEFAULT_IFACE
+samba3_check_or_start
+
+# ensure any one smbtorture call doesn't run too long
+# and smbtorture will use 127.0.0.26 as source address by default
+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"
+export TORTURE4_OPTIONS
+
+if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
+	TORTURE4_OPTIONS="$TORTURE4_OPTIONS --option=\"torture:progress=no\""
+fi
+
+##
+## ready to go...now loop through the tests
+##
+
+START=`date`
+(
+ # give time for nbt server to register its names
+ echo delaying for nbt name registration
+ sleep 4
+ # 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 $SERVER
+ bin/nmblookup $CONFIGURATION -U $SERVER $SERVER
+ bin/nmblookup $CONFIGURATION -U $SERVER $SERVER
+
+ failed=0
+
+ . $SCRIPTDIR/tests_$TESTS.sh
+ exit $failed
+)
+failed=$?
+
+samba3_stop_sig_term
+
+END=`date`
+echo "START: $START ($0)";
+echo "END:   $END ($0)";
+
+# if there were any valgrind failures, show them
+count=`find $PREFIX -name 'valgrind.log*' | wc -l`
+if [ "$count" != 0 ]; then
+    for f in $PREFIX/valgrind.log*; do
+	if [ -s $f ]; then
+	    echo "VALGRIND FAILURE";
+	    failed=`expr $failed + 1`
+	    cat $f
+	fi
+    done
+fi
+
+sleep 2
+samba3_stop_sig_kill
+
+teststatus $0 $failed
diff --git a/source3/script/tests/t_001.sh b/source3/script/tests/t_001.sh
deleted file mode 100644
index 6d54d0e489..0000000000
--- a/source3/script/tests/t_001.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-. $SCRIPTDIR/functions
-
-cat >$CONFFILE<<EOF
-[global]
-	include = $LIBDIR/common.conf
-	smb ports = 139
-
-[test]
-	path = $PREFIX_ABS/tmp
-	read only = no
-EOF
-
-##
-## Test code 
-##
-
-/bin/rm -rf $PREFIX_ABS/tmp
-mkdir $PREFIX_ABS/tmp
-chmod 1777 $PREFIX_ABS/tmp
-
-start_smbd || exit $?
-
-smbclient $CONFIGURATION -L localhost -N -p 139
-ret=$?
-
-stop_smbd
-
-exit $ret
diff --git a/source3/script/tests/t_002.sh b/source3/script/tests/t_002.sh
deleted file mode 100644
index 42070bed80..0000000000
--- a/source3/script/tests/t_002.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-. $SCRIPTDIR/functions
-
-cat >$CONFFILE<<EOF
-[global]
-	include = $LIBDIR/common.conf
-
-[test]
-	path = $PREFIX_ABS/tmp
-	read only = no
-EOF
-
-##
-## Test code 
-##
-
-/bin/rm -rf $PREFIX_ABS/tmp
-mkdir $PREFIX_ABS/tmp
-chmod 1777 $PREFIX_ABS/tmp
-
-
-start_smbd || exit $?
-
-smbtorture //localhost/test -U${USERNAME}%${PASSWORD} FDPASS
-ret=$?
-
-stop_smbd
-
-exit $ret
diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh
new file mode 100644
index 0000000000..265385d0b1
--- /dev/null
+++ b/source3/script/tests/test_functions.sh
@@ -0,0 +1,221 @@
+
+samba3_stop_sig_term() {
+	RET=0
+	kill -USR1 `cat $PIDDIR/timelimit.nmbd.pid` >/dev/null 2>&1 || \
+		kill -ALRM `cat $PIDDIR/timelimit.nmbd.pid` || RET=$?
+
+	kill -USR1 `cat $PIDDIR/timelimit.smbd.pid` >/dev/null 2>&1 || \
+		kill -ALRM `cat $PIDDIR/timelimit.smbd.pid` || RET=$?
+
+	return $RET;
+}
+
+samba3_stop_sig_kill() {
+	kill -ALRM `cat $PIDDIR/timelimit.nmbd.pid` >/dev/null 2>&1
+	kill -ALRM `cat $PIDDIR/timelimit.smbd.pid` >/dev/null 2>&1
+	return 0;
+}
+
+samba3_check_or_start() {
+	if [ -n "$SERVER_TEST_FIFO" ];then
+
+		trap samba3_stop_sig_kill SIGINT SIGQUIT
+		trap samba3_stop_sig_kill SIGTERM
+
+		if [ -p "$SERVER_TEST_FIFO" ];then
+			return 0;
+		fi
+
+		if [ -n "$SOCKET_WRAPPER_DIR" ];then
+			if [ -d "$SOCKET_WRAPPER_DIR" ]; then
+				rm -f $SOCKET_WRAPPER_DIR/*
+			else
+				mkdir -p $SOCKET_WRAPPER_DIR
+			fi
+		fi
+
+		rm -f $SERVER_TEST_FIFO
+		mkfifo $SERVER_TEST_FIFO
+
+		rm -f $NMBD_TEST_LOG
+		echo -n "STARTING NMBD..."
+		((
+			if [ -z "$NMBD_MAXTIME" ]; then
+			    NMBD_MAXTIME=2700
+			fi
+			timelimit $NMBD_MAXTIME $SMBD_VALGRIND $SRCDIR/bin/nmbd -F -S --no-process-group -d1 -s $CONFFILE > $NMBD_TEST_LOG 2>&1 &
+			TIMELIMIT_NMBD_PID=$!
+			echo $TIMELIMIT_NMBD_PID > $PIDDIR/timelimit.nmbd.pid
+			wait $TIMELIMIT_NMBD_PID
+			ret=$?;
+			rm -f $SERVER_TEST_FIFO
+			if [ -n "$SOCKET_WRAPPER_DIR" -a -d "$SOCKET_WRAPPER_DIR" ]; then
+				rm -f $SOCKET_WRAPPER_DIR/*
+			fi
+			if [ x"$ret" = x"0" ];then
+				echo "nmbd exits with status $ret";
+				echo "nmbd exits with status $ret" >>$NMBD_TEST_LOG;
+			elif [ x"$ret" = x"137" ];then
+				echo "nmbd got SIGXCPU and exits with status $ret!"
+				echo "nmbd got SIGXCPU and exits with status $ret!">>$NMBD_TEST_LOG;
+			else
+				echo "nmbd failed with status $ret!"
+				echo "nmbd failed with status $ret!">>$NMBD_TEST_LOG;
+			fi
+			exit $ret;
+		) || exit $? &) 2>/dev/null || exit $?
+		echo  "DONE"
+	
+		rm -f $SMBD_TEST_LOG
+		echo -n "STARTING SMBD..."
+		((
+			if [ -z "$SMBD_MAXTIME" ]; then
+			    SMBD_MAXTIME=2700
+			fi
+			timelimit $SMBD_MAXTIME $SMBD_VALGRIND $SRCDIR/bin/smbd -F -S --no-process-group -d1 -s $CONFFILE > $SMBD_TEST_LOG 2>&1 &
+			TIMELIMIT_SMBD_PID=$!
+			echo $TIMELIMIT_SMBD_PID > $PIDDIR/timelimit.smbd.pid
+			wait $TIMELIMIT_SMBD_PID
+			ret=$?;
+			rm -f $SERVER_TEST_FIFO
+			if [ -n "$SOCKET_WRAPPER_DIR" -a -d "$SOCKET_WRAPPER_DIR" ]; then
+				rm -f $SOCKET_WRAPPER_DIR/*
+			fi
+			if [ x"$ret" = x"0" ];then
+				echo "smbd exits with status $ret";
+				echo "smbd exits with status $ret" >>$SMBD_TEST_LOG;
+			elif [ x"$ret" = x"137" ];then
+				echo "smbd got SIGXCPU and exits with status $ret!"
+				echo "smbd got SIGXCPU and exits with status $ret!">>$SMBD_TEST_LOG;
+			else
+				echo "smbd failed with status $ret!"
+				echo "smbd failed with status $ret!">>$SMBD_TEST_LOG;
+			fi
+			exit $ret;
+		) || exit $? &) 2>/dev/null || exit $?
+		echo  "DONE"
+	fi
+	return 0;
+}
+
+samba3_nmbd_test_log() {
+	if [ -n "$NMBD_TEST_LOG" ];then
+		if [ -r "$NMBD_TEST_LOG" ];then
+			return 0;
+		fi
+	fi
+	return 1;
+}
+
+samba3_smbd_test_log() {
+	if [ -n "$SMBD_TEST_LOG" ];then
+		if [ -r "$SMBD_TEST_LOG" ];then
+			return 0;
+		fi
+	fi
+	return 1;
+}
+
+samba3_check_only() {
+	if [ -n "$SERVER_TEST_FIFO" ];then
+		if [ -p "$SERVER_TEST_FIFO" ];then
+			return 0;
+		fi
+		return 1;
+	fi
+	return 0;
+}
+
+testit() {
+	if [ -z "$PREFIX" ]; then
+	    PREFIX=test_prefix
+	    mkdir -p $PREFIX
+	fi
+	name=$1
+	shift 1
+	SERVERS_ARE_UP="no"
+	TEST_LOG="$PREFIX/test_log.$$"
+	trap "rm -f $TEST_LOG" EXIT
+	cmdline="$*"
+
+	if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
+		echo "--==--==--==--==--==--==--==--==--==--==--"
+		echo "Running test $name (level 0 stdout)"
+		echo "--==--==--==--==--==--==--==--==--==--==--"
+		date
+		echo "Testing $name"
+	else
+		echo "Testing $name ($failed)"
+	fi
+
+	samba3_check_only && SERVERS_ARE_UP="yes"
+	if [ x"$SERVERS_ARE_UP" != x"yes" ];then
+		if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
+			echo "SERVERS are down! Skipping: $cmdline"
+			echo "=========================================="
+			echo "TEST SKIPPED: $name (reason SERVERS are down)"
+			echo "=========================================="
+   		else
+			echo "TEST SKIPPED: $name (reason SERVERS are down)"
+		fi
+		return 1
+	fi
+	
+	( $cmdline > $TEST_LOG 2>&1 )
+	status=$?
+	if [ x"$status" != x"0" ]; then
+		echo "TEST OUTPUT:"
+		cat $TEST_LOG;
+		samba3_nmbd_test_log && echo "NMBD OUTPUT:";
+		samba3_nmbd_test_log && cat $NMBD_TEST_LOG;
+		samba3_smbd_test_log && echo "SMBD OUTPUT:";
+		samba3_smbd_test_log && cat $SMBD_TEST_LOG;
+		rm -f $TEST_LOG;
+		if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
+			echo "=========================================="
+			echo "TEST FAILED: $name (status $status)"
+			echo "=========================================="
+   		else
+			echo "TEST FAILED: $cmdline (status $status)"
+		fi
+		return 1;
+	fi
+	rm -f $TEST_LOG;
+	if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
+		echo "ALL OK: $cmdline"
+		echo "=========================================="
+		echo "TEST PASSED: $name"
+		echo "=========================================="
+	fi
+	return 0;
+}
+
+testok() {
+	name=`basename $1`
+	failed=$2
+
+	if [ x"$failed" = x"0" ];then
+		:
+	else
+		echo "$failed TESTS FAILED or SKIPPED ($name)";
+	fi
+	exit $failed
+}
+
+teststatus() {
+	name=`basename $1`
+	failed=$2
+
+	if [ x"$failed" = x"0" ];then
+		echo "TEST STATUS: $failed";
+	else
+		echo "TEST STATUS: $failed";
+	fi
+	exit $failed
+}
+
+if [ -z "$VALGRIND" ]; then
+    MALLOC_CHECK_=2
+    export MALLOC_CHECK_
+fi
+
diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
new file mode 100755
index 0000000000..64e984cb67
--- /dev/null
+++ b/source3/script/tests/test_posix_s3.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+# this runs the file serving tests that are expected to pass with samba3
+
+if [ $# -lt 3 ]; then
+cat <<EOF
+Usage: test_posix_s3.sh UNC USERNAME PASSWORD <first> <smbtorture args>
+EOF
+exit 1;
+fi
+
+unc="$1"
+username="$2"
+password="$3"
+start="$4"
+shift 4
+ADDARGS="$*"
+
+incdir=`dirname $0`
+. $incdir/test_functions.sh
+
+tests="BASE-FDPASS BASE-LOCK1 BASE-LOCK2 BASE-LOCK3 BASE-LOCK4"
+tests="$tests BASE-LOCK5 BASE-LOCK6 BASE-LOCK7 BASE-UNLINK BASE-ATTR"
+tests="$tests BASE-DIR1 BASE-DIR2 BASE-VUID"
+tests="$tests BASE-DENY1 BASE-DENY2 BASE-TCON BASE-TCONDEV BASE-RW1"
+tests="$tests BASE-DENY3 BASE-XCOPY BASE-OPEN BASE-DENYDOS"
+tests="$tests BASE-PROPERTIES BASE-MANGLE BASE-DELETE"
+tests="$tests BASE-CHKPATH BASE-SECLEAK BASE-TRANS2 BASE-NEGNOWAIT"
+tests="$tests BASE-NTDENY1 BASE-NTDENY2  BASE-RENAME BASE-OPENATTR BASE-DISCONNECT"
+tests="$tests RAW-QFSINFO RAW-QFILEINFO RAW-SFILEINFO-BUG RAW-SFILEINFO"
+tests="$tests RAW-LOCK RAW-MKDIR RAW-SEEK RAW-CONTEXT RAW-MUX RAW-OPEN RAW-WRITE"
+tests="$tests RAW-UNLINK RAW-READ RAW-CLOSE RAW-IOCTL RAW-SEARCH RAW-CHKPATH RAW-RENAME"
+tests="$tests RAW-EAS RAW-STREAMS RAW-ACLS"
+
+soon="BASE-CHARSET RAW-OPLOCK RAW-NOTIFY BASE-DELAYWRITE"
+#echo "WARNING: Skipping tests $soon"
+
+#testit "my first samba3 test" $SRCDIR/bin/smbclient $CONFIGURATION -L 127.0.0.1 -N -p 139 || failed=`expr $failed + 1`
+
+tests="BASE-FDPASS BASE-VUID BASE-UNLINK BASE-ATTR BASE-DIR2 BASE-TCON BASE-OPEN BASE-CHKPATH"
+
+failed=0
+for t in $tests; do
+    if [ ! -z "$start" -a "$start" != $t ]; then
+	continue;
+    fi
+    start=""
+    name="$t"
+    testit "$name" $VALGRIND $SMBTORTURE4 $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
+done
+
+testok $0 $failed
diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
new file mode 100755
index 0000000000..6f7a0c3d2d
--- /dev/null
+++ b/source3/script/tests/tests_all.sh
@@ -0,0 +1,8 @@
+
+if [ -n "$SMBTORTURE4" ];then
+	echo "Running Tests with Samba4's smbtorture"
+	$SMBTORTURE4 --version
+	$SCRIPTDIR/test_posix_s3.sh //$SERVER/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
+else
+	echo "Skip Tests with Samba4's smbtorture"
+fi
-- 
cgit 


From aa583e5912866069f1f79e0b675e9e7927c64fbe Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 23 Mar 2006 14:55:38 +0000
Subject: r14678: - we need to use 127.0.0.2/8 as interface for the server   as
 nmbd skip interfaces with address 127.0.0.1 - add samba3 smbclient -L tests -
 add samba3 smbtorture tests

metze
(This used to be commit 835f8f4339f41619ec890e38569b745c5ef5d44e)
---
 source3/script/tests/selftest.sh           | 39 +++++++++++++++++--------
 source3/script/tests/test_functions.sh     |  6 ++--
 source3/script/tests/test_posix_s3.sh      |  2 --
 source3/script/tests/test_smbclient_s3.sh  | 23 +++++++++++++++
 source3/script/tests/test_smbtorture_s3.sh | 47 ++++++++++++++++++++++++++++++
 source3/script/tests/tests_all.sh          |  5 +++-
 6 files changed, 104 insertions(+), 18 deletions(-)
 create mode 100755 source3/script/tests/test_smbclient_s3.sh
 create mode 100755 source3/script/tests/test_smbtorture_s3.sh

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index caaf1e1df1..c61cf76380 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -26,7 +26,8 @@ fi
 ## setup the various environment variables we need
 ##
 
-SERVER=localhost
+SERVER=localhost2
+SERVER_IP=127.0.0.2
 USERNAME=`whoami`
 PASSWORD=test
 
@@ -35,7 +36,8 @@ SCRIPTDIR=$SRCDIR/script/tests
 SHRDIR=$PREFIX_ABS/tmp
 LIBDIR=$PREFIX_ABS/lib
 PIDDIR=$PREFIX_ABS/pid
-CONFFILE=$LIBDIR/smb.conf
+CONFFILE=$LIBDIR/client.conf
+SERVERCONFFILE=$LIBDIR/server.conf
 COMMONCONFFILE=$LIBDIR/common.conf
 PRIVATEDIR=$PREFIX_ABS/private
 LOCKDIR=$PREFIX_ABS/lockdir
@@ -44,10 +46,11 @@ SOCKET_WRAPPER_DIR=$PREFIX/sw
 CONFIGURATION="-s $CONFFILE"
 
 export PREFIX_ABS CONFIGURATION CONFFILE PATH SOCKET_WRAPPER_DIR DOMAIN
-export PRIVATEDIR LIBDIR PIDDIR LOCKDIR LOGDIR
+export PRIVATEDIR LIBDIR PIDDIR LOCKDIR LOGDIR SERVERCONFFILE
 export SRCDIR SCRIPTDIR
 export USERNAME PASSWORD
 export SMBTORTURE4
+export SERVER SERVER_IP
 
 PATH=bin:$PATH
 export PATH
@@ -78,7 +81,6 @@ chmod 777 $PREFIX_ABS/tmp
 ##
 
 cat >$COMMONCONFFILE<<EOF
-	netbios name = LOCALHOST
 	workgroup = SAMBA-TEST
 
 	private dir = $PRIVATEDIR
@@ -91,14 +93,21 @@ cat >$COMMONCONFFILE<<EOF
 
 	name resolve order = bcast
 
-	interfaces = 127.0.0.1/8
-	bind interfaces only = yes
-
 	panic action = $SCRIPTDIR/gdb_backtrace %d
 EOF
 
 cat >$CONFFILE<<EOF
 [global]
+	netbios name = TORTURE26
+	interfaces = 127.0.0.26/8
+	include = $COMMONCONFFILE
+EOF
+
+cat >$SERVERCONFFILE<<EOF
+[global]
+	netbios name = $SERVER
+	interfaces = $SERVER_IP/8
+	bind interfaces only = yes
 	include = $COMMONCONFFILE
 
 [tmp]
@@ -133,7 +142,7 @@ export failed
 
 . $SCRIPTDIR/test_functions.sh
 
-SOCKET_WRAPPER_DEFAULT_IFACE=1
+SOCKET_WRAPPER_DEFAULT_IFACE=2
 export SOCKET_WRAPPER_DEFAULT_IFACE
 samba3_check_or_start
 
@@ -156,12 +165,18 @@ fi
 START=`date`
 (
  # give time for nbt server to register its names
- echo delaying for nbt name registration
+ echo "delaying for nbt name registration"
  sleep 4
  # 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 $SERVER
- bin/nmblookup $CONFIGURATION -U $SERVER $SERVER
- bin/nmblookup $CONFIGURATION -U $SERVER $SERVER
+ bin/nmblookup $CONFIGURATION -U $SERVER_IP __SAMBA__
+ bin/nmblookup $CONFIGURATION __SAMBA__
+ bin/nmblookup $CONFIGURATION -U 127.255.255.255 __SAMBA__
+ bin/nmblookup $CONFIGURATION -U $SERVER_IP $SERVER
+ bin/nmblookup $CONFIGURATION $SERVER
+ # make sure smbd is also up set
+ echo "wait for smbd"
+ bin/smbclient $CONFIGURATION -L $SERVER_IP -N -p 139 | head -2
+ bin/smbclient $CONFIGURATION -L $SERVER_IP -N -p 139 | head -2
 
  failed=0
 
diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh
index 265385d0b1..4e3b8ce7db 100644
--- a/source3/script/tests/test_functions.sh
+++ b/source3/script/tests/test_functions.sh
@@ -43,7 +43,7 @@ samba3_check_or_start() {
 			if [ -z "$NMBD_MAXTIME" ]; then
 			    NMBD_MAXTIME=2700
 			fi
-			timelimit $NMBD_MAXTIME $SMBD_VALGRIND $SRCDIR/bin/nmbd -F -S --no-process-group -d1 -s $CONFFILE > $NMBD_TEST_LOG 2>&1 &
+			timelimit $NMBD_MAXTIME $NMBD_VALGRIND $SRCDIR/bin/nmbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $NMBD_TEST_LOG 2>&1 &
 			TIMELIMIT_NMBD_PID=$!
 			echo $TIMELIMIT_NMBD_PID > $PIDDIR/timelimit.nmbd.pid
 			wait $TIMELIMIT_NMBD_PID
@@ -65,14 +65,14 @@ samba3_check_or_start() {
 			exit $ret;
 		) || exit $? &) 2>/dev/null || exit $?
 		echo  "DONE"
-	
+
 		rm -f $SMBD_TEST_LOG
 		echo -n "STARTING SMBD..."
 		((
 			if [ -z "$SMBD_MAXTIME" ]; then
 			    SMBD_MAXTIME=2700
 			fi
-			timelimit $SMBD_MAXTIME $SMBD_VALGRIND $SRCDIR/bin/smbd -F -S --no-process-group -d1 -s $CONFFILE > $SMBD_TEST_LOG 2>&1 &
+			timelimit $SMBD_MAXTIME $SMBD_VALGRIND $SRCDIR/bin/smbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $SMBD_TEST_LOG 2>&1 &
 			TIMELIMIT_SMBD_PID=$!
 			echo $TIMELIMIT_SMBD_PID > $PIDDIR/timelimit.smbd.pid
 			wait $TIMELIMIT_SMBD_PID
diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 64e984cb67..bc3060073c 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -35,8 +35,6 @@ tests="$tests RAW-EAS RAW-STREAMS RAW-ACLS"
 soon="BASE-CHARSET RAW-OPLOCK RAW-NOTIFY BASE-DELAYWRITE"
 #echo "WARNING: Skipping tests $soon"
 
-#testit "my first samba3 test" $SRCDIR/bin/smbclient $CONFIGURATION -L 127.0.0.1 -N -p 139 || failed=`expr $failed + 1`
-
 tests="BASE-FDPASS BASE-VUID BASE-UNLINK BASE-ATTR BASE-DIR2 BASE-TCON BASE-OPEN BASE-CHKPATH"
 
 failed=0
diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh
new file mode 100755
index 0000000000..007f3839f7
--- /dev/null
+++ b/source3/script/tests/test_smbclient_s3.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# this runs the file serving tests that are expected to pass with samba3
+
+if [ $# != 2 ]; then
+cat <<EOF
+Usage: test_smbclient_s3.sh SERVER SERVER_IP
+EOF
+exit 1;
+fi
+
+SERVER="$1"
+SERVER_IP="$2"
+
+incdir=`dirname $0`
+. $incdir/test_functions.sh
+
+failed=0
+
+testit "smbclient -L $SERVER_IP" $VALGRIND $SRCDIR/bin/smbclient $CONFIGURATION -L $SERVER_IP -N -p 139 || failed=`expr $failed + 1`
+testit "smbclient -L $SERVER" $VALGRIND $SRCDIR/bin/smbclient $CONFIGURATION -L $SERVER -N -p 139 || failed=`expr $failed + 1`
+
+testok $0 $failed
diff --git a/source3/script/tests/test_smbtorture_s3.sh b/source3/script/tests/test_smbtorture_s3.sh
new file mode 100755
index 0000000000..d0e15345df
--- /dev/null
+++ b/source3/script/tests/test_smbtorture_s3.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+# this runs the file serving tests that are expected to pass with samba3
+
+if [ $# -lt 3 ]; then
+cat <<EOF
+Usage: test_smbtorture_s3.sh UNC USERNAME PASSWORD <first> <smbtorture args>
+EOF
+exit 1;
+fi
+
+unc="$1"
+username="$2"
+password="$3"
+start="$4"
+shift 4
+ADDARGS="$*"
+
+incdir=`dirname $0`
+. $incdir/test_functions.sh
+
+tests="FDPASS LOCK1 LOCK2 LOCK3 LOCK4 LOCK5 LOCK6 LOCK7"
+tests="$tests UNLINK BROWSE ATTR TRANS2 MAXFID TORTURE "
+tests="$tests OPLOCK1 OPLOCK2 OPLOCK3"
+tests="$tests DIR DIR1 TCON TCONDEV RW1 RW2 RW3"
+tests="$tests OPEN XCOPY RENAME DELETE PROPERTIES W2K"
+tests="$tests PIPE_NUMBER TCON2 IOCTL CHKPATH FDSESS"
+
+skipped1="RANDOMIPC NEGNOWAIT NBENCH ERRMAPEXTRACT TRANS2SCAN NTTRANSSCAN"
+skipped2="DENY1 DENY2 OPENATTR CASETABLE EATEST"
+skipped3="MANGLE UTABLE"
+echo "Skipping the following tests:"
+echo "$skipped1"
+echo "$skipped2"
+echo "$skipped3"
+
+failed=0
+for t in $tests; do
+    if [ ! -z "$start" -a "$start" != $t ]; then
+	continue;
+    fi
+    start=""
+    name="$t"
+    testit "$name" $VALGRIND $SRCDIR/bin/smbtorture $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
+done
+
+testok $0 $failed
diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index 6f7a0c3d2d..64a7065ee9 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -1,8 +1,11 @@
 
+$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
+$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
+
 if [ -n "$SMBTORTURE4" ];then
 	echo "Running Tests with Samba4's smbtorture"
 	$SMBTORTURE4 --version
-	$SCRIPTDIR/test_posix_s3.sh //$SERVER/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
+	$SCRIPTDIR/test_posix_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
 else
 	echo "Skip Tests with Samba4's smbtorture"
 fi
-- 
cgit 


From 2f28844a1099d16607b6b54d382b2fb9e2ba64a2 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 27 Mar 2006 12:32:42 +0000
Subject: r14744: allow ./timelimit 5 ./timelimit 20 ./ignore_all_signals to
 work,

this is needed when we enable samba3's make test
in the build-farm

metze
(This used to be commit b120c21669a91a097f044530a1f7c59043465841)
---
 source3/script/tests/timelimit.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/timelimit.c b/source3/script/tests/timelimit.c
index af8ff27454..dc11720ec1 100644
--- a/source3/script/tests/timelimit.c
+++ b/source3/script/tests/timelimit.c
@@ -22,17 +22,25 @@ static void usage(void)
 	printf("   SIGTERM - passes SIGTERM to command's process group and exit(0)\n");
 }
 
-static void sig_alrm(int sig)
+static void sig_alrm_kill(int sig)
 {
 	fprintf(stderr, "\nMaximum time expired in timelimit - killing\n");
 	kill(-child_pid, SIGKILL);
 	exit(1);
 }
 
+static void sig_alrm_term(int sig)
+{
+	kill(-child_pid, SIGTERM);
+	alarm(5);
+	signal(SIGALRM, sig_alrm_kill);
+}
+
 static void sig_term(int sig)
 {
 	kill(-child_pid, SIGTERM);
-	exit(0);
+	alarm(1);
+	signal(SIGALRM, sig_alrm_kill);
 }
 
 static void sig_usr1(int sig)
@@ -78,7 +86,7 @@ int main(int argc, char *argv[])
 
 	signal(SIGTERM, sig_term);
 	signal(SIGUSR1, sig_usr1);
-	signal(SIGALRM, sig_alrm);
+	signal(SIGALRM, sig_alrm_term);
 	alarm(maxtime);
 
 	do {
-- 
cgit 


From c3624eb7c44487108a18e8fb57ca8ab132ecfd49 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 30 Mar 2006 09:34:02 +0000
Subject: r14809: - add my email address - fix usage() - remove unused var

metze
(This used to be commit 20782719d9eda7609788c132356db7107b7fe04a)
---
 source3/script/tests/timelimit.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/timelimit.c b/source3/script/tests/timelimit.c
index dc11720ec1..5b8281cb0d 100644
--- a/source3/script/tests/timelimit.c
+++ b/source3/script/tests/timelimit.c
@@ -1,5 +1,6 @@
 /* run a command with a limited timeout
    tridge@samba.org, June 2005
+   metze@samba.org, March 2006
 
    attempt to be as portable as possible (fighting posix all the way)
 */
@@ -17,9 +18,11 @@ static pid_t child_pid;
 static void usage(void)
 {
 	printf("usage: timelimit <time> <command>\n");
-	printf("   SIGALRM - passes SIGKILL to command's process group and exit(1)\n");
 	printf("   SIGUSR1 - passes SIGTERM to command's process group\n");
-	printf("   SIGTERM - passes SIGTERM to command's process group and exit(0)\n");
+	printf("   SIGALRM - passes SIGTERM to command's process group\n");
+	printf("             after 5s SIGKILL will be passed and exit(1)\n");
+	printf("   SIGTERM - passes SIGTERM to command's process group\n");
+	printf("             after 1s SIGKILL will be passed and exit(1)\n");
 }
 
 static void sig_alrm_kill(int sig)
@@ -67,7 +70,6 @@ static void new_process_group(void)
 int main(int argc, char *argv[])
 {
 	int maxtime, ret=1;
-	pid_t pgid;
 
 	if (argc < 3) {
 		usage();
-- 
cgit 


From 3aaa9031021b27bc2245380839655ea8a9792b6f Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 30 Mar 2006 13:11:08 +0000
Subject: r14820: sync test_posix_p3.sh with test_posix.sh from samba4 but only
 run the BASE-* tests and ignore some more than in samba4

metze
(This used to be commit 6f37658f927c103a71e918ab5ac78d61cd570c36)
---
 source3/script/tests/test_posix_s3.sh | 45 ++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 17 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index bc3060073c..865650fcdd 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -19,29 +19,40 @@ ADDARGS="$*"
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
-tests="BASE-FDPASS BASE-LOCK1 BASE-LOCK2 BASE-LOCK3 BASE-LOCK4"
-tests="$tests BASE-LOCK5 BASE-LOCK6 BASE-LOCK7 BASE-UNLINK BASE-ATTR"
-tests="$tests BASE-DIR1 BASE-DIR2 BASE-VUID"
-tests="$tests BASE-DENY1 BASE-DENY2 BASE-TCON BASE-TCONDEV BASE-RW1"
-tests="$tests BASE-DENY3 BASE-XCOPY BASE-OPEN BASE-DENYDOS"
-tests="$tests BASE-PROPERTIES BASE-MANGLE BASE-DELETE"
-tests="$tests BASE-CHKPATH BASE-SECLEAK BASE-TRANS2 BASE-NEGNOWAIT"
-tests="$tests BASE-NTDENY1 BASE-NTDENY2  BASE-RENAME BASE-OPENATTR BASE-DISCONNECT"
-tests="$tests RAW-QFSINFO RAW-QFILEINFO RAW-SFILEINFO-BUG RAW-SFILEINFO"
-tests="$tests RAW-LOCK RAW-MKDIR RAW-SEEK RAW-CONTEXT RAW-MUX RAW-OPEN RAW-WRITE"
-tests="$tests RAW-UNLINK RAW-READ RAW-CLOSE RAW-IOCTL RAW-SEARCH RAW-CHKPATH RAW-RENAME"
-tests="$tests RAW-EAS RAW-STREAMS RAW-ACLS"
-
-soon="BASE-CHARSET RAW-OPLOCK RAW-NOTIFY BASE-DELAYWRITE"
-#echo "WARNING: Skipping tests $soon"
-
-tests="BASE-FDPASS BASE-VUID BASE-UNLINK BASE-ATTR BASE-DIR2 BASE-TCON BASE-OPEN BASE-CHKPATH"
+base="BASE-ATTR BASE-CHARSET BASE-CHKPATH BASE-DEFER_OPEN BASE-DELAYWRITE BASE-DELETE"
+base="$base BASE-DENY1 BASE-DENY2 BASE-DENY3 BASE-DENYDOS BASE-DIR1 BASE-DIR2"
+base="$base BASE-DISCONNECT BASE-FDPASS BASE-LOCK1 BASE-LOCK2 BASE-LOCK3 BASE-LOCK4"
+base="$base BASE-LOCK5 BASE-LOCK6 BASE-LOCK7 BASE-MANGLE BASE-NEGNOWAIT BASE-NTDENY1"
+base="$base BASE-NTDENY2 BASE-OPEN BASE-OPENATTR BASE-PROPERTIES BASE-RENAME BASE-RW1"
+base="$base BASE-SECLEAK BASE-TCON BASE-TCONDEV BASE-TRANS2 BASE-UNLINK BASE-VUID"
+base="$base BASE-XCOPY"
+
+raw="RAW-ACLS RAW-CHKPATH RAW-CLOSE RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
+raw="$raw RAW-IOCTL RAW-LOCK RAW-MKDIR RAW-MUX RAW-NOTIFY RAW-OPEN RAW-OPLOCK"
+raw="$raw RAW-QFILEINFO RAW-QFSINFO RAW-READ RAW-RENAME RAW-SEARCH RAW-SEEK"
+raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
+
+tests="$base"
+
+skipped="BASE-CHARSET BASE-DELAYWRITE BASE-DELETE BASE-DENY1 BASE-OPENATTR BASE-TCONDEV"
+
+echo "WARNING: Skipping tests $skipped"
 
 failed=0
 for t in $tests; do
     if [ ! -z "$start" -a "$start" != $t ]; then
 	continue;
     fi
+    skip=0
+    for s in $skipped; do
+    	if [ x"$s" = x"$t" ]; then
+    	    skip=1;
+	    break;
+	fi
+    done
+    if [ $skip = 1 ]; then
+    	continue;
+    fi
     start=""
     name="$t"
     testit "$name" $VALGRIND $SMBTORTURE4 $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
-- 
cgit 


From 186f442f4cd4a8434c4e2d4e2c0de97b855c5586 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sun, 2 Apr 2006 12:52:59 +0000
Subject: r14865: - enforce timelimits for the tests - and skip some long tests
 for now

metze
(This used to be commit 1d52ae786d400441d9f5b30b4fa9e4e8ff64f7e4)
---
 source3/script/tests/selftest.sh       | 1 +
 source3/script/tests/test_functions.sh | 5 ++++-
 source3/script/tests/test_posix_s3.sh  | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index c61cf76380..6a6eef70fd 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -21,6 +21,7 @@ cd $OLD_PWD
 if [ -z "$TORTURE_MAXTIME" ]; then
     TORTURE_MAXTIME=300
 fi
+export TORTURE_MAXTIME
 
 ##
 ## setup the various environment variables we need
diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh
index 4e3b8ce7db..6ad1c6951b 100644
--- a/source3/script/tests/test_functions.sh
+++ b/source3/script/tests/test_functions.sh
@@ -161,7 +161,10 @@ testit() {
 		return 1
 	fi
 	
-	( $cmdline > $TEST_LOG 2>&1 )
+	if [ -z "$TORTURE_MAXTIME" ];then
+		TORTURE_MAXTIME=300
+	fi
+	( timelimit $TORTURE_MAXTIME $cmdline > $TEST_LOG 2>&1 )
 	status=$?
 	if [ x"$status" != x"0" ]; then
 		echo "TEST OUTPUT:"
diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 865650fcdd..f3636ef84a 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -34,7 +34,7 @@ raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
 
 tests="$base"
 
-skipped="BASE-CHARSET BASE-DELAYWRITE BASE-DELETE BASE-DENY1 BASE-OPENATTR BASE-TCONDEV"
+skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-DELETE BASE-DENY1 BASE-DENY2 BASE-DENY3 BASE-OPENATTR BASE-TCONDEV"
 
 echo "WARNING: Skipping tests $skipped"
 
@@ -55,7 +55,7 @@ for t in $tests; do
     fi
     start=""
     name="$t"
-    testit "$name" $VALGRIND $SMBTORTURE4 $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
+    testit "$name" $VALGRIND $SMBTORTURE4 $TORTURE4_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
 done
 
 testok $0 $failed
-- 
cgit 


From 97bfe0d0a0da8a4476db25918e268ee466a974c3 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 3 Apr 2006 11:32:57 +0000
Subject: r14884: this doesn't work and causes processes to be left when using
 ctrl-c (SIGINT)

metze
(This used to be commit 1ac5351646b18f28b1f9ed477b6e6046e1bdf783)
---
 source3/script/tests/test_functions.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh
index 6ad1c6951b..4e3b8ce7db 100644
--- a/source3/script/tests/test_functions.sh
+++ b/source3/script/tests/test_functions.sh
@@ -161,10 +161,7 @@ testit() {
 		return 1
 	fi
 	
-	if [ -z "$TORTURE_MAXTIME" ];then
-		TORTURE_MAXTIME=300
-	fi
-	( timelimit $TORTURE_MAXTIME $cmdline > $TEST_LOG 2>&1 )
+	( $cmdline > $TEST_LOG 2>&1 )
 	status=$?
 	if [ x"$status" != x"0" ]; then
 		echo "TEST OUTPUT:"
-- 
cgit 


From c398ea247bd9686458fa088580c09f90f8603dbf Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 3 Apr 2006 11:34:17 +0000
Subject: r14886: reenable BASE-DENY2 and BASE-DENY3

metze
(This used to be commit 69f489bde07d4c66bdf4dd3a2411d40ed868d144)
---
 source3/script/tests/selftest.sh      | 1 +
 source3/script/tests/test_posix_s3.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 6a6eef70fd..e7b29f76c7 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -114,6 +114,7 @@ cat >$SERVERCONFFILE<<EOF
 [tmp]
 	path = $PREFIX_ABS/tmp
 	read only = no
+	smbd:sharedelay = 100000
 EOF
 
 
diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index f3636ef84a..2f5f92ee80 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -34,7 +34,7 @@ raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
 
 tests="$base"
 
-skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-DELETE BASE-DENY1 BASE-DENY2 BASE-DENY3 BASE-OPENATTR BASE-TCONDEV"
+skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-DELETE BASE-DENY1 BASE-OPENATTR BASE-TCONDEV"
 
 echo "WARNING: Skipping tests $skipped"
 
-- 
cgit 


From 039113fe15eca1c69d6ccf40792d562bcca48ca4 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 15 May 2006 13:07:14 +0000
Subject: r15620: pass 'target:samba3=yes' to samba4's smbtorture when running
 samba3's make test

we can use this in samba4's smbtorture to disable tests sections which doesn't pass
against samba3

metze
(This used to be commit fab4de70b65ab5b9d3a93db46f13c7bab0e70464)
---
 source3/script/tests/selftest.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index e7b29f76c7..c460c12605 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -160,6 +160,8 @@ 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
 ##
-- 
cgit 


From 46586a1fd3d104fa40c930415d4806247736db3f Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 18 May 2006 09:21:23 +0000
Subject: r15682: fix option passing

metze
(This used to be commit cd2fa1da6cdcaaa8a4d92a38163d54ecc0f9d756)
---
 source3/script/tests/selftest.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index c460c12605..3153826709 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -157,10 +157,10 @@ TORTURE4_OPTIONS="--maximum-runtime=$TORTURE_MAXTIME --option=interfaces=$TORTUR
 export TORTURE4_OPTIONS
 
 if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
-	TORTURE4_OPTIONS="$TORTURE4_OPTIONS --option=\"torture:progress=no\""
+	TORTURE4_OPTIONS="$TORTURE4_OPTIONS --option=torture:progress=no"
 fi
 
-TORTURE4_OPTIONS="$TORTURE4_OPTIONS --option=\"target:samba3=yes\""
+TORTURE4_OPTIONS="$TORTURE4_OPTIONS --option=target:samba3=yes"
 
 ##
 ## ready to go...now loop through the tests
-- 
cgit 


From 9b9c6c36320ec05bb74459d685715fa11a09c470 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 18 May 2006 09:39:31 +0000
Subject: r15686: - start testing the RAW-* tests in make test - RAW-READ now
 passes samba3 - skip the rest for now

metze
(This used to be commit fc343051afe560b1ddb8715dbc574e2ae645571e)
---
 source3/script/tests/test_posix_s3.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 2f5f92ee80..1b29ea8d8d 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -32,9 +32,13 @@ raw="$raw RAW-IOCTL RAW-LOCK RAW-MKDIR RAW-MUX RAW-NOTIFY RAW-OPEN RAW-OPLOCK"
 raw="$raw RAW-QFILEINFO RAW-QFSINFO RAW-READ RAW-RENAME RAW-SEARCH RAW-SEEK"
 raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
 
-tests="$base"
+tests="$base $raw"
 
 skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-DELETE BASE-DENY1 BASE-OPENATTR BASE-TCONDEV"
+skipped="$skipped RAW-ACLS RAW-CHKPATH RAW-CLOSE RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
+skipped="$skipped RAW-IOCTL RAW-LOCK RAW-MKDIR RAW-MUX RAW-NOTIFY RAW-OPEN RAW-OPLOCK"
+skipped="$skipped RAW-QFILEINFO RAW-QFSINFO RAW-RENAME RAW-SEARCH RAW-SEEK"
+skipped="$skipped RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
 
 echo "WARNING: Skipping tests $skipped"
 
-- 
cgit 


From c4d4e8dd31d18e578e5d79be687a00d3ab52c7ef Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 18 May 2006 12:24:09 +0000
Subject: r15691: - samba3 also pass RAW-CHKPATH, RAW-SEEK, RAW-SFILEINFO-BUG -
 samba3 pass the limited version of RAW-LOCK   (the lock cancel and error
 checking tests are skipped)

metze
(This used to be commit b79ceece9550c0fe9f59ae59bad6709351e93906)
---
 source3/script/tests/test_posix_s3.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 1b29ea8d8d..aba8c73e07 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -35,10 +35,10 @@ raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
 tests="$base $raw"
 
 skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-DELETE BASE-DENY1 BASE-OPENATTR BASE-TCONDEV"
-skipped="$skipped RAW-ACLS RAW-CHKPATH RAW-CLOSE RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
-skipped="$skipped RAW-IOCTL RAW-LOCK RAW-MKDIR RAW-MUX RAW-NOTIFY RAW-OPEN RAW-OPLOCK"
-skipped="$skipped RAW-QFILEINFO RAW-QFSINFO RAW-RENAME RAW-SEARCH RAW-SEEK"
-skipped="$skipped RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
+skipped="$skipped RAW-ACLS RAW-CLOSE RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
+skipped="$skipped RAW-IOCTL RAW-MKDIR RAW-MUX RAW-NOTIFY RAW-OPEN RAW-OPLOCK"
+skipped="$skipped RAW-QFILEINFO RAW-QFSINFO RAW-RENAME RAW-SEARCH"
+skipped="$skipped RAW-SFILEINFO RAW-STREAMS RAW-UNLINK RAW-WRITE"
 
 echo "WARNING: Skipping tests $skipped"
 
-- 
cgit 


From bc77e15c3075bca70c94762c10cf991c4d464a1f Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 19 May 2006 14:44:50 +0000
Subject: r15717: BUG 3711: patch from    Leonid Kabanov <lkabanov@mail.ru> for
 some solaris sheel scripting bugs with 'make test' (This used to be commit
 94e0bc50135646039a2ebcf5c922a82cc0c4a2e7)

---
 source3/script/tests/selftest.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 3153826709..5e488151fd 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -15,7 +15,7 @@ PREFIX=`echo $1 | sed s+//+/+`
 mkdir -p $PREFIX || exit $?
 OLD_PWD=`pwd`
 cd $PREFIX || exit $?
-export PREFIX_ABS=`pwd`
+PREFIX_ABS=`pwd`
 cd $OLD_PWD
 
 if [ -z "$TORTURE_MAXTIME" ]; then
@@ -29,7 +29,7 @@ export TORTURE_MAXTIME
 
 SERVER=localhost2
 SERVER_IP=127.0.0.2
-USERNAME=`whoami`
+USERNAME=`PATH=/usr/ucb:$PATH whoami`
 PASSWORD=test
 
 SRCDIR=`pwd`
-- 
cgit 


From 385fa8cafbfe3ffd7829c88678da1924d003ba35 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 20 May 2006 07:42:54 +0000
Subject: r15732: samba3 now passes BASE-DENY1

metze
(This used to be commit e5a8553a57e0b1463a421ba69631f234184404b0)
---
 source3/script/tests/test_posix_s3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index aba8c73e07..1e60ec7666 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -34,7 +34,7 @@ raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
 
 tests="$base $raw"
 
-skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-DELETE BASE-DENY1 BASE-OPENATTR BASE-TCONDEV"
+skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-DELETE BASE-OPENATTR BASE-TCONDEV"
 skipped="$skipped RAW-ACLS RAW-CLOSE RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
 skipped="$skipped RAW-IOCTL RAW-MKDIR RAW-MUX RAW-NOTIFY RAW-OPEN RAW-OPLOCK"
 skipped="$skipped RAW-QFILEINFO RAW-QFSINFO RAW-RENAME RAW-SEARCH"
-- 
cgit 


From 4856cd51f055afc703445ba18f5eb0794f09d8b6 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 20 May 2006 08:55:19 +0000
Subject: r15735: also export PREFIX as testit from test_functions.sh needs it

metze
(This used to be commit 8709bba24a2359aff14920b1dab6b51f21401149)
---
 source3/script/tests/selftest.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 5e488151fd..cdf5b36bfa 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -46,7 +46,7 @@ LOGDIR=$PREFIX_ABS/logs
 SOCKET_WRAPPER_DIR=$PREFIX/sw
 CONFIGURATION="-s $CONFFILE"
 
-export PREFIX_ABS CONFIGURATION CONFFILE PATH SOCKET_WRAPPER_DIR DOMAIN
+export PREFIX PREFIX_ABS CONFIGURATION CONFFILE PATH SOCKET_WRAPPER_DIR DOMAIN
 export PRIVATEDIR LIBDIR PIDDIR LOCKDIR LOGDIR SERVERCONFFILE
 export SRCDIR SCRIPTDIR
 export USERNAME PASSWORD
-- 
cgit 


From 78d733e6672e81c1b3411ce2377c74f1520b51c2 Mon Sep 17 00:00:00 2001
From: Jim McDonough <jmcd@samba.org>
Date: Wed, 24 May 2006 19:07:21 +0000
Subject: r15872: Take one step toward getting this working on AIX.  the [-z ]
 stuff doesn't work there. (This used to be commit
 0ee78d96d9bd039084a270172316d80df4c00248)

---
 source3/script/tests/test_functions.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh
index 4e3b8ce7db..4134376bfc 100644
--- a/source3/script/tests/test_functions.sh
+++ b/source3/script/tests/test_functions.sh
@@ -40,7 +40,7 @@ samba3_check_or_start() {
 		rm -f $NMBD_TEST_LOG
 		echo -n "STARTING NMBD..."
 		((
-			if [ -z "$NMBD_MAXTIME" ]; then
+			if ! test -n "$NMBD_MAXTIME"; then
 			    NMBD_MAXTIME=2700
 			fi
 			timelimit $NMBD_MAXTIME $NMBD_VALGRIND $SRCDIR/bin/nmbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $NMBD_TEST_LOG 2>&1 &
@@ -69,7 +69,7 @@ samba3_check_or_start() {
 		rm -f $SMBD_TEST_LOG
 		echo -n "STARTING SMBD..."
 		((
-			if [ -z "$SMBD_MAXTIME" ]; then
+			if ! test -n "$SMBD_MAXTIME"; then
 			    SMBD_MAXTIME=2700
 			fi
 			timelimit $SMBD_MAXTIME $SMBD_VALGRIND $SRCDIR/bin/smbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $SMBD_TEST_LOG 2>&1 &
-- 
cgit 


From b4f96abf0a9dd51980a1f830d5a79b37730eee62 Mon Sep 17 00:00:00 2001
From: Jim McDonough <jmcd@samba.org>
Date: Wed, 24 May 2006 20:06:06 +0000
Subject: r15873: Use short signal names to placate ksh trap.  bash seems to
 accept either and even uses them on the manpage.  this should now enable make
 test on AIX. (This used to be commit
 de836d2077e53c07a50c51d1580f8e93700eb5bd)

---
 source3/script/tests/test_functions.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh
index 4134376bfc..f263677bfc 100644
--- a/source3/script/tests/test_functions.sh
+++ b/source3/script/tests/test_functions.sh
@@ -19,8 +19,8 @@ samba3_stop_sig_kill() {
 samba3_check_or_start() {
 	if [ -n "$SERVER_TEST_FIFO" ];then
 
-		trap samba3_stop_sig_kill SIGINT SIGQUIT
-		trap samba3_stop_sig_kill SIGTERM
+		trap samba3_stop_sig_kill INT QUIT
+		trap samba3_stop_sig_kill TERM
 
 		if [ -p "$SERVER_TEST_FIFO" ];then
 			return 0;
-- 
cgit 


From 9b19549fd69db2c624ce1a1458d84ef96642c408 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Sun, 28 May 2006 08:30:35 +0000
Subject: r15917: Activate RPC-AUTHCONTEXT in "make test" (This used to be
 commit 17f701ab4f46502ca7a957d3e79b005a0acebdc1)

---
 source3/script/tests/test_posix_s3.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 1e60ec7666..0dfdbf15aa 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -32,7 +32,9 @@ raw="$raw RAW-IOCTL RAW-LOCK RAW-MKDIR RAW-MUX RAW-NOTIFY RAW-OPEN RAW-OPLOCK"
 raw="$raw RAW-QFILEINFO RAW-QFSINFO RAW-READ RAW-RENAME RAW-SEARCH RAW-SEEK"
 raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
 
-tests="$base $raw"
+rpc="RPC-AUTHCONTEXT"
+
+tests="$base $raw $rpc"
 
 skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-DELETE BASE-OPENATTR BASE-TCONDEV"
 skipped="$skipped RAW-ACLS RAW-CLOSE RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
-- 
cgit 


From 096061c212ef9c45eb282d6e026336baf0e95547 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Sun, 28 May 2006 09:59:16 +0000
Subject: r15918: Attempt to bring Solaris into make test. The Solaris shell
 does not like the isolated !.

Metze, can you check this?

Thanks,

Volker
(This used to be commit c9542c64ce2a21671b8f4e30780e8a6e07ab6632)
---
 source3/script/tests/test_functions.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh
index f263677bfc..882efa5cad 100644
--- a/source3/script/tests/test_functions.sh
+++ b/source3/script/tests/test_functions.sh
@@ -40,7 +40,7 @@ samba3_check_or_start() {
 		rm -f $NMBD_TEST_LOG
 		echo -n "STARTING NMBD..."
 		((
-			if ! test -n "$NMBD_MAXTIME"; then
+			if test ! -n "$NMBD_MAXTIME"; then
 			    NMBD_MAXTIME=2700
 			fi
 			timelimit $NMBD_MAXTIME $NMBD_VALGRIND $SRCDIR/bin/nmbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $NMBD_TEST_LOG 2>&1 &
@@ -69,7 +69,7 @@ samba3_check_or_start() {
 		rm -f $SMBD_TEST_LOG
 		echo -n "STARTING SMBD..."
 		((
-			if ! test -n "$SMBD_MAXTIME"; then
+			if test ! -n "$SMBD_MAXTIME"; then
 			    SMBD_MAXTIME=2700
 			fi
 			timelimit $SMBD_MAXTIME $SMBD_VALGRIND $SRCDIR/bin/smbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $SMBD_TEST_LOG 2>&1 &
-- 
cgit 


From 4c411c9bb96adb664d81b32ada68bc92e2f2df59 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Sun, 28 May 2006 16:06:56 +0000
Subject: r15924: Ok, the Solaris fix broke AIX. Next try :-)

Volker
(This used to be commit 53bd3fa30ad1f8bada4a49e4c79ea7ff70188174)
---
 source3/script/tests/test_functions.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh
index 882efa5cad..368832a506 100644
--- a/source3/script/tests/test_functions.sh
+++ b/source3/script/tests/test_functions.sh
@@ -40,7 +40,7 @@ samba3_check_or_start() {
 		rm -f $NMBD_TEST_LOG
 		echo -n "STARTING NMBD..."
 		((
-			if test ! -n "$NMBD_MAXTIME"; then
+			if test x"$NMBD_MAXTIME" = x; then
 			    NMBD_MAXTIME=2700
 			fi
 			timelimit $NMBD_MAXTIME $NMBD_VALGRIND $SRCDIR/bin/nmbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $NMBD_TEST_LOG 2>&1 &
@@ -69,7 +69,7 @@ samba3_check_or_start() {
 		rm -f $SMBD_TEST_LOG
 		echo -n "STARTING SMBD..."
 		((
-			if test ! -n "$SMBD_MAXTIME"; then
+			if test x"$SMBD_MAXTIME" = x; then
 			    SMBD_MAXTIME=2700
 			fi
 			timelimit $SMBD_MAXTIME $SMBD_VALGRIND $SRCDIR/bin/smbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $SMBD_TEST_LOG 2>&1 &
-- 
cgit 


From 92307d5b17f8a6705516ee05e0a41fc4d044403f Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 30 May 2006 20:11:19 +0000
Subject: r15967: enable RAW-OPLOCK in samba3 make test

metze
(This used to be commit 6d35268639a7796583f5cc7bee12cf884a207af2)
---
 source3/script/tests/selftest.sh      | 2 ++
 source3/script/tests/test_posix_s3.sh | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index cdf5b36bfa..fe943b87b5 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -111,6 +111,8 @@ cat >$SERVERCONFFILE<<EOF
 	bind interfaces only = yes
 	include = $COMMONCONFFILE
 
+	kernel oplocks = no
+
 [tmp]
 	path = $PREFIX_ABS/tmp
 	read only = no
diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 0dfdbf15aa..2274a1f7fe 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -38,7 +38,7 @@ tests="$base $raw $rpc"
 
 skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-DELETE BASE-OPENATTR BASE-TCONDEV"
 skipped="$skipped RAW-ACLS RAW-CLOSE RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
-skipped="$skipped RAW-IOCTL RAW-MKDIR RAW-MUX RAW-NOTIFY RAW-OPEN RAW-OPLOCK"
+skipped="$skipped RAW-IOCTL RAW-MKDIR RAW-MUX RAW-NOTIFY RAW-OPEN"
 skipped="$skipped RAW-QFILEINFO RAW-QFSINFO RAW-RENAME RAW-SEARCH"
 skipped="$skipped RAW-SFILEINFO RAW-STREAMS RAW-UNLINK RAW-WRITE"
 
-- 
cgit 


From 5c9e031adb4e1833337679d37f75a3d23fd91ff1 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 1 Jun 2006 06:11:31 +0000
Subject: r15989: try to make timelimit.c more portable

Patch from Bjoern Jacke (Thanks!)

metze
(This used to be commit b9d1440f46f443851607300e31b123d6afa81c06)
---
 source3/script/tests/timelimit.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/timelimit.c b/source3/script/tests/timelimit.c
index 5b8281cb0d..32e58f5249 100644
--- a/source3/script/tests/timelimit.c
+++ b/source3/script/tests/timelimit.c
@@ -53,17 +53,10 @@ static void sig_usr1(int sig)
 
 static void new_process_group(void)
 {
-#ifdef BSD_SETPGRP
-	if (setpgrp(0,0) == -1) {
-		perror("setpgrp");
+	if (setpgid(0,0) == -1) {
+		perror("setpgid");
 		exit(1);
 	}
-#else
-	if (setpgrp() == -1) {
-		perror("setpgrp");
-		exit(1);
-	}
-#endif
 }
 
 
-- 
cgit 


From fd1b550851d9b6c91e5c20a692572d454e61d618 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 3 Jun 2006 09:51:59 +0000
Subject: r16025: make sure the samba4's smbtorture can be executed

metze
(This used to be commit bed220afb816138a3e806c5d20e812667f6994ae)
---
 source3/script/tests/tests_all.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index 64a7065ee9..059f9d1a37 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -2,9 +2,10 @@
 $SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
 $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
 
-if [ -n "$SMBTORTURE4" ];then
+SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
+if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
 	echo "Running Tests with Samba4's smbtorture"
-	$SMBTORTURE4 --version
+	echo $SMBTORTURE4VERSION
 	$SCRIPTDIR/test_posix_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
 else
 	echo "Skip Tests with Samba4's smbtorture"
-- 
cgit 


From ae2fb4f1093e28e4656371b9bbeb229fd1ed1ada Mon Sep 17 00:00:00 2001
From: James Peach <jpeach@samba.org>
Date: Thu, 15 Jun 2006 23:47:41 +0000
Subject: r16273: Add smbclient tests to verify that         in interactive
 mode, smbclient always prompts on stdout         in non-interactive mode,
 smbclient never prompts (This used to be commit
 dff1eba81ed4bdd6dbf2df6e7c28b0da74a39615)

---
 source3/script/tests/test_smbclient_s3.sh  | 58 ++++++++++++++++++++++++++++--
 source3/script/tests/tests_smbclient_s3.sh |  1 +
 2 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 source3/script/tests/tests_smbclient_s3.sh

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh
index 007f3839f7..98b165e735 100755
--- a/source3/script/tests/test_smbclient_s3.sh
+++ b/source3/script/tests/test_smbclient_s3.sh
@@ -11,13 +11,67 @@ fi
 
 SERVER="$1"
 SERVER_IP="$2"
+SMBCLIENT="$VALGRIND ${SMBCLIENT:-$SRCDIR/bin/smbclient} $CONFIGURATION"
 
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
 failed=0
 
-testit "smbclient -L $SERVER_IP" $VALGRIND $SRCDIR/bin/smbclient $CONFIGURATION -L $SERVER_IP -N -p 139 || failed=`expr $failed + 1`
-testit "smbclient -L $SERVER" $VALGRIND $SRCDIR/bin/smbclient $CONFIGURATION -L $SERVER -N -p 139 || failed=`expr $failed + 1`
+# Test that a noninteractive smbclient does not prompt
+test_noninteractive_no_prompt()
+{
+    prompt="smb"
+
+    echo du | \
+	$SMBCLIENT "$@" -U$USERNAME%$PASSWORD //$SERVER/tmp 2>&1 | \
+    grep $prompt
+
+    if [ $? = 0 ] ; then
+	# got a prompt .. fail
+	echo matched interactive prompt in non-interactive mode
+	false
+    else
+	true
+    fi
+}
+
+# Test that an interactive smbclient prompts to stdout
+test_interactive_prompt_stdout()
+{
+    prompt="smb"
+
+    echo du | \
+	CLI_FORCE_INTERACTIVE=yes \
+	$SMBCLIENT "$@" -U$USERNAME%$PASSWORD //$SERVER/tmp 2>/dev/null | \
+    grep $prompt
+
+    if [ $? = 0 ] ; then
+	# got a prompt .. succeed
+	true
+    else
+	echo failed to match interactive prompt on stdout
+	false
+    fi
+}
+
+testit "smbclient -L $SERVER_IP" $SMBCLIENT -L $SERVER_IP -N -p 139 || failed=`expr $failed + 1`
+testit "smbclient -L $SERVER" $SMBCLIENT -L $SERVER -N -p 139 || failed=`expr $failed + 1`
+
+testit "noninteractive smbclient does not prompt" \
+    test_noninteractive_no_prompt || \
+    failed=`expr $failed + 1`
+
+testit "noninteractive smbclient -l does not prompt" \
+   test_noninteractive_no_prompt -l /tmp || \
+    failed=`expr $failed + 1`
+
+testit "interactive smbclient prompts on stdout" \
+   test_interactive_prompt_stdout || \
+    failed=`expr $failed + 1`
+
+testit "interactive smbclient -l prompts on stdout" \
+   test_interactive_prompt_stdout -l /tmp || \
+    failed=`expr $failed + 1`
 
 testok $0 $failed
diff --git a/source3/script/tests/tests_smbclient_s3.sh b/source3/script/tests/tests_smbclient_s3.sh
new file mode 100644
index 0000000000..d48a692d4b
--- /dev/null
+++ b/source3/script/tests/tests_smbclient_s3.sh
@@ -0,0 +1 @@
+. $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP
-- 
cgit 


From e0055ce8f5b496e7c3490577a68cf4a49e456456 Mon Sep 17 00:00:00 2001
From: James Peach <jpeach@samba.org>
Date: Fri, 16 Jun 2006 04:44:59 +0000
Subject: r16289: Fix smbclient test hang. This is caused by readline refusing
 to believe the end of file it receives when reading from a pipe after we
 force interactive mode. (This used to be commit
 3eee12645883df21efa5175b10854a965fc90422)

---
 source3/script/tests/test_smbclient_s3.sh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh
index 98b165e735..d95657467d 100755
--- a/source3/script/tests/test_smbclient_s3.sh
+++ b/source3/script/tests/test_smbclient_s3.sh
@@ -40,17 +40,25 @@ test_noninteractive_no_prompt()
 test_interactive_prompt_stdout()
 {
     prompt="smb"
+    tmpfile=/tmp/smbclient.in.$$
 
-    echo du | \
-	CLI_FORCE_INTERACTIVE=yes \
-	$SMBCLIENT "$@" -U$USERNAME%$PASSWORD //$SERVER/tmp 2>/dev/null | \
+    cat > $tmpfile <<EOF
+du
+quit
+EOF
+
+    CLI_FORCE_INTERACTIVE=yes \
+    $SMBCLIENT "$@" -U$USERNAME%$PASSWORD //$SERVER/tmp \
+	< $tmpfile 2>/dev/null | \
     grep $prompt
 
     if [ $? = 0 ] ; then
 	# got a prompt .. succeed
+	rm -f $tmpfile
 	true
     else
 	echo failed to match interactive prompt on stdout
+	rm -f $tmpfile
 	false
     fi
 }
-- 
cgit 


From fbdcf2663b56007a438ac4f0d8d82436b1bfe688 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 11 Jul 2006 18:01:26 +0000
Subject: r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need to do the upper
 layer directories but this is what everyone is waiting for....

Jeremy.
(This used to be commit 9dafb7f48ca3e7af956b0a7d1720c2546fc4cfb8)
---
 source3/script/tests/selftest.sh           | 14 ++++++++++++--
 source3/script/tests/test_posix_s3.sh      |  5 +++--
 source3/script/tests/test_smbtorture_s3.sh |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index fe943b87b5..d7a2db5eb6 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -111,12 +111,22 @@ cat >$SERVERCONFFILE<<EOF
 	bind interfaces only = yes
 	include = $COMMONCONFFILE
 
+	; Necessary to add the build farm hacks
+	add user script = /bin/false
+	add machine script = /bin/false
+
 	kernel oplocks = no
 
 [tmp]
 	path = $PREFIX_ABS/tmp
 	read only = no
 	smbd:sharedelay = 100000
+[hideunread]
+	copy = tmp
+	hide unreadable = yes
+[hideunwrite]
+	copy = tmp
+	hide unwriteable files = yes
 EOF
 
 
@@ -181,8 +191,8 @@ START=`date`
  bin/nmblookup $CONFIGURATION $SERVER
  # make sure smbd is also up set
  echo "wait for smbd"
- bin/smbclient $CONFIGURATION -L $SERVER_IP -N -p 139 | head -2
- bin/smbclient $CONFIGURATION -L $SERVER_IP -N -p 139 | head -2
+ bin/smbclient $CONFIGURATION -L $SERVER_IP -U% -p 139 | head -2
+ bin/smbclient $CONFIGURATION -L $SERVER_IP -U% -p 139 | head -2
 
  failed=0
 
diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 2274a1f7fe..d4a03f8581 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -31,12 +31,13 @@ raw="RAW-ACLS RAW-CHKPATH RAW-CLOSE RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
 raw="$raw RAW-IOCTL RAW-LOCK RAW-MKDIR RAW-MUX RAW-NOTIFY RAW-OPEN RAW-OPLOCK"
 raw="$raw RAW-QFILEINFO RAW-QFSINFO RAW-READ RAW-RENAME RAW-SEARCH RAW-SEEK"
 raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
+raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH"
 
-rpc="RPC-AUTHCONTEXT"
+rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY"
 
 tests="$base $raw $rpc"
 
-skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-DELETE BASE-OPENATTR BASE-TCONDEV"
+skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-OPENATTR BASE-TCONDEV"
 skipped="$skipped RAW-ACLS RAW-CLOSE RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
 skipped="$skipped RAW-IOCTL RAW-MKDIR RAW-MUX RAW-NOTIFY RAW-OPEN"
 skipped="$skipped RAW-QFILEINFO RAW-QFSINFO RAW-RENAME RAW-SEARCH"
diff --git a/source3/script/tests/test_smbtorture_s3.sh b/source3/script/tests/test_smbtorture_s3.sh
index d0e15345df..842d914ecf 100755
--- a/source3/script/tests/test_smbtorture_s3.sh
+++ b/source3/script/tests/test_smbtorture_s3.sh
@@ -24,7 +24,7 @@ tests="$tests UNLINK BROWSE ATTR TRANS2 MAXFID TORTURE "
 tests="$tests OPLOCK1 OPLOCK2 OPLOCK3"
 tests="$tests DIR DIR1 TCON TCONDEV RW1 RW2 RW3"
 tests="$tests OPEN XCOPY RENAME DELETE PROPERTIES W2K"
-tests="$tests PIPE_NUMBER TCON2 IOCTL CHKPATH FDSESS"
+tests="$tests PIPE_NUMBER TCON2 IOCTL CHKPATH FDSESS LOCAL-SUBSTITUTE"
 
 skipped1="RANDOMIPC NEGNOWAIT NBENCH ERRMAPEXTRACT TRANS2SCAN NTTRANSSCAN"
 skipped2="DENY1 DENY2 OPENATTR CASETABLE EATEST"
-- 
cgit 


From 1f2419d9f8be0efcf2e43ecf97ea59d501e62fe8 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Fri, 14 Jul 2006 17:46:06 +0000
Subject: r17032: I thought I had already merged this from trunk:

> r16959 | vlendec | 2006-07-11 23:10:44 +0200 (Di, 11 Jul 2006) | 1 line
>
> get_share_security does not need snum, activate RPC-SAMBA3-SRVSVC

Volker
(This used to be commit c89471e15766fcdbfa4f40701e12c19f95c2d8ef)
---
 source3/script/tests/test_posix_s3.sh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index d4a03f8581..1fce6455fe 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -34,6 +34,7 @@ raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
 raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH"
 
 rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY"
+rpc="$rpc RPC-SAMBA3-SRVSVC"
 
 tests="$base $raw $rpc"
 
-- 
cgit 


From 95fd775e815e797534881c4f8d6e395669652037 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Sun, 16 Jul 2006 06:32:35 +0000
Subject: r17077: Activate RPC-SAMBA3-GETUSERNAME in the build farm (This used
 to be commit 8c6088f2bd0a5e3a854a31fe428d841d61055a30)

---
 source3/script/tests/test_posix_s3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 1fce6455fe..08aa043358 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -34,7 +34,7 @@ raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
 raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH"
 
 rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY"
-rpc="$rpc RPC-SAMBA3-SRVSVC"
+rpc="$rpc RPC-SAMBA3-SRVSVC RPC-SAMBA3-GETUSERNAME"
 
 tests="$base $raw $rpc"
 
-- 
cgit 


From 03f477b8a682a923472645e517711b80ac99d3a9 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Mon, 17 Jul 2006 19:31:01 +0000
Subject: r17095: Activate RPC-SAMBA3-SHARESEC (This used to be commit
 bcb196d21ea7eb13af02bb0c2fa85f0d363b55a1)

---
 source3/script/tests/test_posix_s3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 08aa043358..63382b3fbb 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -34,7 +34,7 @@ raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
 raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH"
 
 rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY"
-rpc="$rpc RPC-SAMBA3-SRVSVC RPC-SAMBA3-GETUSERNAME"
+rpc="$rpc RPC-SAMBA3-SRVSVC RPC-SAMBA3-GETUSERNAME RPC-SAMBA3-SHARESEC"
 
 tests="$base $raw $rpc"
 
-- 
cgit 


From ac9628de48069be57a5159a6fe0cb0fdb7b33c5d Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Sat, 5 Aug 2006 17:49:35 +0000
Subject: r17425: Add the multi-key wrapper. If it's necessary to add general
 blobs as keys, this can trivially be added later.

Volker
(This used to be commit 6915adb9780052952e4a1d9e1c3e6cac06f48463)
---
 source3/script/tests/test_smbtorture_s3.sh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_smbtorture_s3.sh b/source3/script/tests/test_smbtorture_s3.sh
index 842d914ecf..3675f39257 100755
--- a/source3/script/tests/test_smbtorture_s3.sh
+++ b/source3/script/tests/test_smbtorture_s3.sh
@@ -25,6 +25,7 @@ tests="$tests OPLOCK1 OPLOCK2 OPLOCK3"
 tests="$tests DIR DIR1 TCON TCONDEV RW1 RW2 RW3"
 tests="$tests OPEN XCOPY RENAME DELETE PROPERTIES W2K"
 tests="$tests PIPE_NUMBER TCON2 IOCTL CHKPATH FDSESS LOCAL-SUBSTITUTE"
+tests="$tests LOCAL-MULTIKEY"
 
 skipped1="RANDOMIPC NEGNOWAIT NBENCH ERRMAPEXTRACT TRANS2SCAN NTTRANSSCAN"
 skipped2="DENY1 DENY2 OPENATTR CASETABLE EATEST"
-- 
cgit 


From 21da07ba1fdbef9d8fadfb9bf9fa23afc0a665d1 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Tue, 8 Aug 2006 13:54:43 +0000
Subject: r17457: Add a test to do some operations on group mapping.

Volker
(This used to be commit 68db058fdf508d5b4d38731ece21f5d92feca00c)
---
 source3/script/tests/test_smbtorture_s3.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_smbtorture_s3.sh b/source3/script/tests/test_smbtorture_s3.sh
index 3675f39257..2ee2584b22 100755
--- a/source3/script/tests/test_smbtorture_s3.sh
+++ b/source3/script/tests/test_smbtorture_s3.sh
@@ -25,7 +25,7 @@ tests="$tests OPLOCK1 OPLOCK2 OPLOCK3"
 tests="$tests DIR DIR1 TCON TCONDEV RW1 RW2 RW3"
 tests="$tests OPEN XCOPY RENAME DELETE PROPERTIES W2K"
 tests="$tests PIPE_NUMBER TCON2 IOCTL CHKPATH FDSESS LOCAL-SUBSTITUTE"
-tests="$tests LOCAL-MULTIKEY"
+tests="$tests LOCAL-MULTIKEY LOCAL-GROUPMAP"
 
 skipped1="RANDOMIPC NEGNOWAIT NBENCH ERRMAPEXTRACT TRANS2SCAN NTTRANSSCAN"
 skipped2="DENY1 DENY2 OPENATTR CASETABLE EATEST"
@@ -42,7 +42,7 @@ for t in $tests; do
     fi
     start=""
     name="$t"
-    testit "$name" $VALGRIND $SRCDIR/bin/smbtorture $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
+    testit "$name" $VALGRIND $SRCDIR/bin/smbtorture $ADDARGS $unc -U"$username"%"$password" -S "$CONFFILE" $t || failed=`expr $failed + 1`
 done
 
 testok $0 $failed
-- 
cgit 


From 03e3cd1d5a005ad5fd2bc97f9863abf675efd09f Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Tue, 15 Aug 2006 14:07:15 +0000
Subject: r17554: Cleanup (This used to be commit
 761cbd52f0cff6b864c506ec03c94039b6101ef9)

---
 source3/script/tests/test_smbtorture_s3.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_smbtorture_s3.sh b/source3/script/tests/test_smbtorture_s3.sh
index 2ee2584b22..842d914ecf 100755
--- a/source3/script/tests/test_smbtorture_s3.sh
+++ b/source3/script/tests/test_smbtorture_s3.sh
@@ -25,7 +25,6 @@ tests="$tests OPLOCK1 OPLOCK2 OPLOCK3"
 tests="$tests DIR DIR1 TCON TCONDEV RW1 RW2 RW3"
 tests="$tests OPEN XCOPY RENAME DELETE PROPERTIES W2K"
 tests="$tests PIPE_NUMBER TCON2 IOCTL CHKPATH FDSESS LOCAL-SUBSTITUTE"
-tests="$tests LOCAL-MULTIKEY LOCAL-GROUPMAP"
 
 skipped1="RANDOMIPC NEGNOWAIT NBENCH ERRMAPEXTRACT TRANS2SCAN NTTRANSSCAN"
 skipped2="DENY1 DENY2 OPENATTR CASETABLE EATEST"
@@ -42,7 +41,7 @@ for t in $tests; do
     fi
     start=""
     name="$t"
-    testit "$name" $VALGRIND $SRCDIR/bin/smbtorture $ADDARGS $unc -U"$username"%"$password" -S "$CONFFILE" $t || failed=`expr $failed + 1`
+    testit "$name" $VALGRIND $SRCDIR/bin/smbtorture $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
 done
 
 testok $0 $failed
-- 
cgit 


From 517efef9a157b3244a5c63d9aa275679c653f1d9 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Sun, 20 Aug 2006 17:29:00 +0000
Subject: r17622: Add a framework for a printing backend designed to support
 the build farm. If we want to walk more printing code in the build farm I
 think doing that with a customized printing backend is much easier than with
 a set of shell scripts.

Jerry, comments?

Volker
(This used to be commit 949cd6b992364d2bc60fd59051b6ac1c4cc4288c)
---
 source3/script/tests/test_posix_s3.sh | 1 +
 source3/script/tests/tests_all.sh     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 63382b3fbb..45a7abcce3 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -37,6 +37,7 @@ rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY"
 rpc="$rpc RPC-SAMBA3-SRVSVC RPC-SAMBA3-GETUSERNAME RPC-SAMBA3-SHARESEC"
 
 tests="$base $raw $rpc"
+tests=RPC-SAMBA3-SPOOLSS
 
 skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-OPENATTR BASE-TCONDEV"
 skipped="$skipped RAW-ACLS RAW-CLOSE RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index 059f9d1a37..135938e845 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -1,6 +1,6 @@
 
-$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
-$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
+#$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
+#$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
 
 SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
 if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
-- 
cgit 


From 5e6195d2e04f363bf00873bc0538b862bbd955b9 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Sun, 20 Aug 2006 17:30:27 +0000
Subject: r17623: Revert accidential commit (This used to be commit
 8dcc4e7dd6dd879f341b58fc04cb1308c0463862)

---
 source3/script/tests/test_posix_s3.sh | 1 -
 source3/script/tests/tests_all.sh     | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 45a7abcce3..63382b3fbb 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -37,7 +37,6 @@ rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY"
 rpc="$rpc RPC-SAMBA3-SRVSVC RPC-SAMBA3-GETUSERNAME RPC-SAMBA3-SHARESEC"
 
 tests="$base $raw $rpc"
-tests=RPC-SAMBA3-SPOOLSS
 
 skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-OPENATTR BASE-TCONDEV"
 skipped="$skipped RAW-ACLS RAW-CLOSE RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index 135938e845..059f9d1a37 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -1,6 +1,6 @@
 
-#$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
-#$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
+$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
+$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
 
 SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
 if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
-- 
cgit 


From e09daab0157e1c9fc9ab29627f9ca612456eed8c Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Mon, 28 Aug 2006 07:56:15 +0000
Subject: r17880: On host "tridge" in the build farm the tests fail because
 smbd hangs in in 'connecting to cups server on localhost'. There is no cups
 on that host, but the TCP connection hangs in SYN_SENT. Probably some
 firewall rule.

Work around that.

Volker
(This used to be commit ab4e7b34da00c2a8f3244d84f08037ddfadf85d5)
---
 source3/script/tests/selftest.sh | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index d7a2db5eb6..38aa4d2727 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -117,6 +117,9 @@ cat >$SERVERCONFFILE<<EOF
 
 	kernel oplocks = no
 
+	printing = bsd
+	printcap name = /dev/null
+
 [tmp]
 	path = $PREFIX_ABS/tmp
 	read only = no
-- 
cgit 


From f2b3143cf72c9d8f391b867353757770d1f0b012 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 30 Aug 2006 16:58:29 +0000
Subject: r17934: allow srcdir != builddir for 'make test' (This used to be
 commit 70f223554922947a17e81f1002b184db879a2195)

---
 source3/script/tests/selftest.sh           | 5 +++--
 source3/script/tests/test_functions.sh     | 4 ++--
 source3/script/tests/test_smbclient_s3.sh  | 2 +-
 source3/script/tests/test_smbtorture_s3.sh | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 38aa4d2727..ccbc90bda9 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -32,7 +32,8 @@ SERVER_IP=127.0.0.2
 USERNAME=`PATH=/usr/ucb:$PATH whoami`
 PASSWORD=test
 
-SRCDIR=`pwd`
+SRCDIR="`dirname $0`/../.."
+BINDIR="`pwd`/bin"
 SCRIPTDIR=$SRCDIR/script/tests
 SHRDIR=$PREFIX_ABS/tmp
 LIBDIR=$PREFIX_ABS/lib
@@ -48,7 +49,7 @@ CONFIGURATION="-s $CONFFILE"
 
 export PREFIX PREFIX_ABS CONFIGURATION CONFFILE PATH SOCKET_WRAPPER_DIR DOMAIN
 export PRIVATEDIR LIBDIR PIDDIR LOCKDIR LOGDIR SERVERCONFFILE
-export SRCDIR SCRIPTDIR
+export SRCDIR SCRIPTDIR BINDIR
 export USERNAME PASSWORD
 export SMBTORTURE4
 export SERVER SERVER_IP
diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh
index 368832a506..06c77c89d5 100644
--- a/source3/script/tests/test_functions.sh
+++ b/source3/script/tests/test_functions.sh
@@ -43,7 +43,7 @@ samba3_check_or_start() {
 			if test x"$NMBD_MAXTIME" = x; then
 			    NMBD_MAXTIME=2700
 			fi
-			timelimit $NMBD_MAXTIME $NMBD_VALGRIND $SRCDIR/bin/nmbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $NMBD_TEST_LOG 2>&1 &
+			timelimit $NMBD_MAXTIME $NMBD_VALGRIND $BINDIR/nmbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $NMBD_TEST_LOG 2>&1 &
 			TIMELIMIT_NMBD_PID=$!
 			echo $TIMELIMIT_NMBD_PID > $PIDDIR/timelimit.nmbd.pid
 			wait $TIMELIMIT_NMBD_PID
@@ -72,7 +72,7 @@ samba3_check_or_start() {
 			if test x"$SMBD_MAXTIME" = x; then
 			    SMBD_MAXTIME=2700
 			fi
-			timelimit $SMBD_MAXTIME $SMBD_VALGRIND $SRCDIR/bin/smbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $SMBD_TEST_LOG 2>&1 &
+			timelimit $SMBD_MAXTIME $SMBD_VALGRIND $BINDIR/smbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $SMBD_TEST_LOG 2>&1 &
 			TIMELIMIT_SMBD_PID=$!
 			echo $TIMELIMIT_SMBD_PID > $PIDDIR/timelimit.smbd.pid
 			wait $TIMELIMIT_SMBD_PID
diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh
index d95657467d..01efebcd53 100755
--- a/source3/script/tests/test_smbclient_s3.sh
+++ b/source3/script/tests/test_smbclient_s3.sh
@@ -11,7 +11,7 @@ fi
 
 SERVER="$1"
 SERVER_IP="$2"
-SMBCLIENT="$VALGRIND ${SMBCLIENT:-$SRCDIR/bin/smbclient} $CONFIGURATION"
+SMBCLIENT="$VALGRIND ${SMBCLIENT:-$BINDIR/smbclient} $CONFIGURATION"
 
 incdir=`dirname $0`
 . $incdir/test_functions.sh
diff --git a/source3/script/tests/test_smbtorture_s3.sh b/source3/script/tests/test_smbtorture_s3.sh
index 842d914ecf..cd45f3419e 100755
--- a/source3/script/tests/test_smbtorture_s3.sh
+++ b/source3/script/tests/test_smbtorture_s3.sh
@@ -41,7 +41,7 @@ for t in $tests; do
     fi
     start=""
     name="$t"
-    testit "$name" $VALGRIND $SRCDIR/bin/smbtorture $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
+    testit "$name" $VALGRIND $BINDIR/smbtorture $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
 done
 
 testok $0 $failed
-- 
cgit 


From 5e7ead245cc4b98b4d7742afb557d9b32c4b73b9 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 31 Aug 2006 07:43:57 +0000
Subject: r17953: run bin/talloctort with samba3's make test

metze
(This used to be commit 2d3ab069ddcb28ebd7cc72021a3510a606b50630)
---
 source3/script/tests/test_local_s3.sh | 20 ++++++++++++++++++++
 source3/script/tests/tests_all.sh     |  1 +
 2 files changed, 21 insertions(+)
 create mode 100755 source3/script/tests/test_local_s3.sh

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_local_s3.sh b/source3/script/tests/test_local_s3.sh
new file mode 100755
index 0000000000..083162d92b
--- /dev/null
+++ b/source3/script/tests/test_local_s3.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# this runs the file serving tests that are expected to pass with samba3
+
+if [ $# != 0 ]; then
+cat <<EOF
+Usage: test_local_s3.sh
+EOF
+exit 1;
+fi
+
+incdir=`dirname $0`
+. $incdir/test_functions.sh
+
+failed=0
+
+testit "talloctort" $VALGRIND $BINDIR/talloctort || \
+    failed=`expr $failed + 1`
+
+testok $0 $failed
diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index 059f9d1a37..dd593899e4 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -1,4 +1,5 @@
 
+$SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?`
 $SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
 $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
 
-- 
cgit 


From 3c23af97f9fc128782f0bcae42a2b01dae5aa577 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 5 Sep 2006 10:29:16 +0000
Subject: r18069: it isn't a good idea to run the PIPE_NUMBER test on a file
 share...

But I wonder why it is so slow on my laptop and takes only 1 second on
the 'opi' build farm host.

I got only 2-3 opens per second...

metze
(This used to be commit d5c55e731adbd5f05fdea8550b64186b2ca7c2b8)
---
 source3/script/tests/test_smbtorture_s3.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_smbtorture_s3.sh b/source3/script/tests/test_smbtorture_s3.sh
index cd45f3419e..38ab40f09d 100755
--- a/source3/script/tests/test_smbtorture_s3.sh
+++ b/source3/script/tests/test_smbtorture_s3.sh
@@ -24,11 +24,11 @@ tests="$tests UNLINK BROWSE ATTR TRANS2 MAXFID TORTURE "
 tests="$tests OPLOCK1 OPLOCK2 OPLOCK3"
 tests="$tests DIR DIR1 TCON TCONDEV RW1 RW2 RW3"
 tests="$tests OPEN XCOPY RENAME DELETE PROPERTIES W2K"
-tests="$tests PIPE_NUMBER TCON2 IOCTL CHKPATH FDSESS LOCAL-SUBSTITUTE"
+tests="$tests TCON2 IOCTL CHKPATH FDSESS LOCAL-SUBSTITUTE"
 
 skipped1="RANDOMIPC NEGNOWAIT NBENCH ERRMAPEXTRACT TRANS2SCAN NTTRANSSCAN"
 skipped2="DENY1 DENY2 OPENATTR CASETABLE EATEST"
-skipped3="MANGLE UTABLE"
+skipped3="MANGLE UTABLE PIPE_NUMBER"
 echo "Skipping the following tests:"
 echo "$skipped1"
 echo "$skipped2"
-- 
cgit 


From 995205fc60f87e1a02aa1c6f309db55ae18e908a Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 6 Sep 2006 18:32:20 +0000
Subject: r18188: merge 3.0-libndr branch (This used to be commit
 1115745caed3093c25d6be01ffee21819fb0a675)

---
 source3/script/tests/test_posix_s3.sh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 63382b3fbb..bace1e5295 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -35,6 +35,7 @@ raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH"
 
 rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY"
 rpc="$rpc RPC-SAMBA3-SRVSVC RPC-SAMBA3-GETUSERNAME RPC-SAMBA3-SHARESEC"
+rpc="$rpc RPC-UNIXINFO"
 
 tests="$base $raw $rpc"
 
-- 
cgit 


From 716135eacf8826518c466a6a6d3b3cf69c00550d Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 11 Sep 2006 11:49:32 +0000
Subject: r18379: make the gdb_backtrace executable

metze
(This used to be commit f4023dc39e97bf8b1d1642f7eb0e8cb00557aa7f)
---
 source3/script/tests/gdb_backtrace | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 source3/script/tests/gdb_backtrace

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/gdb_backtrace b/source3/script/tests/gdb_backtrace
old mode 100644
new mode 100755
-- 
cgit 


From b890724ea343df5c371b9445b9925d7b4af4edb7 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 11 Sep 2006 12:46:13 +0000
Subject: r18380: the panic action command needs to be different in samba4

samba4 uses %PID% where samba3 uses %d

metze
(This used to be commit 4424aebdcef951b23e28041faa201ff7c95fa144)
---
 source3/script/tests/selftest.sh | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index ccbc90bda9..48f034cf1d 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -39,6 +39,7 @@ SHRDIR=$PREFIX_ABS/tmp
 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 @@ LOCKDIR=$PREFIX_ABS/lockdir
 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 @@ cat >$COMMONCONFFILE<<EOF
 	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 @@ cat >$SERVERCONFFILE<<EOF
 	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 @@ cat >$SERVERCONFFILE<<EOF
 	hide unwriteable files = yes
 EOF
 
-
 ##
 ## create a test account
 ##
@@ -143,10 +154,6 @@ EOF
 
 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 @@ samba3_check_or_start
 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
-- 
cgit 


From e5db7fee0f5cb3bd7434cdefebabc7a8376aa0d4 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 15 Sep 2006 22:49:27 +0000
Subject: r18572: Use the autogenerated client and server for the echo
 interface and implement some of the missing functions. RPC-ECHO now passes
 against Samba3. (This used to be commit
 9e9a05366176454cc1779acc6c2b6070743f5939)

---
 source3/script/tests/test_posix_s3.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index bace1e5295..4c8d43665e 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -33,9 +33,9 @@ raw="$raw RAW-QFILEINFO RAW-QFSINFO RAW-READ RAW-RENAME RAW-SEARCH RAW-SEEK"
 raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
 raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH"
 
-rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY"
-rpc="$rpc RPC-SAMBA3-SRVSVC RPC-SAMBA3-GETUSERNAME RPC-SAMBA3-SHARESEC"
-rpc="$rpc RPC-UNIXINFO"
+rpc="RPC-ECHO RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-NETLOGSAMBA3"
+rpc="$rpc RPC-SAMBA3SESSIONKEY RPC-SAMBA3-SRVSVC RPC-SAMBA3-GETUSERNAME"
+rpc="$rpc RPC-SAMBA3-SHARESEC RPC-UNIXINFO"
 
 tests="$base $raw $rpc"
 
-- 
cgit 


From 7ee716e70125aeab40c8760c2aa1c9146db17b95 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 18 Sep 2006 10:15:58 +0000
Subject: r18612: remove RPC-ECHO till it gets fixed

metze
(This used to be commit 2afeec3d15740261356b5a51b0413378f8d10cf5)
---
 source3/script/tests/test_posix_s3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 4c8d43665e..ba6213e0d5 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -33,7 +33,7 @@ raw="$raw RAW-QFILEINFO RAW-QFSINFO RAW-READ RAW-RENAME RAW-SEARCH RAW-SEEK"
 raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
 raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH"
 
-rpc="RPC-ECHO RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-NETLOGSAMBA3"
+rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-NETLOGSAMBA3"
 rpc="$rpc RPC-SAMBA3SESSIONKEY RPC-SAMBA3-SRVSVC RPC-SAMBA3-GETUSERNAME"
 rpc="$rpc RPC-SAMBA3-SHARESEC RPC-UNIXINFO"
 
-- 
cgit 


From 3ef4b8cf2f4a52c08b71fa8cac1ce4e8409c160b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 20 Sep 2006 21:09:12 +0000
Subject: r18744: Disable some tests that only work when RUN_FROM_BUILD_FARM is
 set. (This used to be commit 72b51c889124f0b0da22b4c9b04e0276f9cbfbc7)

---
 source3/script/tests/test_posix_s3.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index ba6213e0d5..154f3cddd9 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -33,9 +33,11 @@ raw="$raw RAW-QFILEINFO RAW-QFSINFO RAW-READ RAW-RENAME RAW-SEARCH RAW-SEEK"
 raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
 raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH"
 
-rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-NETLOGSAMBA3"
-rpc="$rpc RPC-SAMBA3SESSIONKEY RPC-SAMBA3-SRVSVC RPC-SAMBA3-GETUSERNAME"
-rpc="$rpc RPC-SAMBA3-SHARESEC RPC-UNIXINFO"
+rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC RPC-UNIXINFO"
+
+if x$RUN_FROM_BUILD_FARM = xyes; then
+	rpc="$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME"
+fi
 
 tests="$base $raw $rpc"
 
-- 
cgit 


From 1260972ec9db776b679ace89bbf0473b9f991128 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 21 Sep 2006 06:15:17 +0000
Subject: r18778: Fix comparison. (This used to be commit
 0a198e6096d24297995d761635044ad8081fb197)

---
 source3/script/tests/test_posix_s3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 154f3cddd9..998de3b401 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -35,7 +35,7 @@ raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH"
 
 rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC RPC-UNIXINFO"
 
-if x$RUN_FROM_BUILD_FARM = xyes; then
+if test x$RUN_FROM_BUILD_FARM = xyes; then
 	rpc="$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME"
 fi
 
-- 
cgit 


From 387bfebfcf74e4b56b21a772b0e38b6cdb9dcf25 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 22 Sep 2006 15:09:08 +0000
Subject: r18823: Fix some errors in the srsvc handling code and start running
 the RPC-SRVSVC test against samba3. (This used to be commit
 f0508ecb44f13e9e9e521e2534889e98a31d2372)

---
 source3/script/tests/test_posix_s3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 998de3b401..f079a5a1eb 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -33,7 +33,7 @@ raw="$raw RAW-QFILEINFO RAW-QFSINFO RAW-READ RAW-RENAME RAW-SEARCH RAW-SEEK"
 raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
 raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH"
 
-rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC RPC-UNIXINFO"
+rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC RPC-UNIXINFO RPC_SRVSVC"
 
 if test x$RUN_FROM_BUILD_FARM = xyes; then
 	rpc="$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME"
-- 
cgit 


From 8761f5dcc4db5c825a600fe25792ec47cb6cbdc7 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 24 Sep 2006 02:52:25 +0000
Subject: r18867: change the group mapping code to use ldb instead of tdb

See the discussion of this on the samba-technical list
(This used to be commit 4ad1436ceae0128e187222fce0fc79adb3049d3f)
---
 source3/script/tests/test_groupmap.sh | 214 ++++++++++++++++++++++++++++++++++
 1 file changed, 214 insertions(+)
 create mode 100755 source3/script/tests/test_groupmap.sh

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_groupmap.sh b/source3/script/tests/test_groupmap.sh
new file mode 100755
index 0000000000..46640a9131
--- /dev/null
+++ b/source3/script/tests/test_groupmap.sh
@@ -0,0 +1,214 @@
+#!/bin/sh
+# test groupmap code tridge@samba.org September 2006
+# note that this needs root access to add unix groups,
+# so this cannot be run on the build farm
+
+testone() {
+    echo $*
+    $VALGRIND bin/net groupmap $*
+}
+
+tstart() {
+    TBASE=`date '+%s'`
+}
+
+treport() {
+    TNOW=`date '+%s'`
+    echo "Took `expr $TNOW - $TBASE` seconds"
+    TBASE=$TNOW
+}
+
+rm -f $PREFIX_ABS/var/locks/group_mapping.?db
+
+NLOCAL=12
+NGROUP=11
+NBUILTIN=10
+DOMSID=`bin/net getlocalsid | awk '{print $6}'`
+FORSID="S-1-2-3-4-5"
+
+echo "DOMSID $DOMSID"
+echo "FORSID $FORSID"
+
+tstart
+echo "Creating unix groups"
+for i in `seq 1 1 $NLOCAL`; do
+  unixgroup=testlocal$i;
+  gid=`expr 30000 + $i`;
+  groupdel $unixgroup 2> /dev/null
+  groupadd -g $gid $unixgroup || exit 1
+done
+for i in `seq 1 1 $NGROUP`; do
+  unixgroup=testgrp$i;
+  gid=`expr 40000 + $i`;
+  groupdel $unixgroup 2> /dev/null
+  groupadd -g $gid $unixgroup || exit 1
+done
+for i in `seq 1 1 $NBUILTIN`; do
+  unixgroup=testb$i;
+  gid=`expr 50000 + $i`;
+  groupdel $unixgroup 2> /dev/null
+  groupadd -g $gid $unixgroup || exit 1
+done
+date
+
+treport
+
+echo "Creating local groups"
+for i in `seq 1 1 $NLOCAL`; do
+  unixgroup=testlocal$i;
+  ntgroup=ntlgrp$i;
+  rid=`expr 10000 + $i`;
+  testone add rid=$rid unixgroup=$unixgroup ntgroup=$ntgroup type=local || exit 1
+done
+
+echo "trying a duplicate add"
+testone add rid=10001 unixgroup=testlocal1 ntgroup=foo type=local && exit 1
+
+treport
+
+echo "Creating domain groups"
+for i in `seq 1 1 $NGROUP`; do
+  unixgroup=testgrp$i;
+  ntgroup=ntgrp$i;
+  rid=`expr 20000 + $i`;
+  testone add rid=$rid unixgroup=$unixgroup ntgroup=$ntgroup type=domain || exit 1
+done
+
+treport
+
+echo "Creating builtin groups"
+for i in `seq 1 1 $NBUILTIN`; do
+  unixgroup=testb$i;
+  ntgroup=ntbgrp$i;
+  rid=`expr 30000 + $i`;
+  testone add rid=$rid unixgroup=$unixgroup ntgroup=$ntgroup type=builtin || exit 1
+done
+
+treport
+
+echo "Adding domain groups to local groups"
+for i in `seq 1 1 $NLOCAL`; do
+ for j in `seq 1 1 $i`; do
+
+  lrid=`expr 10000 + $i`;
+  drid=`expr 20000 + $j`;
+
+  testone addmem $DOMSID-$lrid $DOMSID-$drid || exit 1
+  ( testone listmem $DOMSID-$lrid | sort -r ) || exit 1
+ done
+done
+
+echo "trying a duplicate addmem"
+testone addmem $DOMSID-10001 $DOMSID-20001 && exit 1
+
+echo "Adding foreign SIDs to local groups"
+for i in `seq 1 1 $NLOCAL`; do
+ for j in `seq 1 1 $i`; do
+
+  lrid=`expr 10000 + $i`;
+  frid=`expr 70000 + $j`;
+
+  testone addmem $DOMSID-$lrid $FORSID-$frid || exit 1
+  ( testone listmem $DOMSID-$lrid | sort -r ) || exit 1
+ done
+done
+
+echo "trying a duplicate foreign addmem"
+testone addmem $DOMSID-10001 $FORSID-70001 && exit 1
+
+treport
+
+echo "Listing local group memberships of domain groups"
+for i in `seq 1 1 $NGROUP`; do
+  rid=`expr 20000 + $i`;
+  ( testone memberships $DOMSID-$rid | sort -r ) || exit 1
+done
+
+echo "Trying memberships on bogus sid"
+testone memberships $DOMSID-999999 || exit 1
+
+treport
+
+testone list | sort
+
+echo "Deleting some domain groups"
+for i in `seq 2 2 $NGROUP`; do
+  drid=`expr 20000 + $i`;
+ testone delete sid=$DOMSID-$drid || exit 1
+done
+
+echo "Trying duplicate domain group delete"
+testone delete sid=$DOMSID-20002 && exit 1
+
+treport
+
+echo "Deleting some local groups"
+for i in `seq 2 4 $NLOCAL`; do
+ lrid=`expr 10000 + $i`;
+ testone delete sid=$DOMSID-$lrid || exit 1
+done
+
+echo "Trying duplicate local group delete"
+testone delete sid=$DOMSID-10002 && exit 1
+
+treport
+
+echo "Modifying some domain groups"
+for i in `seq 3 2 $NGROUP`; do
+  drid=`expr 20000 + $i`;
+  testone modify sid=$DOMSID-$drid comment="newcomment-$i" type=domain || exit 1
+done
+
+treport
+
+testone list | sort
+
+echo "Listing local group memberships"
+for i in `seq 1 1 $NLOCAL`; do
+  rid=`expr 20000 + $i`;
+  ( testone memberships $DOMSID-$rid | sort -r ) || exit 1
+done
+
+treport
+
+echo "Removing some domain groups from local groups"
+for i in `seq 1 2 $NLOCAL`; do
+ for j in `seq 1 3 $i`; do
+
+  lrid=`expr 10000 + $i`;
+  drid=`expr 20000 + $j`;
+
+  testone delmem $DOMSID-$lrid $DOMSID-$drid || exit 1
+ done
+done
+
+echo "Trying duplicate delmem"
+testone delmem $DOMSID-10001 $DOMSID-20001 && exit 1
+
+treport
+
+echo "Listing local group memberships"
+for i in `seq 1 1 $NLOCAL`; do
+  rid=`expr 20000 + $i`;
+  ( testone memberships $DOMSID-$rid | sort -r ) || exit 1
+done
+
+treport
+
+echo "Deleting unix groups"
+for i in `seq 1 1 $NLOCAL`; do
+  unixgroup=testlocal$i;
+  groupdel $unixgroup 2> /dev/null
+done
+for i in `seq 1 1 $NGROUP`; do
+  unixgroup=testgrp$i;
+  groupdel $unixgroup 2> /dev/null
+done
+for i in `seq 1 1 $NBUILTIN`; do
+  unixgroup=testb$i;
+  groupdel $unixgroup 2> /dev/null
+done
+
+treport
+
+echo "ALL DONE"
-- 
cgit 


From 170ee35a6674468553b9c9e74072725afb80d0d1 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Mon, 25 Sep 2006 04:17:38 +0000
Subject: r18886: First, RPC_SRVSVC is called RPC-SRVSVC and second, we're so
 far off on that one that there's no point yet to run this in the build farm.

Volker
(This used to be commit bbd9f0bb6f58cda0ed4f18a3c19221cacfef1c0f)
---
 source3/script/tests/test_posix_s3.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index f079a5a1eb..fef517af7a 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -33,7 +33,8 @@ raw="$raw RAW-QFILEINFO RAW-QFSINFO RAW-READ RAW-RENAME RAW-SEARCH RAW-SEEK"
 raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
 raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH"
 
-rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC RPC-UNIXINFO RPC_SRVSVC"
+rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC"
+rpc="$rpc RPC-UNIXINFO"
 
 if test x$RUN_FROM_BUILD_FARM = xyes; then
 	rpc="$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME"
-- 
cgit 


From dc030ce813e90435ae5badaef3d3ff2b58ffa3e4 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 27 Sep 2006 12:42:24 +0000
Subject: r18951: socket_wrapper has only 16 interfaces anymore...

metze
(This used to be commit a1966a9c073b597407ee925d1fda53dfa7453e98)
---
 source3/script/tests/selftest.sh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 48f034cf1d..44e0295c69 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -100,18 +100,20 @@ cat >$COMMONCONFFILE<<EOF
 	name resolve order = bcast
 EOF
 
+TORTURE_INTERFACES='127.0.0.6/8,127.0.0.7/8,127.0.0.8/8,127.0.0.9/8,127.0.0.10/8,127.0.0.11/8'
+
 cat >$CONFFILE<<EOF
 [global]
-	netbios name = TORTURE26
-	interfaces = 127.0.0.26/8
+	netbios name = TORTURE_6
+	interfaces = $TORTURE_INTERFACES
 	panic action = $SCRIPTDIR/gdb_backtrace %d
 	include = $COMMONCONFFILE
 EOF
 
 cat >$SAMBA4CONFFILE<<EOF
 [global]
-	netbios name = TORTURE26
-	interfaces = 127.0.0.26/8
+	netbios name = TORTURE_6
+	interfaces = $TORTURE_INTERFACES
 	panic action = $SCRIPTDIR/gdb_backtrace %PID% %PROG%
 	include = $COMMONCONFFILE
 EOF
@@ -172,11 +174,10 @@ export SOCKET_WRAPPER_DEFAULT_IFACE
 samba3_check_or_start
 
 # ensure any one smbtorture call doesn't run too long
-# and smbtorture will use 127.0.0.26 as source address by default
-SOCKET_WRAPPER_DEFAULT_IFACE=26
+# and smbtorture will use 127.0.0.6 as source address by default
+SOCKET_WRAPPER_DEFAULT_IFACE=6
 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="--option=interfaces=$TORTURE4_INTERFACES $SAMBA4CONFIGURATION"
+TORTURE4_OPTIONS="$SAMBA4CONFIGURATION"
 TORTURE4_OPTIONS="$TORTURE4_OPTIONS --maximum-runtime=$TORTURE_MAXTIME"
 TORTURE4_OPTIONS="$TORTURE4_OPTIONS --target=samba3"
 export TORTURE4_OPTIONS
-- 
cgit 


From 6b80d173eda176594cc9cc36511ba62079964cfd Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 2 Oct 2006 11:35:41 +0000
Subject: r19038: build libreplace testsuite as replacetort and run it with
 make test

metze
(This used to be commit 9db9eb199f1902cb7e7f4f700b8594f4fc98ae8a)
---
 source3/script/tests/test_local_s3.sh | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_local_s3.sh b/source3/script/tests/test_local_s3.sh
index 083162d92b..019a51559b 100755
--- a/source3/script/tests/test_local_s3.sh
+++ b/source3/script/tests/test_local_s3.sh
@@ -17,4 +17,7 @@ failed=0
 testit "talloctort" $VALGRIND $BINDIR/talloctort || \
     failed=`expr $failed + 1`
 
+testit "replacetort" $VALGRIND $BINDIR/replacetort || \
+    failed=`expr $failed + 1`
+
 testok $0 $failed
-- 
cgit 


From c25f331cf9370a461487bf99cb661aa0148e078e Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 2 Oct 2006 12:24:51 +0000
Subject: r19040: use more portable shellscripting, hopefully give better
 results on Tru64

metze
(This used to be commit e8dd73f79656d9ef6faf9fceb84dc8702ac8e10a)
---
 source3/script/tests/gdb_backtrace | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/gdb_backtrace b/source3/script/tests/gdb_backtrace
index 2ea6a4d00a..2a5ed1f04d 100755
--- a/source3/script/tests/gdb_backtrace
+++ b/source3/script/tests/gdb_backtrace
@@ -5,9 +5,9 @@
 # we want everything on stderr, so the program is not disturbed
 exec 1>&2
 
-BASENAME=$( basename $0)
+BASENAME=`basename $0`
 
-test -z ${GDB_BIN} && GDB_BIN=$( type -p gdb)
+test -z ${GDB_BIN} && GDB_BIN=`type -p gdb`
 if [ -z ${GDB_BIN} ]; then
 	echo "ERROR: ${BASENAME} needs an installed gdb. "
 	exit 1
-- 
cgit 


From 8c15a6ff2e7d9341972fe0431655acd4416121f3 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Mon, 2 Oct 2006 13:50:30 +0000
Subject: r19046: It does not do much yet, but activate RPC-SAMBA3-SPOOLSS
 (This used to be commit 3bf313240c8dcabc28a2fbf35a68daf8274cf659)

---
 source3/script/tests/test_posix_s3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index fef517af7a..2a3ff373bc 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -34,7 +34,7 @@ raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
 raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH"
 
 rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC"
-rpc="$rpc RPC-UNIXINFO"
+rpc="$rpc RPC-UNIXINFO RPC-SAMBA3-SPOOLSS"
 
 if test x$RUN_FROM_BUILD_FARM = xyes; then
 	rpc="$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME"
-- 
cgit 


From 4366ca702dbb1566ee5dc8ffca95a36cf83032a5 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 5 Oct 2006 11:52:23 +0000
Subject: r19100: merge from samba4:

export MAKE_TEST_ENABLE_PCAP=yes enables
SOCKET_WRAPPER_PCAP_FILE support
in make test

metze
(This used to be commit 5faf816885b7a1bca5a25ab1ef5151d4e364cbda)
---
 source3/script/tests/test_functions.sh | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh
index 06c77c89d5..badbdd5b8e 100644
--- a/source3/script/tests/test_functions.sh
+++ b/source3/script/tests/test_functions.sh
@@ -133,11 +133,18 @@ testit() {
 	fi
 	name=$1
 	shift 1
-	SERVERS_ARE_UP="no"
-	TEST_LOG="$PREFIX/test_log.$$"
-	trap "rm -f $TEST_LOG" EXIT
 	cmdline="$*"
 
+	SERVERS_ARE_UP="no"
+
+	shname=`echo $name | \
+	sed -e 's%[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\-]%_%g'`
+
+	UNIQUE_PID=`/bin/sh -c 'echo $$'`
+	TEST_LOG="$PREFIX/test_log.${UNIQUE_PID}"
+	TEST_PCAP="$PREFIX/test_${shname}_${UNIQUE_PID}.pcap"
+	trap "rm -f $TEST_LOG $TEST_PCAP" EXIT
+
 	if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
 		echo "--==--==--==--==--==--==--==--==--==--==--"
 		echo "Running test $name (level 0 stdout)"
@@ -160,7 +167,12 @@ testit() {
 		fi
 		return 1
 	fi
-	
+
+	if [ x"$MAKE_TEST_ENABLE_PCAP" = x"yes" ];then
+		SOCKET_WRAPPER_PCAP_FILE=$TEST_PCAP
+		export SOCKET_WRAPPER_PCAP_FILE
+	fi
+
 	( $cmdline > $TEST_LOG 2>&1 )
 	status=$?
 	if [ x"$status" != x"0" ]; then
@@ -171,6 +183,9 @@ testit() {
 		samba3_smbd_test_log && echo "SMBD OUTPUT:";
 		samba3_smbd_test_log && cat $SMBD_TEST_LOG;
 		rm -f $TEST_LOG;
+		if [ x"$MAKE_TEST_ENABLE_PCAP" = x"yes" ];then
+			echo "TEST PCAP: $TEST_PCAP"
+		fi
 		if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
 			echo "=========================================="
 			echo "TEST FAILED: $name (status $status)"
@@ -180,7 +195,7 @@ testit() {
 		fi
 		return 1;
 	fi
-	rm -f $TEST_LOG;
+	rm -f $TEST_LOG $TEST_PCAP;
 	if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
 		echo "ALL OK: $cmdline"
 		echo "=========================================="
-- 
cgit 


From 06e36b4e1860927eb76a2e756d86ef9b525ac743 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 5 Oct 2006 21:30:31 +0000
Subject: r19104: Fix from Björn JACKE <bjoern@j3e.de> "here's a small fix for
 gdb_backtrace." Jeremy. (This used to be commit
 a0b4e5d11857cd067c60dd99dc5f00ee62a1354d)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source3/script/tests/gdb_backtrace | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/gdb_backtrace b/source3/script/tests/gdb_backtrace
index 2a5ed1f04d..c8fcad45f7 100755
--- a/source3/script/tests/gdb_backtrace
+++ b/source3/script/tests/gdb_backtrace
@@ -8,7 +8,7 @@ exec 1>&2
 BASENAME=`basename $0`
 
 test -z ${GDB_BIN} && GDB_BIN=`type -p gdb`
-if [ -z ${GDB_BIN} ]; then
+if [ -z "${GDB_BIN}" ]; then
 	echo "ERROR: ${BASENAME} needs an installed gdb. "
 	exit 1
 fi
-- 
cgit 


From a856a88ba452b4951edbdfc696f1738e482860d7 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 6 Oct 2006 10:14:56 +0000
Subject: r19119: try to be more portable...

metze
(This used to be commit 380e647534730313ee57d1acf2756708b7c9676d)
---
 source3/script/tests/gdb_backtrace | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/gdb_backtrace b/source3/script/tests/gdb_backtrace
index c8fcad45f7..8a74d1c101 100755
--- a/source3/script/tests/gdb_backtrace
+++ b/source3/script/tests/gdb_backtrace
@@ -7,23 +7,23 @@ exec 1>&2
 
 BASENAME=`basename $0`
 
-test -z ${GDB_BIN} && GDB_BIN=`type -p gdb`
-if [ -z "${GDB_BIN}" ]; then
-	echo "ERROR: ${BASENAME} needs an installed gdb. "
+PID=$1
+if [ x"$PID" = x"" ]; then
+	echo "ERROR: ${BASENAME} needs a PID. "
 	exit 1
 fi
 
-if [ -z $1 ]; then
-	echo "ERROR: ${BASENAME} needs a PID. "
+test x"${GDB_BIN}" = x"" && GDB_BIN=`type -p gdb`
+if [ x"${GDB_BIN}" = x"" ]; then
+	echo "ERROR: ${BASENAME} needs an installed gdb. "
 	exit 1
 fi
-PID=$1
 
 # use /dev/shm as default temp directory
 test -d /dev/shm && \
 	TMP_BASE_DIR=/dev/shm || \
 	TMP_BASE_DIR=/var/tmp
-TMPFILE=$( mktemp -p ${TMP_BASE_DIR} backtrace.XXXXXX)
+TMPFILE=`mktemp -p ${TMP_BASE_DIR} backtrace.XXXXXX`
 if [ $? -ne 0 ]; then
 	echo "ERROR: ${basename} can't create temp file in ${TMP_BASE_DIR}. "
 	exit 1
-- 
cgit 


From 9315bcd1e376241bdbe97a0d0dd569ecc5869ab4 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Fri, 6 Oct 2006 18:49:29 +0000
Subject: r19151: Create some dummy printers in the build farm (This used to be
 commit c26a20e6d5ac36be137fa63f477155a9613f050f)

---
 source3/script/tests/selftest.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 44e0295c69..80efb68f6a 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -132,6 +132,7 @@ cat >$SERVERCONFFILE<<EOF
 
 	kernel oplocks = no
 
+	syslog = no
 	printing = bsd
 	printcap name = /dev/null
 
@@ -145,6 +146,16 @@ cat >$SERVERCONFFILE<<EOF
 [hideunwrite]
 	copy = tmp
 	hide unwriteable files = yes
+[print1]
+	copy = tmp
+	printable = yes
+	printing = test
+[print2]
+	copy = print1
+[print3]
+	copy = print1
+[print4]
+	copy = print1
 EOF
 
 ##
-- 
cgit 


From 78d21c7785ae85649b7356a774787d008285133b Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 7 Oct 2006 10:33:33 +0000
Subject: r19164: merge the gdb_backtrace script from samba4

this more portable and try to make use of ladebug on Tru64,
but that only works when the binary is passed as 2nd arg to gdb_backtrace
as Tru64 doesn't know /proc/${PID}/exe

we need to find a way to pass the progname in 'panic action'
in samba3

metze
(This used to be commit 2f55fd82ff5db82974f91648cc386daa423e38be)
---
 source3/script/tests/gdb_backtrace | 96 ++++++++++++++++++++++++++++----------
 1 file changed, 71 insertions(+), 25 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/gdb_backtrace b/source3/script/tests/gdb_backtrace
index 8a74d1c101..b19a5b2f4b 100755
--- a/source3/script/tests/gdb_backtrace
+++ b/source3/script/tests/gdb_backtrace
@@ -1,41 +1,87 @@
-#! /bin/sh
-#
-# Author: Andrew Tridgell <tridge at samba dot org>
+#!/bin/sh
+
+BASENAME=`basename $0`
+
+if [ -n "$VALGRIND" -o -n "$SMBD_VALGRIND" ]; then
+	echo "${BASENAME}: Not running debugger under valgrind"
+	exit 1
+fi
 
 # we want everything on stderr, so the program is not disturbed
 exec 1>&2
 
 BASENAME=`basename $0`
+UNAME=`uname`
 
 PID=$1
-if [ x"$PID" = x"" ]; then
-	echo "ERROR: ${BASENAME} needs a PID. "
+BINARY=$2
+
+test x"${PID}" = x"" && {
+	echo "Usage: ${BASENAME} <pid> [<binary>]"
 	exit 1
-fi
+}
+
+DB_LIST="gdb"
+case "${UNAME}" in
+	#
+	# on Tru64 we need to try ladebug first
+	# because gdb crashes itself...
+	#
+	OSF1)
+		DB_LIST="ladebug ${DB_LIST}"
+	;;
+esac
 
-test x"${GDB_BIN}" = x"" && GDB_BIN=`type -p gdb`
-if [ x"${GDB_BIN}" = x"" ]; then
-	echo "ERROR: ${BASENAME} needs an installed gdb. "
+for DB in ${DB_LIST}; do
+	DB_BIN=`which ${DB} 2>/dev/null`
+	test x"${DB_BIN}" != x"" && {
+		break
+	}
+done
+
+test x"${DB_BIN}" = x"" && {
+	echo "${BASENAME}: ERROR: No debugger found."
 	exit 1
-fi
+}
 
-# use /dev/shm as default temp directory
-test -d /dev/shm && \
-	TMP_BASE_DIR=/dev/shm || \
-	TMP_BASE_DIR=/var/tmp
-TMPFILE=`mktemp -p ${TMP_BASE_DIR} backtrace.XXXXXX`
-if [ $? -ne 0 ]; then
-	echo "ERROR: ${basename} can't create temp file in ${TMP_BASE_DIR}. "
+#
+# we first try to use /proc/${PID}/exe
+# then fallback to the binary from the commandline
+# then we search for the commandline argument with
+# 'which'
+#
+test -f "/proc/${PID}/exe" && BINARY="/proc/${PID}/exe"
+test x"${BINARY}" = x"" && BINARY="/proc/${PID}/exe"
+test -f "${BINARY}" || BINARY=`which ${BINARY}`
+
+test -f "${BINARY}" || {
+	echo "${BASENAME}: ERROR: Cannot find binary '${BINARY}'."
 	exit 1
-fi
+}
+
+echo "${BASENAME}: Trying to use ${DB_BIN} on ${BINARY} on PID ${PID}"
 
-cat << EOF  > "${TMPFILE}"
-set height 0
-up 8
+BATCHFILE_PRE=/tmp/gdb_backtrace_pre.$$
+BATCHFILE_MAIN=/tmp/gdb_backtrace_main.$$
+case "${DB}" in
+	ladebug)
+cat << EOF  > ${BATCHFILE_PRE}
+set \$stoponattach
+EOF
+
+cat << EOF  > ${BATCHFILE_MAIN}
+where
+quit
+EOF
+	${DB_BIN} -c "${BATCHFILE_MAIN}" -i "${BATCHFILE_PRE}" -pid "${PID}" "${BINARY}"
+	;;
+	gdb)
+cat << EOF  > ${BATCHFILE_MAIN}
+set height 1000
 bt full
 quit
 EOF
-
-${GDB_BIN} -x "${TMPFILE}" "/proc/${PID}/exe" "${PID}"
-
-/bin/rm -f "${TMPFILE}"
+	${DB_BIN} -x "${BATCHFILE_MAIN}" "${BINARY}" "${PID}"
+	;;
+esac
+/bin/rm -f ${BATCHFILE_PRE} ${BATCHFILE_MAIN}
-- 
cgit 


From e739baf3a1f61b6e2b7d52452c30b52ba1c933b4 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sun, 8 Oct 2006 20:17:55 +0000
Subject: r19168: use the correct configuration

metze
(This used to be commit bf90ac567fc809bb8949b066e822a88170b73ac5)
---
 source3/script/tests/test_smbclient_s3.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh
index 01efebcd53..3a8f3bd5b6 100755
--- a/source3/script/tests/test_smbclient_s3.sh
+++ b/source3/script/tests/test_smbclient_s3.sh
@@ -24,7 +24,7 @@ test_noninteractive_no_prompt()
     prompt="smb"
 
     echo du | \
-	$SMBCLIENT "$@" -U$USERNAME%$PASSWORD //$SERVER/tmp 2>&1 | \
+	$SMBCLIENT $CONFIGURATION "$@" -U$USERNAME%$PASSWORD //$SERVER/tmp 2>&1 | \
     grep $prompt
 
     if [ $? = 0 ] ; then
@@ -48,7 +48,7 @@ quit
 EOF
 
     CLI_FORCE_INTERACTIVE=yes \
-    $SMBCLIENT "$@" -U$USERNAME%$PASSWORD //$SERVER/tmp \
+    $SMBCLIENT $CONFIGURATION "$@" -U$USERNAME%$PASSWORD //$SERVER/tmp \
 	< $tmpfile 2>/dev/null | \
     grep $prompt
 
@@ -63,8 +63,8 @@ EOF
     fi
 }
 
-testit "smbclient -L $SERVER_IP" $SMBCLIENT -L $SERVER_IP -N -p 139 || failed=`expr $failed + 1`
-testit "smbclient -L $SERVER" $SMBCLIENT -L $SERVER -N -p 139 || failed=`expr $failed + 1`
+testit "smbclient -L $SERVER_IP" $SMBCLIENT $CONFIGURATION -L $SERVER_IP -N -p 139 || failed=`expr $failed + 1`
+testit "smbclient -L $SERVER" $SMBCLIENT $CONFIGURATION -L $SERVER -N -p 139 || failed=`expr $failed + 1`
 
 testit "noninteractive smbclient does not prompt" \
     test_noninteractive_no_prompt || \
-- 
cgit 


From 0e66bafd47df4712666a022f7c4ad04faef7ac3c Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sun, 8 Oct 2006 20:30:09 +0000
Subject: r19169: port the trick to only display the smbd and nmbd log output
 of the current test

metze
(This used to be commit f668d4839de0ec98fcacf2efb6a69970757bebdd)
---
 source3/script/tests/test_functions.sh | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh
index badbdd5b8e..913e93210a 100644
--- a/source3/script/tests/test_functions.sh
+++ b/source3/script/tests/test_functions.sh
@@ -145,6 +145,13 @@ testit() {
 	TEST_PCAP="$PREFIX/test_${shname}_${UNIQUE_PID}.pcap"
 	trap "rm -f $TEST_LOG $TEST_PCAP" EXIT
 
+	if [ -z "$nmbd_log_size" ]; then
+		nmbd_log_size=`wc -l < $NMBD_TEST_LOG`;
+	fi
+	if [ -z "$smbd_log_size" ]; then
+		smbd_log_size=`wc -l < $SMBD_TEST_LOG`;
+	fi
+
 	if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
 		echo "--==--==--==--==--==--==--==--==--==--==--"
 		echo "Running test $name (level 0 stdout)"
@@ -175,13 +182,29 @@ testit() {
 
 	( $cmdline > $TEST_LOG 2>&1 )
 	status=$?
+	# show any additional output from smbd that has happened in this test
+	samba3_nmbd_test_log && {
+		new_log_size=`wc -l < $NMBD_TEST_LOG`;
+		test "$new_log_size" = "$nmbd_log_size" || {
+			echo "NMBD OUTPUT:";
+			incr_log_size=`expr $new_log_size - $nmbd_log_size`;
+			tail -$incr_log_size $NMBD_TEST_LOG;
+			nmbd_log_size=$new_log_size;
+		}
+	}
+	samba3_smbd_test_log && {
+		new_log_size=`wc -l < $SMBD_TEST_LOG`;
+		test "$new_log_size" = "$smbd_log_size" || {
+			echo "SMBD OUTPUT:";
+			incr_log_size=`expr $new_log_size - $smbd_log_size`;
+			tail -$incr_log_size $SMBD_TEST_LOG;
+			smbd_log_size=$new_log_size;
+		}
+	}
+
 	if [ x"$status" != x"0" ]; then
 		echo "TEST OUTPUT:"
 		cat $TEST_LOG;
-		samba3_nmbd_test_log && echo "NMBD OUTPUT:";
-		samba3_nmbd_test_log && cat $NMBD_TEST_LOG;
-		samba3_smbd_test_log && echo "SMBD OUTPUT:";
-		samba3_smbd_test_log && cat $SMBD_TEST_LOG;
 		rm -f $TEST_LOG;
 		if [ x"$MAKE_TEST_ENABLE_PCAP" = x"yes" ];then
 			echo "TEST PCAP: $TEST_PCAP"
-- 
cgit 


From 4a83c77c95206b35e6eba246918f5b5cf073b398 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sun, 8 Oct 2006 20:38:25 +0000
Subject: r19170: use a very clever trick to pass the binary name to the
 gdb_backtrace script, I never noticed that %$(envvar) exists...

Thanks to Bjoern Jacke for the suggestion!

metze
(This used to be commit 12a37bab3eafdabeb4f0dc23254bdec41860cd87)
---
 source3/script/tests/selftest.sh       |  7 +++++--
 source3/script/tests/test_functions.sh | 10 ++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 80efb68f6a..f4dcee1a7d 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -106,7 +106,7 @@ 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
 EOF
 
@@ -123,7 +123,7 @@ 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
 
 	; Necessary to add the build farm hacks
@@ -174,6 +174,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
diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh
index 913e93210a..cbec86e70c 100644
--- a/source3/script/tests/test_functions.sh
+++ b/source3/script/tests/test_functions.sh
@@ -43,8 +43,11 @@ samba3_check_or_start() {
 			if test x"$NMBD_MAXTIME" = x; then
 			    NMBD_MAXTIME=2700
 			fi
+			MAKE_TEST_BINARY=$BINDIR/nmbd
+			export MAKE_TEST_BINARY
 			timelimit $NMBD_MAXTIME $NMBD_VALGRIND $BINDIR/nmbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $NMBD_TEST_LOG 2>&1 &
 			TIMELIMIT_NMBD_PID=$!
+			MAKE_TEST_BINARY=
 			echo $TIMELIMIT_NMBD_PID > $PIDDIR/timelimit.nmbd.pid
 			wait $TIMELIMIT_NMBD_PID
 			ret=$?;
@@ -72,8 +75,11 @@ samba3_check_or_start() {
 			if test x"$SMBD_MAXTIME" = x; then
 			    SMBD_MAXTIME=2700
 			fi
+			MAKE_TEST_BINARY=$BINDIR/smbd
+			export MAKE_TEST_BINARY
 			timelimit $SMBD_MAXTIME $SMBD_VALGRIND $BINDIR/smbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $SMBD_TEST_LOG 2>&1 &
 			TIMELIMIT_SMBD_PID=$!
+			MAKE_TEST_BINARY=
 			echo $TIMELIMIT_SMBD_PID > $PIDDIR/timelimit.smbd.pid
 			wait $TIMELIMIT_SMBD_PID
 			ret=$?;
@@ -133,6 +139,7 @@ testit() {
 	fi
 	name=$1
 	shift 1
+	binary=$1
 	cmdline="$*"
 
 	SERVERS_ARE_UP="no"
@@ -180,8 +187,11 @@ testit() {
 		export SOCKET_WRAPPER_PCAP_FILE
 	fi
 
+	MAKE_TEST_BINARY=$binary
+	export MAKE_TEST_BINARY
 	( $cmdline > $TEST_LOG 2>&1 )
 	status=$?
+	MAKE_TEST_BINARY=
 	# show any additional output from smbd that has happened in this test
 	samba3_nmbd_test_log && {
 		new_log_size=`wc -l < $NMBD_TEST_LOG`;
-- 
cgit 


From 6c6842ee9449c45160fb82b6c1002f20414d3e6e Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 9 Oct 2006 06:48:55 +0000
Subject: r19181: merge from samba4:

with "export MAKE_TEST_KEEP_PCAP=yes" make test
doesn't delete the generated pcap files

metze
(This used to be commit 74212c30563826e2248c1cb16e4c953a28a25488)
---
 source3/script/tests/test_functions.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh
index cbec86e70c..3917eb86ac 100644
--- a/source3/script/tests/test_functions.sh
+++ b/source3/script/tests/test_functions.sh
@@ -228,7 +228,12 @@ testit() {
 		fi
 		return 1;
 	fi
-	rm -f $TEST_LOG $TEST_PCAP;
+	rm -f $TEST_LOG;
+	if [ x"$MAKE_TEST_KEEP_PCAP" = x"yes" ];then
+		echo "TEST PCAP: $TEST_PCAP"
+	else
+		rm -f $TEST_PCAP;
+	fi
 	if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
 		echo "ALL OK: $cmdline"
 		echo "=========================================="
-- 
cgit 


From a0dd125859e4e118c8bc3c2da258d69868aa786c Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Wed, 11 Oct 2006 15:27:21 +0000
Subject: r19248: Activate RPC-SAMBA3-WKSSVC (This used to be commit
 ed6070b7a053e162a9ac5809ff54181c04267f00)

---
 source3/script/tests/test_posix_s3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 2a3ff373bc..dac631eb14 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -34,7 +34,7 @@ raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
 raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH"
 
 rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC"
-rpc="$rpc RPC-UNIXINFO RPC-SAMBA3-SPOOLSS"
+rpc="$rpc RPC-UNIXINFO RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC"
 
 if test x$RUN_FROM_BUILD_FARM = xyes; then
 	rpc="$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME"
-- 
cgit 


From 2bc3099c71cd7bb699b515910329b6a50be5d4c5 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 16 Oct 2006 19:59:32 +0000
Subject: r19342: we only have one BASE-LOCK test in samba4's smbtorture now

metze
(This used to be commit a2c20811d6ef2a20326bcc2d4c2bb2cbb49f6394)
---
 source3/script/tests/test_posix_s3.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index dac631eb14..c73f3a7d2f 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -21,8 +21,8 @@ incdir=`dirname $0`
 
 base="BASE-ATTR BASE-CHARSET BASE-CHKPATH BASE-DEFER_OPEN BASE-DELAYWRITE BASE-DELETE"
 base="$base BASE-DENY1 BASE-DENY2 BASE-DENY3 BASE-DENYDOS BASE-DIR1 BASE-DIR2"
-base="$base BASE-DISCONNECT BASE-FDPASS BASE-LOCK1 BASE-LOCK2 BASE-LOCK3 BASE-LOCK4"
-base="$base BASE-LOCK5 BASE-LOCK6 BASE-LOCK7 BASE-MANGLE BASE-NEGNOWAIT BASE-NTDENY1"
+base="$base BASE-DISCONNECT BASE-FDPASS BASE-LOCK"
+base="$base BASE-MANGLE BASE-NEGNOWAIT BASE-NTDENY1"
 base="$base BASE-NTDENY2 BASE-OPEN BASE-OPENATTR BASE-PROPERTIES BASE-RENAME BASE-RW1"
 base="$base BASE-SECLEAK BASE-TCON BASE-TCONDEV BASE-TRANS2 BASE-UNLINK BASE-VUID"
 base="$base BASE-XCOPY"
-- 
cgit 


From e7c14137fa4f6c37b9418bc161f09d2617657274 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 21 Oct 2006 11:50:52 +0000
Subject: r19444: merge from samba4:

reset trap when we have removed the test specifc files already

metze
(This used to be commit 36065025c70d4ae3115554aac44c8807725a63b7)
---
 source3/script/tests/test_functions.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh
index 3917eb86ac..1cc9ea1264 100644
--- a/source3/script/tests/test_functions.sh
+++ b/source3/script/tests/test_functions.sh
@@ -226,6 +226,7 @@ testit() {
    		else
 			echo "TEST FAILED: $cmdline (status $status)"
 		fi
+		trap "" EXIT
 		return 1;
 	fi
 	rm -f $TEST_LOG;
@@ -240,6 +241,7 @@ testit() {
 		echo "TEST PASSED: $name"
 		echo "=========================================="
 	fi
+	trap "" EXIT
 	return 0;
 }
 
-- 
cgit 


From 25fe484101a589d6d15df21456060888aaaa149a Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Wed, 13 Dec 2006 16:39:50 +0000
Subject: r20150: better memory handling for some functions, make sure we don't
 leak memory by using the wrong(long lived)  mem context (This used to be
 commit a28cdd6e742cb72a728bd337546ee95fd4160ed8)

---
 source3/script/tests/selftest.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index f4dcee1a7d..5ec96f63e2 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/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
 
@@ -108,6 +106,8 @@ cat >$CONFFILE<<EOF
 	interfaces = $TORTURE_INTERFACES
 	panic action = $SCRIPTDIR/gdb_backtrace %d %\$(MAKE_TEST_BINARY)
 	include = $COMMONCONFFILE
+
+	passdb backend = tdbsam
 EOF
 
 cat >$SAMBA4CONFFILE<<EOF
@@ -126,6 +126,8 @@ cat >$SERVERCONFFILE<<EOF
 	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
-- 
cgit 


From bc3787ab6e2ad91bcd8121a967547a25f835daeb Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Tue, 19 Dec 2006 18:02:24 +0000
Subject: r20255: Activate BASE-SAMBA3ERROR in the build farm (This used to be
 commit 7e0005c14b6852be756dbdacd1412077f2cf57f5)

---
 source3/script/tests/test_posix_s3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index c73f3a7d2f..c04c88f41a 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -25,7 +25,7 @@ base="$base BASE-DISCONNECT BASE-FDPASS BASE-LOCK"
 base="$base BASE-MANGLE BASE-NEGNOWAIT BASE-NTDENY1"
 base="$base BASE-NTDENY2 BASE-OPEN BASE-OPENATTR BASE-PROPERTIES BASE-RENAME BASE-RW1"
 base="$base BASE-SECLEAK BASE-TCON BASE-TCONDEV BASE-TRANS2 BASE-UNLINK BASE-VUID"
-base="$base BASE-XCOPY"
+base="$base BASE-XCOPY BASE-SAMBA3ERROR"
 
 raw="RAW-ACLS RAW-CHKPATH RAW-CLOSE RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
 raw="$raw RAW-IOCTL RAW-LOCK RAW-MKDIR RAW-MUX RAW-NOTIFY RAW-OPEN RAW-OPLOCK"
-- 
cgit 


From 81824507f6579de7795b39f7100ca22575201f11 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Sat, 23 Dec 2006 18:01:34 +0000
Subject: r20334: Activate RAW-MKDIR (This used to be commit
 8f76914e01f73149f549ebd6d8f9e549772dbb84)

---
 source3/script/tests/test_posix_s3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index c04c88f41a..b9edbb797b 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -44,7 +44,7 @@ tests="$base $raw $rpc"
 
 skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-OPENATTR BASE-TCONDEV"
 skipped="$skipped RAW-ACLS RAW-CLOSE RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
-skipped="$skipped RAW-IOCTL RAW-MKDIR RAW-MUX RAW-NOTIFY RAW-OPEN"
+skipped="$skipped RAW-IOCTL RAW-MUX RAW-NOTIFY RAW-OPEN"
 skipped="$skipped RAW-QFILEINFO RAW-QFSINFO RAW-RENAME RAW-SEARCH"
 skipped="$skipped RAW-SFILEINFO RAW-STREAMS RAW-UNLINK RAW-WRITE"
 
-- 
cgit 


From 58b63b65fcf3dbd14f985f99038733c8a0a2f14f Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Tue, 2 Jan 2007 15:01:43 +0000
Subject: r20478: Make us survive & activate RAW-UNLINK (This used to be commit
 4f0f917b344743e16e8bacf4e72529a2890590fe)

---
 source3/script/tests/selftest.sh      | 3 +++
 source3/script/tests/test_posix_s3.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 5ec96f63e2..f613f2126f 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -142,6 +142,9 @@ 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
diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index b9edbb797b..c442684732 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -46,7 +46,7 @@ skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-OPENATTR BASE-TCONDEV
 skipped="$skipped RAW-ACLS RAW-CLOSE RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
 skipped="$skipped RAW-IOCTL RAW-MUX RAW-NOTIFY RAW-OPEN"
 skipped="$skipped RAW-QFILEINFO RAW-QFSINFO RAW-RENAME RAW-SEARCH"
-skipped="$skipped RAW-SFILEINFO RAW-STREAMS RAW-UNLINK RAW-WRITE"
+skipped="$skipped RAW-SFILEINFO RAW-STREAMS RAW-WRITE"
 
 echo "WARNING: Skipping tests $skipped"
 
-- 
cgit 


From b3ddd92ba2dfbf732b3e6e22812bca780713ed8f Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Tue, 2 Jan 2007 16:40:41 +0000
Subject: r20482: Make us survive and activate RAW-CLOSE (This used to be
 commit 471c6e6a2142afbca36163bcdbb5b6fb4e7ac774)

---
 source3/script/tests/test_posix_s3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index c442684732..4c13828546 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -43,7 +43,7 @@ fi
 tests="$base $raw $rpc"
 
 skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-OPENATTR BASE-TCONDEV"
-skipped="$skipped RAW-ACLS RAW-CLOSE RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
+skipped="$skipped RAW-ACLS RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
 skipped="$skipped RAW-IOCTL RAW-MUX RAW-NOTIFY RAW-OPEN"
 skipped="$skipped RAW-QFILEINFO RAW-QFSINFO RAW-RENAME RAW-SEARCH"
 skipped="$skipped RAW-SFILEINFO RAW-STREAMS RAW-WRITE"
-- 
cgit 


From 94a750082315d9722365ce09a4ef76da2f50b384 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Wed, 3 Jan 2007 06:53:13 +0000
Subject: r20499: Activate RAW-OPEN in the build farm (This used to be commit
 a0d5de61a10321ee2edd832dcda611230d796dd6)

---
 source3/script/tests/test_posix_s3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 4c13828546..5b48e25ff0 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -44,7 +44,7 @@ tests="$base $raw $rpc"
 
 skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-OPENATTR BASE-TCONDEV"
 skipped="$skipped RAW-ACLS RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
-skipped="$skipped RAW-IOCTL RAW-MUX RAW-NOTIFY RAW-OPEN"
+skipped="$skipped RAW-IOCTL RAW-MUX RAW-NOTIFY"
 skipped="$skipped RAW-QFILEINFO RAW-QFSINFO RAW-RENAME RAW-SEARCH"
 skipped="$skipped RAW-SFILEINFO RAW-STREAMS RAW-WRITE"
 
-- 
cgit 


From 801cf72cb8de75f21aa85a9345ec3a17f53e08e6 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Wed, 3 Jan 2007 09:04:06 +0000
Subject: r20502: Activate RAW-RENAME, my Linux box passes this (This used to
 be commit 56c8d2cfed273655b2c79b3a2c613a7253e05221)

---
 source3/script/tests/test_posix_s3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 5b48e25ff0..f92e2884cc 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -45,7 +45,7 @@ tests="$base $raw $rpc"
 skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-OPENATTR BASE-TCONDEV"
 skipped="$skipped RAW-ACLS RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
 skipped="$skipped RAW-IOCTL RAW-MUX RAW-NOTIFY"
-skipped="$skipped RAW-QFILEINFO RAW-QFSINFO RAW-RENAME RAW-SEARCH"
+skipped="$skipped RAW-QFILEINFO RAW-QFSINFO RAW-SEARCH"
 skipped="$skipped RAW-SFILEINFO RAW-STREAMS RAW-WRITE"
 
 echo "WARNING: Skipping tests $skipped"
-- 
cgit 


From 7093ba871cc181ccaeb2c62acf262290964085f5 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Mon, 5 Feb 2007 15:07:44 +0000
Subject: r21150: Activate RAW-NOTIFY (This used to be commit
 39809d7391723d3c310fc11705b1de20074c4bbf)

---
 source3/script/tests/test_posix_s3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index f92e2884cc..a56032c7f4 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -44,7 +44,7 @@ tests="$base $raw $rpc"
 
 skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-OPENATTR BASE-TCONDEV"
 skipped="$skipped RAW-ACLS RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
-skipped="$skipped RAW-IOCTL RAW-MUX RAW-NOTIFY"
+skipped="$skipped RAW-IOCTL RAW-MUX"
 skipped="$skipped RAW-QFILEINFO RAW-QFSINFO RAW-SEARCH"
 skipped="$skipped RAW-SFILEINFO RAW-STREAMS RAW-WRITE"
 
-- 
cgit 


From 4be76056d2dc900aad3b00930d3df12f33da2692 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Mon, 5 Feb 2007 21:18:44 +0000
Subject: r21165: Lets try the build farm without inotify, we're seeing some
 NT_STATUS_IO_TIMEOUT with it.

Samba4 disables inotify as well. Does anybody know why Samba4 does it? Maybe
the same justification holds for 3 as well.

Volker
(This used to be commit de216a574c49f97e86a90c96627de4b5a3ea4b1c)
---
 source3/script/tests/selftest.sh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index f613f2126f..1fec131ee8 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -133,6 +133,7 @@ cat >$SERVERCONFFILE<<EOF
 	add machine script = /bin/false
 
 	kernel oplocks = no
+	kernel change notify = no
 
 	syslog = no
 	printing = bsd
-- 
cgit 


From abbb882f748e35f0e58fec2e5abb39275fd0ffaf Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Tue, 6 Feb 2007 22:38:31 +0000
Subject: r21202: On some build hosts, the first tests fail with
 CONNECTION_REFUSED. On my solaris 9 box I could solve that with an increased
 wait time.

Volker
(This used to be commit 4ea654857af48640d86377418f7a91a91c830ced)
---
 source3/script/tests/selftest.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 1fec131ee8..d5cd2fbeda 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -215,7 +215,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__
-- 
cgit 


From 41c8f3da97a443fc4a9a987a3c2588eb07e324b3 Mon Sep 17 00:00:00 2001
From: James Peach <jpeach@samba.org>
Date: Thu, 8 Mar 2007 20:54:13 +0000
Subject: r21766: Fix compiler warning. (This used to be commit
 f82ac78b2fa623f5868201bd54ffac9c8f318eef)

---
 source3/script/tests/selftest.sh       | 4 +++-
 source3/script/tests/test_functions.sh | 4 ++--
 source3/script/tests/test_posix_s3.sh  | 9 ++++++++-
 source3/script/tests/tests_all.sh      | 6 +++---
 4 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index d5cd2fbeda..ba194dfa11 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+set -x
 if [ $# != 3 ]; then
 	echo "$0 <directory> <all | quick> <smbtorture4>"
 	exit 1
@@ -93,7 +94,6 @@ cat >$COMMONCONFFILE<<EOF
 	pid directory = $PIDDIR
 	lock directory = $LOCKDIR
 	log file = $LOGDIR/log.%m
-	log level = 0
 
 	name resolve order = bcast
 EOF
@@ -120,6 +120,7 @@ EOF
 
 cat >$SERVERCONFFILE<<EOF
 [global]
+	log level = 10
 	netbios name = $SERVER
 	interfaces = $SERVER_IP/8
 	bind interfaces only = yes
@@ -146,6 +147,7 @@ cat >$SERVERCONFFILE<<EOF
 	map hidden = yes
 	map system = yes
 	create mask = 755
+	guest ok = yes
 [hideunread]
 	copy = tmp
 	hide unreadable = yes
diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh
index 1cc9ea1264..0089f620a3 100644
--- a/source3/script/tests/test_functions.sh
+++ b/source3/script/tests/test_functions.sh
@@ -45,7 +45,7 @@ samba3_check_or_start() {
 			fi
 			MAKE_TEST_BINARY=$BINDIR/nmbd
 			export MAKE_TEST_BINARY
-			timelimit $NMBD_MAXTIME $NMBD_VALGRIND $BINDIR/nmbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $NMBD_TEST_LOG 2>&1 &
+			timelimit $NMBD_MAXTIME $NMBD_VALGRIND $BINDIR/nmbd -F -S --no-process-group -s $SERVERCONFFILE > $NMBD_TEST_LOG 2>&1 &
 			TIMELIMIT_NMBD_PID=$!
 			MAKE_TEST_BINARY=
 			echo $TIMELIMIT_NMBD_PID > $PIDDIR/timelimit.nmbd.pid
@@ -77,7 +77,7 @@ samba3_check_or_start() {
 			fi
 			MAKE_TEST_BINARY=$BINDIR/smbd
 			export MAKE_TEST_BINARY
-			timelimit $SMBD_MAXTIME $SMBD_VALGRIND $BINDIR/smbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $SMBD_TEST_LOG 2>&1 &
+			timelimit $SMBD_MAXTIME $SMBD_VALGRIND $BINDIR/smbd -F --no-process-group -s $SERVERCONFFILE -l $SOCKET_WRAPPER_DIR > $SMBD_TEST_LOG 2>&1 &
 			TIMELIMIT_SMBD_PID=$!
 			MAKE_TEST_BINARY=
 			echo $TIMELIMIT_SMBD_PID > $PIDDIR/timelimit.smbd.pid
diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index a56032c7f4..4d41786e6e 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -36,11 +36,18 @@ raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH"
 rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC"
 rpc="$rpc RPC-UNIXINFO RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC"
 
+base=
+raw=
+rpc=
+unix="UNIX-WHOAMI UNIX-INFO2"
+ 
+RUN_FROM_BUILD_FARM=no
+
 if test x$RUN_FROM_BUILD_FARM = xyes; then
 	rpc="$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME"
 fi
 
-tests="$base $raw $rpc"
+tests="$base $raw $rpc $unix"
 
 skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-OPENATTR BASE-TCONDEV"
 skipped="$skipped RAW-ACLS RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index dd593899e4..2287f82978 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -1,7 +1,7 @@
 
-$SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?`
-$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
-$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
+#$SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?`
+#$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
+#$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
 
 SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
 if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
-- 
cgit 


From a39f08eec29235d9b09c169e3a95eba0484c7847 Mon Sep 17 00:00:00 2001
From: James Peach <jpeach@samba.org>
Date: Thu, 8 Mar 2007 21:30:15 +0000
Subject: r21767: Revert all the bits I accidentally committed in r21766. (This
 used to be commit 7e862b908057b7971f8163ee94c9358a63998e87)

---
 source3/script/tests/selftest.sh       | 4 +---
 source3/script/tests/test_functions.sh | 4 ++--
 source3/script/tests/test_posix_s3.sh  | 9 +--------
 source3/script/tests/tests_all.sh      | 6 +++---
 4 files changed, 7 insertions(+), 16 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index ba194dfa11..d5cd2fbeda 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-set -x
 if [ $# != 3 ]; then
 	echo "$0 <directory> <all | quick> <smbtorture4>"
 	exit 1
@@ -94,6 +93,7 @@ cat >$COMMONCONFFILE<<EOF
 	pid directory = $PIDDIR
 	lock directory = $LOCKDIR
 	log file = $LOGDIR/log.%m
+	log level = 0
 
 	name resolve order = bcast
 EOF
@@ -120,7 +120,6 @@ EOF
 
 cat >$SERVERCONFFILE<<EOF
 [global]
-	log level = 10
 	netbios name = $SERVER
 	interfaces = $SERVER_IP/8
 	bind interfaces only = yes
@@ -147,7 +146,6 @@ cat >$SERVERCONFFILE<<EOF
 	map hidden = yes
 	map system = yes
 	create mask = 755
-	guest ok = yes
 [hideunread]
 	copy = tmp
 	hide unreadable = yes
diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh
index 0089f620a3..1cc9ea1264 100644
--- a/source3/script/tests/test_functions.sh
+++ b/source3/script/tests/test_functions.sh
@@ -45,7 +45,7 @@ samba3_check_or_start() {
 			fi
 			MAKE_TEST_BINARY=$BINDIR/nmbd
 			export MAKE_TEST_BINARY
-			timelimit $NMBD_MAXTIME $NMBD_VALGRIND $BINDIR/nmbd -F -S --no-process-group -s $SERVERCONFFILE > $NMBD_TEST_LOG 2>&1 &
+			timelimit $NMBD_MAXTIME $NMBD_VALGRIND $BINDIR/nmbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $NMBD_TEST_LOG 2>&1 &
 			TIMELIMIT_NMBD_PID=$!
 			MAKE_TEST_BINARY=
 			echo $TIMELIMIT_NMBD_PID > $PIDDIR/timelimit.nmbd.pid
@@ -77,7 +77,7 @@ samba3_check_or_start() {
 			fi
 			MAKE_TEST_BINARY=$BINDIR/smbd
 			export MAKE_TEST_BINARY
-			timelimit $SMBD_MAXTIME $SMBD_VALGRIND $BINDIR/smbd -F --no-process-group -s $SERVERCONFFILE -l $SOCKET_WRAPPER_DIR > $SMBD_TEST_LOG 2>&1 &
+			timelimit $SMBD_MAXTIME $SMBD_VALGRIND $BINDIR/smbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $SMBD_TEST_LOG 2>&1 &
 			TIMELIMIT_SMBD_PID=$!
 			MAKE_TEST_BINARY=
 			echo $TIMELIMIT_SMBD_PID > $PIDDIR/timelimit.smbd.pid
diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 4d41786e6e..a56032c7f4 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -36,18 +36,11 @@ raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH"
 rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC"
 rpc="$rpc RPC-UNIXINFO RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC"
 
-base=
-raw=
-rpc=
-unix="UNIX-WHOAMI UNIX-INFO2"
- 
-RUN_FROM_BUILD_FARM=no
-
 if test x$RUN_FROM_BUILD_FARM = xyes; then
 	rpc="$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME"
 fi
 
-tests="$base $raw $rpc $unix"
+tests="$base $raw $rpc"
 
 skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-OPENATTR BASE-TCONDEV"
 skipped="$skipped RAW-ACLS RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index 2287f82978..dd593899e4 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -1,7 +1,7 @@
 
-#$SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?`
-#$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
-#$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
+$SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?`
+$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
+$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
 
 SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
 if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
-- 
cgit 


From cc87cb7770198aa2aeac8253ff57fef8fe01f27d Mon Sep 17 00:00:00 2001
From: James Peach <jpeach@samba.org>
Date: Fri, 23 Mar 2007 19:31:11 +0000
Subject: r21950: After discussion with the Apple and Linux client maintainers,
 changing the FindFirst response for the UNIX_INFO2 level to include a length
 field before the name. The name is not required to be null terminated. The
 length field does not count any null.

Also add call to chflags(2) in the default VFS module so that this
will work be default on BSD-derived platform. Add UNIX-INFO2 test
to the build farm to get some non-BSD coverage.

Jeremy and Jerry, please review for inclusion in 3.0.25.
(This used to be commit e7b21b1ef3f79c0df2bae5f15c345ef74292c404)
---
 source3/script/tests/test_posix_s3.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index a56032c7f4..415d71fdee 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -36,11 +36,16 @@ raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH"
 rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC"
 rpc="$rpc RPC-UNIXINFO RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC"
 
+# NOTE: to enable the UNIX-WHOAMI test, we need to change the default share
+# config to allow guest access. I'm not sure whether this would break other
+# tests, so leaving it alone for now -- jpeach
+unix="UNIX-INFO2"
+
 if test x$RUN_FROM_BUILD_FARM = xyes; then
 	rpc="$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME"
 fi
 
-tests="$base $raw $rpc"
+tests="$base $raw $rpc $unix"
 
 skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-OPENATTR BASE-TCONDEV"
 skipped="$skipped RAW-ACLS RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
-- 
cgit 


From e9b27a34e35500b9da94ccdf7872d6956bd93566 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 18 May 2007 09:50:56 +0000
Subject: r22998: merge from SAMBA_4_0:

only if the output of which has a leading '/' the output is useful...

metze
(This used to be commit 5c5aa1f862ad5e765b18c8dbc981af3012b48cb7)
---
 source3/script/tests/gdb_backtrace | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/gdb_backtrace b/source3/script/tests/gdb_backtrace
index b19a5b2f4b..826381e900 100755
--- a/source3/script/tests/gdb_backtrace
+++ b/source3/script/tests/gdb_backtrace
@@ -33,7 +33,7 @@ case "${UNAME}" in
 esac
 
 for DB in ${DB_LIST}; do
-	DB_BIN=`which ${DB} 2>/dev/null`
+	DB_BIN=`which ${DB} 2>/dev/null | grep '^/'`
 	test x"${DB_BIN}" != x"" && {
 		break
 	}
-- 
cgit 


From de565785f5e1f097bd75f57331425c4185185f80 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Sun, 10 Jun 2007 17:02:09 +0000
Subject: r23410: Merge the core of the cluster code.

I'm 100% certain I've forgotten to merge something, but the main code
should be in. It's mainly in dbwrap_ctdb.c, ctdbd_conn.c and
messages_ctdbd.c.

There should be no changes to the non-cluster case, it does survive make
test on my laptop.

It survives some very basic tests with ctdbd enables, I did not do the
full test suite for clusters yet.

Phew...

Volker
(This used to be commit 15553d6327a3aecdd2b0b94a3656d04bf4106323)
---
 source3/script/tests/tests_all.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index dd593899e4..2287f82978 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -1,7 +1,7 @@
 
-$SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?`
-$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
-$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
+#$SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?`
+#$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
+#$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
 
 SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
 if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
-- 
cgit 


From d9f7cbacb06afd5e2aea5ed4738158f84085c36e Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Tue, 12 Jun 2007 10:18:26 +0000
Subject: r23429: Ooops, sorry.

Revert an accidential checkin of r23410.

Volker
(This used to be commit 23ecb5439f509f8f1eef6dded74357af5760094f)
---
 source3/script/tests/tests_all.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index 2287f82978..dd593899e4 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -1,7 +1,7 @@
 
-#$SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?`
-#$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
-#$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
+$SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?`
+$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
+$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
 
 SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
 if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
-- 
cgit 


From 9426d78f1e0a0c5faf96fcb21f9c8cbb90b9af1f Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Thu, 14 Jun 2007 12:29:04 +0000
Subject: r23489: (Re-)Add tdbtorture as a build target to 3_0_26. Add the
 tdbtorture test to the test script in 3_0 and 3_0_26.

Michael
(This used to be commit 30d71cf4b8decd6fad0c44a3eb57e29ea7d898a0)
---
 source3/script/tests/test_local_s3.sh | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_local_s3.sh b/source3/script/tests/test_local_s3.sh
index 019a51559b..6117106c8a 100755
--- a/source3/script/tests/test_local_s3.sh
+++ b/source3/script/tests/test_local_s3.sh
@@ -20,4 +20,7 @@ testit "talloctort" $VALGRIND $BINDIR/talloctort || \
 testit "replacetort" $VALGRIND $BINDIR/replacetort || \
     failed=`expr $failed + 1`
 
+testit "tdbtorture" $VALGRIND $BINDIR/tdbtorture || \
+    failed=`expr $failed +1`
+
 testok $0 $failed
-- 
cgit 


From 9c4d185ef0740ea31da8718b9cb16dac7cddcc15 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Thu, 14 Jun 2007 14:45:37 +0000
Subject: r23500: Two changes to survive the now activated test for
 rename_internals_fsp: With the target being open we have to return
 NT_STATUS_ACCESS_DENIED and root_fid != 0 leads to
 NT_STATUS_INVALID_PARAMETER (This used to be commit
 b599e5b1e10bdf825b2ce53de4a6ec35726d00f6)

---
 source3/script/tests/test_posix_s3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 415d71fdee..3c9d8f0dc4 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -31,7 +31,7 @@ raw="RAW-ACLS RAW-CHKPATH RAW-CLOSE RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
 raw="$raw RAW-IOCTL RAW-LOCK RAW-MKDIR RAW-MUX RAW-NOTIFY RAW-OPEN RAW-OPLOCK"
 raw="$raw RAW-QFILEINFO RAW-QFSINFO RAW-READ RAW-RENAME RAW-SEARCH RAW-SEEK"
 raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
-raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH"
+raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH RAW-SFILEINFO-RENAME"
 
 rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC"
 rpc="$rpc RPC-UNIXINFO RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC"
-- 
cgit 


From 2a9b4da0fa00d4ada504f49fafcadab7b0094331 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 9 Jul 2007 19:46:27 +0000
Subject: r23780: Find and fix more GPL2 -> GPL3. Jeremy. (This used to be
 commit c2f7ab1c175ecff0cf44d0bbc4763ba9f7d7803f)

---
 source3/script/tests/dlopen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/dlopen.sh b/source3/script/tests/dlopen.sh
index 6127953692..dce95e876e 100755
--- a/source3/script/tests/dlopen.sh
+++ b/source3/script/tests/dlopen.sh
@@ -4,7 +4,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
-- 
cgit 


From 153cfb9c83534b09f15cc16205d7adb19b394928 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 10 Jul 2007 05:23:25 +0000
Subject: r23801: The FSF has moved around a lot. This fixes their Mass Ave
 address. (This used to be commit 87c91e4362c51819032bfbebbb273c52e203b227)

---
 source3/script/tests/dlopen.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/dlopen.sh b/source3/script/tests/dlopen.sh
index dce95e876e..edf44719d3 100755
--- a/source3/script/tests/dlopen.sh
+++ b/source3/script/tests/dlopen.sh
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 tempdir=`mktemp -d /tmp/dlopenXXXXXX`
 test -n "$tempdir" || exit 1
-- 
cgit 


From 69d25c9e3d39094cfe16ff0172deab8e927793e7 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Thu, 30 Aug 2007 14:16:20 +0000
Subject: r24802: Activate new tests

RAW-SAMBA3CASEINSENSITIVE and RAW-SAMBA3POSIXTIMEDLOCK
(This used to be commit 1f396cc237e3861b216d03a7af9e461578cf448a)
---
 source3/script/tests/selftest.sh      | 1 +
 source3/script/tests/test_posix_s3.sh | 1 +
 2 files changed, 2 insertions(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index d5cd2fbeda..8de6420b10 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -200,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
diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 3c9d8f0dc4..1a72d1dfd2 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -32,6 +32,7 @@ raw="$raw RAW-IOCTL RAW-LOCK RAW-MKDIR RAW-MUX RAW-NOTIFY RAW-OPEN RAW-OPLOCK"
 raw="$raw RAW-QFILEINFO RAW-QFSINFO RAW-READ RAW-RENAME RAW-SEARCH RAW-SEEK"
 raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
 raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH RAW-SFILEINFO-RENAME"
+raw="$raw RAW-SAMBA3CASEINSENSITIVE RAW-SAMBA3POSIXTIMEDLOCK"
 
 rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC"
 rpc="$rpc RPC-UNIXINFO RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC"
-- 
cgit 


From 993d64cde307be69c4db3756b7f59881d35fee93 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 6 Sep 2007 10:51:17 +0000
Subject: r24974: catch SIGINT and SIGQUIT like SIGTERM

metze
(This used to be commit ab15f5c3e72df6272db9a4431f720f604fcf40f2)
---
 source3/script/tests/timelimit.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/timelimit.c b/source3/script/tests/timelimit.c
index 32e58f5249..886256cb37 100644
--- a/source3/script/tests/timelimit.c
+++ b/source3/script/tests/timelimit.c
@@ -80,6 +80,8 @@ int main(int argc, char *argv[])
 	}
 
 	signal(SIGTERM, sig_term);
+	signal(SIGINT,  sig_term);
+	signal(SIGQUIT, sig_term);
 	signal(SIGUSR1, sig_usr1);
 	signal(SIGALRM, sig_alrm_term);
 	alarm(maxtime);
-- 
cgit 


From 351eb37a2555ce474ee02758f2f2cfee33d4d434 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 11 Sep 2007 18:31:29 +0000
Subject: r25102: Rewrite msdfs code to use talloced filenames. Passes make
 test and make valgrindtest. Final step will be to change srvstr_get_path() to
 return talloced memory in the major codepaths. Jeremy. (This used to be
 commit cf6b6f9c3a38b68d2671c753f412772344506742)

---
 source3/script/tests/selftest.sh | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 8de6420b10..c1d4b23c5f 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -139,6 +139,9 @@ cat >$SERVERCONFFILE<<EOF
 	printing = bsd
 	printcap name = /dev/null
 
+	host msdfs = yes
+	panic action = "/bin/sleep 90000"
+
 [tmp]
 	path = $PREFIX_ABS/tmp
 	read only = no
-- 
cgit 


From 1cc01f224980a9cc836212fed15ccb88b1441e30 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 11 Sep 2007 21:52:44 +0000
Subject: r25104: Fix extra lines added by mistake. Jeremy. (This used to be
 commit a28a35f9cdddb9da1b2adb9e2e6c86d78cf07ea6)

---
 source3/script/tests/selftest.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index c1d4b23c5f..56b2a970e3 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -139,8 +139,8 @@ cat >$SERVERCONFFILE<<EOF
 	printing = bsd
 	printcap name = /dev/null
 
-	host msdfs = yes
-	panic action = "/bin/sleep 90000"
+#	host msdfs = yes
+#	panic action = "/bin/sleep 90000"
 
 [tmp]
 	path = $PREFIX_ABS/tmp
-- 
cgit 


From d7a97b4b4c838cabbfb04fd4673cde97fb54b49d Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Tue, 25 Sep 2007 16:42:53 +0000
Subject: r25317: Activate raw-samba3rootdirfid (This used to be commit
 1cbe40b27c8142c53480fc9c4e1b0c9f14446300)

---
 source3/script/tests/test_posix_s3.sh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 1a72d1dfd2..1a4c4d11cc 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -33,6 +33,7 @@ raw="$raw RAW-QFILEINFO RAW-QFSINFO RAW-READ RAW-RENAME RAW-SEARCH RAW-SEEK"
 raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
 raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH RAW-SFILEINFO-RENAME"
 raw="$raw RAW-SAMBA3CASEINSENSITIVE RAW-SAMBA3POSIXTIMEDLOCK"
+raw="$raw RAW-SAMBA3ROOTDIRFID"
 
 rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC"
 rpc="$rpc RPC-UNIXINFO RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC"
-- 
cgit 


From 679ef7b6babef0666749bea1d3b722786ce928d9 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 28 Sep 2007 22:16:14 +0000
Subject: r25415: Merge the 3.2-perltest branch that switches Samba 3.2 to use
 Samba 4's selftest code. See the mailing list for details. (This used to be
 commit bdc831ddb3a860676c36bbd89e6f748946df68a1)

---
 source3/script/tests/test_functions.sh     | 279 +----------------------------
 source3/script/tests/test_local_s3.sh      |  22 +--
 source3/script/tests/test_posix_s3.sh      |  80 ---------
 source3/script/tests/test_smbclient_s3.sh  |  22 ++-
 source3/script/tests/test_smbtorture_s3.sh |  32 +---
 source3/script/tests/tests_all.sh          |  18 +-
 source3/script/tests/tests_smbclient_s3.sh |   1 -
 7 files changed, 38 insertions(+), 416 deletions(-)
 delete mode 100755 source3/script/tests/test_posix_s3.sh
 delete mode 100644 source3/script/tests/tests_smbclient_s3.sh

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh
index 1cc9ea1264..9ad1155024 100644
--- a/source3/script/tests/test_functions.sh
+++ b/source3/script/tests/test_functions.sh
@@ -1,276 +1,11 @@
-
-samba3_stop_sig_term() {
-	RET=0
-	kill -USR1 `cat $PIDDIR/timelimit.nmbd.pid` >/dev/null 2>&1 || \
-		kill -ALRM `cat $PIDDIR/timelimit.nmbd.pid` || RET=$?
-
-	kill -USR1 `cat $PIDDIR/timelimit.smbd.pid` >/dev/null 2>&1 || \
-		kill -ALRM `cat $PIDDIR/timelimit.smbd.pid` || RET=$?
-
-	return $RET;
-}
-
-samba3_stop_sig_kill() {
-	kill -ALRM `cat $PIDDIR/timelimit.nmbd.pid` >/dev/null 2>&1
-	kill -ALRM `cat $PIDDIR/timelimit.smbd.pid` >/dev/null 2>&1
-	return 0;
-}
-
-samba3_check_or_start() {
-	if [ -n "$SERVER_TEST_FIFO" ];then
-
-		trap samba3_stop_sig_kill INT QUIT
-		trap samba3_stop_sig_kill TERM
-
-		if [ -p "$SERVER_TEST_FIFO" ];then
-			return 0;
-		fi
-
-		if [ -n "$SOCKET_WRAPPER_DIR" ];then
-			if [ -d "$SOCKET_WRAPPER_DIR" ]; then
-				rm -f $SOCKET_WRAPPER_DIR/*
-			else
-				mkdir -p $SOCKET_WRAPPER_DIR
-			fi
-		fi
-
-		rm -f $SERVER_TEST_FIFO
-		mkfifo $SERVER_TEST_FIFO
-
-		rm -f $NMBD_TEST_LOG
-		echo -n "STARTING NMBD..."
-		((
-			if test x"$NMBD_MAXTIME" = x; then
-			    NMBD_MAXTIME=2700
-			fi
-			MAKE_TEST_BINARY=$BINDIR/nmbd
-			export MAKE_TEST_BINARY
-			timelimit $NMBD_MAXTIME $NMBD_VALGRIND $BINDIR/nmbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $NMBD_TEST_LOG 2>&1 &
-			TIMELIMIT_NMBD_PID=$!
-			MAKE_TEST_BINARY=
-			echo $TIMELIMIT_NMBD_PID > $PIDDIR/timelimit.nmbd.pid
-			wait $TIMELIMIT_NMBD_PID
-			ret=$?;
-			rm -f $SERVER_TEST_FIFO
-			if [ -n "$SOCKET_WRAPPER_DIR" -a -d "$SOCKET_WRAPPER_DIR" ]; then
-				rm -f $SOCKET_WRAPPER_DIR/*
-			fi
-			if [ x"$ret" = x"0" ];then
-				echo "nmbd exits with status $ret";
-				echo "nmbd exits with status $ret" >>$NMBD_TEST_LOG;
-			elif [ x"$ret" = x"137" ];then
-				echo "nmbd got SIGXCPU and exits with status $ret!"
-				echo "nmbd got SIGXCPU and exits with status $ret!">>$NMBD_TEST_LOG;
-			else
-				echo "nmbd failed with status $ret!"
-				echo "nmbd failed with status $ret!">>$NMBD_TEST_LOG;
-			fi
-			exit $ret;
-		) || exit $? &) 2>/dev/null || exit $?
-		echo  "DONE"
-
-		rm -f $SMBD_TEST_LOG
-		echo -n "STARTING SMBD..."
-		((
-			if test x"$SMBD_MAXTIME" = x; then
-			    SMBD_MAXTIME=2700
-			fi
-			MAKE_TEST_BINARY=$BINDIR/smbd
-			export MAKE_TEST_BINARY
-			timelimit $SMBD_MAXTIME $SMBD_VALGRIND $BINDIR/smbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $SMBD_TEST_LOG 2>&1 &
-			TIMELIMIT_SMBD_PID=$!
-			MAKE_TEST_BINARY=
-			echo $TIMELIMIT_SMBD_PID > $PIDDIR/timelimit.smbd.pid
-			wait $TIMELIMIT_SMBD_PID
-			ret=$?;
-			rm -f $SERVER_TEST_FIFO
-			if [ -n "$SOCKET_WRAPPER_DIR" -a -d "$SOCKET_WRAPPER_DIR" ]; then
-				rm -f $SOCKET_WRAPPER_DIR/*
-			fi
-			if [ x"$ret" = x"0" ];then
-				echo "smbd exits with status $ret";
-				echo "smbd exits with status $ret" >>$SMBD_TEST_LOG;
-			elif [ x"$ret" = x"137" ];then
-				echo "smbd got SIGXCPU and exits with status $ret!"
-				echo "smbd got SIGXCPU and exits with status $ret!">>$SMBD_TEST_LOG;
-			else
-				echo "smbd failed with status $ret!"
-				echo "smbd failed with status $ret!">>$SMBD_TEST_LOG;
-			fi
-			exit $ret;
-		) || exit $? &) 2>/dev/null || exit $?
-		echo  "DONE"
-	fi
-	return 0;
-}
-
-samba3_nmbd_test_log() {
-	if [ -n "$NMBD_TEST_LOG" ];then
-		if [ -r "$NMBD_TEST_LOG" ];then
-			return 0;
-		fi
-	fi
-	return 1;
-}
-
-samba3_smbd_test_log() {
-	if [ -n "$SMBD_TEST_LOG" ];then
-		if [ -r "$SMBD_TEST_LOG" ];then
-			return 0;
-		fi
-	fi
-	return 1;
-}
-
-samba3_check_only() {
-	if [ -n "$SERVER_TEST_FIFO" ];then
-		if [ -p "$SERVER_TEST_FIFO" ];then
-			return 0;
-		fi
-		return 1;
-	fi
-	return 0;
-}
-
-testit() {
-	if [ -z "$PREFIX" ]; then
-	    PREFIX=test_prefix
-	    mkdir -p $PREFIX
-	fi
+plantest() {
 	name=$1
-	shift 1
-	binary=$1
+	env=$2
+	shift 2
 	cmdline="$*"
-
-	SERVERS_ARE_UP="no"
-
-	shname=`echo $name | \
-	sed -e 's%[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\-]%_%g'`
-
-	UNIQUE_PID=`/bin/sh -c 'echo $$'`
-	TEST_LOG="$PREFIX/test_log.${UNIQUE_PID}"
-	TEST_PCAP="$PREFIX/test_${shname}_${UNIQUE_PID}.pcap"
-	trap "rm -f $TEST_LOG $TEST_PCAP" EXIT
-
-	if [ -z "$nmbd_log_size" ]; then
-		nmbd_log_size=`wc -l < $NMBD_TEST_LOG`;
-	fi
-	if [ -z "$smbd_log_size" ]; then
-		smbd_log_size=`wc -l < $SMBD_TEST_LOG`;
-	fi
-
-	if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
-		echo "--==--==--==--==--==--==--==--==--==--==--"
-		echo "Running test $name (level 0 stdout)"
-		echo "--==--==--==--==--==--==--==--==--==--==--"
-		date
-		echo "Testing $name"
-	else
-		echo "Testing $name ($failed)"
-	fi
-
-	samba3_check_only && SERVERS_ARE_UP="yes"
-	if [ x"$SERVERS_ARE_UP" != x"yes" ];then
-		if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
-			echo "SERVERS are down! Skipping: $cmdline"
-			echo "=========================================="
-			echo "TEST SKIPPED: $name (reason SERVERS are down)"
-			echo "=========================================="
-   		else
-			echo "TEST SKIPPED: $name (reason SERVERS are down)"
-		fi
-		return 1
-	fi
-
-	if [ x"$MAKE_TEST_ENABLE_PCAP" = x"yes" ];then
-		SOCKET_WRAPPER_PCAP_FILE=$TEST_PCAP
-		export SOCKET_WRAPPER_PCAP_FILE
-	fi
-
-	MAKE_TEST_BINARY=$binary
-	export MAKE_TEST_BINARY
-	( $cmdline > $TEST_LOG 2>&1 )
-	status=$?
-	MAKE_TEST_BINARY=
-	# show any additional output from smbd that has happened in this test
-	samba3_nmbd_test_log && {
-		new_log_size=`wc -l < $NMBD_TEST_LOG`;
-		test "$new_log_size" = "$nmbd_log_size" || {
-			echo "NMBD OUTPUT:";
-			incr_log_size=`expr $new_log_size - $nmbd_log_size`;
-			tail -$incr_log_size $NMBD_TEST_LOG;
-			nmbd_log_size=$new_log_size;
-		}
-	}
-	samba3_smbd_test_log && {
-		new_log_size=`wc -l < $SMBD_TEST_LOG`;
-		test "$new_log_size" = "$smbd_log_size" || {
-			echo "SMBD OUTPUT:";
-			incr_log_size=`expr $new_log_size - $smbd_log_size`;
-			tail -$incr_log_size $SMBD_TEST_LOG;
-			smbd_log_size=$new_log_size;
-		}
-	}
-
-	if [ x"$status" != x"0" ]; then
-		echo "TEST OUTPUT:"
-		cat $TEST_LOG;
-		rm -f $TEST_LOG;
-		if [ x"$MAKE_TEST_ENABLE_PCAP" = x"yes" ];then
-			echo "TEST PCAP: $TEST_PCAP"
-		fi
-		if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
-			echo "=========================================="
-			echo "TEST FAILED: $name (status $status)"
-			echo "=========================================="
-   		else
-			echo "TEST FAILED: $cmdline (status $status)"
-		fi
-		trap "" EXIT
-		return 1;
-	fi
-	rm -f $TEST_LOG;
-	if [ x"$MAKE_TEST_KEEP_PCAP" = x"yes" ];then
-		echo "TEST PCAP: $TEST_PCAP"
-	else
-		rm -f $TEST_PCAP;
-	fi
-	if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
-		echo "ALL OK: $cmdline"
-		echo "=========================================="
-		echo "TEST PASSED: $name"
-		echo "=========================================="
-	fi
-	trap "" EXIT
-	return 0;
-}
-
-testok() {
-	name=`basename $1`
-	failed=$2
-
-	if [ x"$failed" = x"0" ];then
-		:
-	else
-		echo "$failed TESTS FAILED or SKIPPED ($name)";
-	fi
-	exit $failed
+	echo "-- TEST --"
+	echo $name
+	echo $env
+	echo $cmdline
 }
 
-teststatus() {
-	name=`basename $1`
-	failed=$2
-
-	if [ x"$failed" = x"0" ];then
-		echo "TEST STATUS: $failed";
-	else
-		echo "TEST STATUS: $failed";
-	fi
-	exit $failed
-}
-
-if [ -z "$VALGRIND" ]; then
-    MALLOC_CHECK_=2
-    export MALLOC_CHECK_
-fi
-
diff --git a/source3/script/tests/test_local_s3.sh b/source3/script/tests/test_local_s3.sh
index 6117106c8a..f016e5d28f 100755
--- a/source3/script/tests/test_local_s3.sh
+++ b/source3/script/tests/test_local_s3.sh
@@ -2,25 +2,11 @@
 
 # this runs the file serving tests that are expected to pass with samba3
 
-if [ $# != 0 ]; then
-cat <<EOF
-Usage: test_local_s3.sh
-EOF
-exit 1;
-fi
-
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
-failed=0
-
-testit "talloctort" $VALGRIND $BINDIR/talloctort || \
-    failed=`expr $failed + 1`
-
-testit "replacetort" $VALGRIND $BINDIR/replacetort || \
-    failed=`expr $failed + 1`
-
-testit "tdbtorture" $VALGRIND $BINDIR/tdbtorture || \
-    failed=`expr $failed +1`
+BINDIR=$incdir/../../bin
 
-testok $0 $failed
+plantest "talloctort" none $VALGRIND $BINDIR/talloctort 
+plantest "replacetort" none $VALGRIND $BINDIR/replacetort 
+plantest "tdbtorture" none $VALGRIND $BINDIR/tdbtorture 
diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
deleted file mode 100755
index 1a4c4d11cc..0000000000
--- a/source3/script/tests/test_posix_s3.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh
-
-# this runs the file serving tests that are expected to pass with samba3
-
-if [ $# -lt 3 ]; then
-cat <<EOF
-Usage: test_posix_s3.sh UNC USERNAME PASSWORD <first> <smbtorture args>
-EOF
-exit 1;
-fi
-
-unc="$1"
-username="$2"
-password="$3"
-start="$4"
-shift 4
-ADDARGS="$*"
-
-incdir=`dirname $0`
-. $incdir/test_functions.sh
-
-base="BASE-ATTR BASE-CHARSET BASE-CHKPATH BASE-DEFER_OPEN BASE-DELAYWRITE BASE-DELETE"
-base="$base BASE-DENY1 BASE-DENY2 BASE-DENY3 BASE-DENYDOS BASE-DIR1 BASE-DIR2"
-base="$base BASE-DISCONNECT BASE-FDPASS BASE-LOCK"
-base="$base BASE-MANGLE BASE-NEGNOWAIT BASE-NTDENY1"
-base="$base BASE-NTDENY2 BASE-OPEN BASE-OPENATTR BASE-PROPERTIES BASE-RENAME BASE-RW1"
-base="$base BASE-SECLEAK BASE-TCON BASE-TCONDEV BASE-TRANS2 BASE-UNLINK BASE-VUID"
-base="$base BASE-XCOPY BASE-SAMBA3ERROR"
-
-raw="RAW-ACLS RAW-CHKPATH RAW-CLOSE RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
-raw="$raw RAW-IOCTL RAW-LOCK RAW-MKDIR RAW-MUX RAW-NOTIFY RAW-OPEN RAW-OPLOCK"
-raw="$raw RAW-QFILEINFO RAW-QFSINFO RAW-READ RAW-RENAME RAW-SEARCH RAW-SEEK"
-raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
-raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH RAW-SFILEINFO-RENAME"
-raw="$raw RAW-SAMBA3CASEINSENSITIVE RAW-SAMBA3POSIXTIMEDLOCK"
-raw="$raw RAW-SAMBA3ROOTDIRFID"
-
-rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC"
-rpc="$rpc RPC-UNIXINFO RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC"
-
-# NOTE: to enable the UNIX-WHOAMI test, we need to change the default share
-# config to allow guest access. I'm not sure whether this would break other
-# tests, so leaving it alone for now -- jpeach
-unix="UNIX-INFO2"
-
-if test x$RUN_FROM_BUILD_FARM = xyes; then
-	rpc="$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME"
-fi
-
-tests="$base $raw $rpc $unix"
-
-skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-OPENATTR BASE-TCONDEV"
-skipped="$skipped RAW-ACLS RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
-skipped="$skipped RAW-IOCTL RAW-MUX"
-skipped="$skipped RAW-QFILEINFO RAW-QFSINFO RAW-SEARCH"
-skipped="$skipped RAW-SFILEINFO RAW-STREAMS RAW-WRITE"
-
-echo "WARNING: Skipping tests $skipped"
-
-failed=0
-for t in $tests; do
-    if [ ! -z "$start" -a "$start" != $t ]; then
-	continue;
-    fi
-    skip=0
-    for s in $skipped; do
-    	if [ x"$s" = x"$t" ]; then
-    	    skip=1;
-	    break;
-	fi
-    done
-    if [ $skip = 1 ]; then
-    	continue;
-    fi
-    start=""
-    name="$t"
-    testit "$name" $VALGRIND $SMBTORTURE4 $TORTURE4_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
-done
-
-testok $0 $failed
diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh
index 3a8f3bd5b6..762b0c37a5 100755
--- a/source3/script/tests/test_smbclient_s3.sh
+++ b/source3/script/tests/test_smbclient_s3.sh
@@ -9,15 +9,29 @@ EOF
 exit 1;
 fi
 
+BINDIR=`dirname $0`/../../bin
+
 SERVER="$1"
 SERVER_IP="$2"
 SMBCLIENT="$VALGRIND ${SMBCLIENT:-$BINDIR/smbclient} $CONFIGURATION"
 
-incdir=`dirname $0`
-. $incdir/test_functions.sh
-
 failed=0
 
+testit() {
+	name="$1"
+	shift
+	cmdline="$*"
+	echo "test: $name"
+	$cmdline
+	status=$?
+	if [ x$status = x0 ]; then
+		echo "success: $name"
+	else
+		echo "failure: $name"
+	fi
+	return $status
+}
+
 # Test that a noninteractive smbclient does not prompt
 test_noninteractive_no_prompt()
 {
@@ -82,4 +96,4 @@ testit "interactive smbclient -l prompts on stdout" \
    test_interactive_prompt_stdout -l /tmp || \
     failed=`expr $failed + 1`
 
-testok $0 $failed
+exit $failed
diff --git a/source3/script/tests/test_smbtorture_s3.sh b/source3/script/tests/test_smbtorture_s3.sh
index 38ab40f09d..21c0fca445 100755
--- a/source3/script/tests/test_smbtorture_s3.sh
+++ b/source3/script/tests/test_smbtorture_s3.sh
@@ -2,23 +2,13 @@
 
 # this runs the file serving tests that are expected to pass with samba3
 
-if [ $# -lt 3 ]; then
-cat <<EOF
-Usage: test_smbtorture_s3.sh UNC USERNAME PASSWORD <first> <smbtorture args>
-EOF
-exit 1;
-fi
-
-unc="$1"
-username="$2"
-password="$3"
-start="$4"
-shift 4
 ADDARGS="$*"
 
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
+BINDIR=$incdir/../../bin
+
 tests="FDPASS LOCK1 LOCK2 LOCK3 LOCK4 LOCK5 LOCK6 LOCK7"
 tests="$tests UNLINK BROWSE ATTR TRANS2 MAXFID TORTURE "
 tests="$tests OPLOCK1 OPLOCK2 OPLOCK3"
@@ -26,22 +16,6 @@ tests="$tests DIR DIR1 TCON TCONDEV RW1 RW2 RW3"
 tests="$tests OPEN XCOPY RENAME DELETE PROPERTIES W2K"
 tests="$tests TCON2 IOCTL CHKPATH FDSESS LOCAL-SUBSTITUTE"
 
-skipped1="RANDOMIPC NEGNOWAIT NBENCH ERRMAPEXTRACT TRANS2SCAN NTTRANSSCAN"
-skipped2="DENY1 DENY2 OPENATTR CASETABLE EATEST"
-skipped3="MANGLE UTABLE PIPE_NUMBER"
-echo "Skipping the following tests:"
-echo "$skipped1"
-echo "$skipped2"
-echo "$skipped3"
-
-failed=0
 for t in $tests; do
-    if [ ! -z "$start" -a "$start" != $t ]; then
-	continue;
-    fi
-    start=""
-    name="$t"
-    testit "$name" $VALGRIND $BINDIR/smbtorture $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
+    plantest "SAMBA3-$t" dc $VALGRIND $BINDIR/smbtorture $ADDARGS //\$SERVER_IP/tmp -U"\$USERNAME"%"\$PASSWORD" $t
 done
-
-testok $0 $failed
diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index dd593899e4..d001569c08 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -1,13 +1,7 @@
+#!/bin/sh
+SCRIPTDIR=`dirname $0`
+. $SCRIPTDIR/test_functions.sh
 
-$SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?`
-$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
-$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
-
-SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
-if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
-	echo "Running Tests with Samba4's smbtorture"
-	echo $SMBTORTURE4VERSION
-	$SCRIPTDIR/test_posix_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
-else
-	echo "Skip Tests with Samba4's smbtorture"
-fi
+$SCRIPTDIR/test_local_s3.sh
+$SCRIPTDIR/test_smbtorture_s3.sh 
+plantest "smbclient" dc $SCRIPTDIR/test_smbclient_s3.sh \$SERVER \$SERVER_IP
diff --git a/source3/script/tests/tests_smbclient_s3.sh b/source3/script/tests/tests_smbclient_s3.sh
deleted file mode 100644
index d48a692d4b..0000000000
--- a/source3/script/tests/tests_smbclient_s3.sh
+++ /dev/null
@@ -1 +0,0 @@
-. $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP
-- 
cgit 


From e5a951325a6cac8567af3a66de6d2df577508ae4 Mon Sep 17 00:00:00 2001
From: "Gerald (Jerry) Carter" <jerry@samba.org>
Date: Wed, 10 Oct 2007 15:34:30 -0500
Subject: [GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test
 branch. (This used to be commit 5c6c8e1fe93f340005110a7833946191659d88ab)

---
 source3/script/tests/gdb_backtrace         |   0
 source3/script/tests/selftest.sh           |   3 -
 source3/script/tests/test_functions.sh     | 279 ++++++++++++++++++++++++++++-
 source3/script/tests/test_local_s3.sh      |  22 ++-
 source3/script/tests/test_posix_s3.sh      |  80 +++++++++
 source3/script/tests/test_smbclient_s3.sh  |  22 +--
 source3/script/tests/test_smbtorture_s3.sh |  35 +++-
 source3/script/tests/tests_all.sh          |  18 +-
 source3/script/tests/tests_smbclient_s3.sh |   1 +
 9 files changed, 418 insertions(+), 42 deletions(-)
 mode change 100755 => 100644 source3/script/tests/gdb_backtrace
 create mode 100755 source3/script/tests/test_posix_s3.sh
 create mode 100644 source3/script/tests/tests_smbclient_s3.sh

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/gdb_backtrace b/source3/script/tests/gdb_backtrace
old mode 100755
new mode 100644
diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 56b2a970e3..8de6420b10 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -139,9 +139,6 @@ cat >$SERVERCONFFILE<<EOF
 	printing = bsd
 	printcap name = /dev/null
 
-#	host msdfs = yes
-#	panic action = "/bin/sleep 90000"
-
 [tmp]
 	path = $PREFIX_ABS/tmp
 	read only = no
diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh
index 9ad1155024..1cc9ea1264 100644
--- a/source3/script/tests/test_functions.sh
+++ b/source3/script/tests/test_functions.sh
@@ -1,11 +1,276 @@
-plantest() {
+
+samba3_stop_sig_term() {
+	RET=0
+	kill -USR1 `cat $PIDDIR/timelimit.nmbd.pid` >/dev/null 2>&1 || \
+		kill -ALRM `cat $PIDDIR/timelimit.nmbd.pid` || RET=$?
+
+	kill -USR1 `cat $PIDDIR/timelimit.smbd.pid` >/dev/null 2>&1 || \
+		kill -ALRM `cat $PIDDIR/timelimit.smbd.pid` || RET=$?
+
+	return $RET;
+}
+
+samba3_stop_sig_kill() {
+	kill -ALRM `cat $PIDDIR/timelimit.nmbd.pid` >/dev/null 2>&1
+	kill -ALRM `cat $PIDDIR/timelimit.smbd.pid` >/dev/null 2>&1
+	return 0;
+}
+
+samba3_check_or_start() {
+	if [ -n "$SERVER_TEST_FIFO" ];then
+
+		trap samba3_stop_sig_kill INT QUIT
+		trap samba3_stop_sig_kill TERM
+
+		if [ -p "$SERVER_TEST_FIFO" ];then
+			return 0;
+		fi
+
+		if [ -n "$SOCKET_WRAPPER_DIR" ];then
+			if [ -d "$SOCKET_WRAPPER_DIR" ]; then
+				rm -f $SOCKET_WRAPPER_DIR/*
+			else
+				mkdir -p $SOCKET_WRAPPER_DIR
+			fi
+		fi
+
+		rm -f $SERVER_TEST_FIFO
+		mkfifo $SERVER_TEST_FIFO
+
+		rm -f $NMBD_TEST_LOG
+		echo -n "STARTING NMBD..."
+		((
+			if test x"$NMBD_MAXTIME" = x; then
+			    NMBD_MAXTIME=2700
+			fi
+			MAKE_TEST_BINARY=$BINDIR/nmbd
+			export MAKE_TEST_BINARY
+			timelimit $NMBD_MAXTIME $NMBD_VALGRIND $BINDIR/nmbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $NMBD_TEST_LOG 2>&1 &
+			TIMELIMIT_NMBD_PID=$!
+			MAKE_TEST_BINARY=
+			echo $TIMELIMIT_NMBD_PID > $PIDDIR/timelimit.nmbd.pid
+			wait $TIMELIMIT_NMBD_PID
+			ret=$?;
+			rm -f $SERVER_TEST_FIFO
+			if [ -n "$SOCKET_WRAPPER_DIR" -a -d "$SOCKET_WRAPPER_DIR" ]; then
+				rm -f $SOCKET_WRAPPER_DIR/*
+			fi
+			if [ x"$ret" = x"0" ];then
+				echo "nmbd exits with status $ret";
+				echo "nmbd exits with status $ret" >>$NMBD_TEST_LOG;
+			elif [ x"$ret" = x"137" ];then
+				echo "nmbd got SIGXCPU and exits with status $ret!"
+				echo "nmbd got SIGXCPU and exits with status $ret!">>$NMBD_TEST_LOG;
+			else
+				echo "nmbd failed with status $ret!"
+				echo "nmbd failed with status $ret!">>$NMBD_TEST_LOG;
+			fi
+			exit $ret;
+		) || exit $? &) 2>/dev/null || exit $?
+		echo  "DONE"
+
+		rm -f $SMBD_TEST_LOG
+		echo -n "STARTING SMBD..."
+		((
+			if test x"$SMBD_MAXTIME" = x; then
+			    SMBD_MAXTIME=2700
+			fi
+			MAKE_TEST_BINARY=$BINDIR/smbd
+			export MAKE_TEST_BINARY
+			timelimit $SMBD_MAXTIME $SMBD_VALGRIND $BINDIR/smbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $SMBD_TEST_LOG 2>&1 &
+			TIMELIMIT_SMBD_PID=$!
+			MAKE_TEST_BINARY=
+			echo $TIMELIMIT_SMBD_PID > $PIDDIR/timelimit.smbd.pid
+			wait $TIMELIMIT_SMBD_PID
+			ret=$?;
+			rm -f $SERVER_TEST_FIFO
+			if [ -n "$SOCKET_WRAPPER_DIR" -a -d "$SOCKET_WRAPPER_DIR" ]; then
+				rm -f $SOCKET_WRAPPER_DIR/*
+			fi
+			if [ x"$ret" = x"0" ];then
+				echo "smbd exits with status $ret";
+				echo "smbd exits with status $ret" >>$SMBD_TEST_LOG;
+			elif [ x"$ret" = x"137" ];then
+				echo "smbd got SIGXCPU and exits with status $ret!"
+				echo "smbd got SIGXCPU and exits with status $ret!">>$SMBD_TEST_LOG;
+			else
+				echo "smbd failed with status $ret!"
+				echo "smbd failed with status $ret!">>$SMBD_TEST_LOG;
+			fi
+			exit $ret;
+		) || exit $? &) 2>/dev/null || exit $?
+		echo  "DONE"
+	fi
+	return 0;
+}
+
+samba3_nmbd_test_log() {
+	if [ -n "$NMBD_TEST_LOG" ];then
+		if [ -r "$NMBD_TEST_LOG" ];then
+			return 0;
+		fi
+	fi
+	return 1;
+}
+
+samba3_smbd_test_log() {
+	if [ -n "$SMBD_TEST_LOG" ];then
+		if [ -r "$SMBD_TEST_LOG" ];then
+			return 0;
+		fi
+	fi
+	return 1;
+}
+
+samba3_check_only() {
+	if [ -n "$SERVER_TEST_FIFO" ];then
+		if [ -p "$SERVER_TEST_FIFO" ];then
+			return 0;
+		fi
+		return 1;
+	fi
+	return 0;
+}
+
+testit() {
+	if [ -z "$PREFIX" ]; then
+	    PREFIX=test_prefix
+	    mkdir -p $PREFIX
+	fi
 	name=$1
-	env=$2
-	shift 2
+	shift 1
+	binary=$1
 	cmdline="$*"
-	echo "-- TEST --"
-	echo $name
-	echo $env
-	echo $cmdline
+
+	SERVERS_ARE_UP="no"
+
+	shname=`echo $name | \
+	sed -e 's%[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\-]%_%g'`
+
+	UNIQUE_PID=`/bin/sh -c 'echo $$'`
+	TEST_LOG="$PREFIX/test_log.${UNIQUE_PID}"
+	TEST_PCAP="$PREFIX/test_${shname}_${UNIQUE_PID}.pcap"
+	trap "rm -f $TEST_LOG $TEST_PCAP" EXIT
+
+	if [ -z "$nmbd_log_size" ]; then
+		nmbd_log_size=`wc -l < $NMBD_TEST_LOG`;
+	fi
+	if [ -z "$smbd_log_size" ]; then
+		smbd_log_size=`wc -l < $SMBD_TEST_LOG`;
+	fi
+
+	if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
+		echo "--==--==--==--==--==--==--==--==--==--==--"
+		echo "Running test $name (level 0 stdout)"
+		echo "--==--==--==--==--==--==--==--==--==--==--"
+		date
+		echo "Testing $name"
+	else
+		echo "Testing $name ($failed)"
+	fi
+
+	samba3_check_only && SERVERS_ARE_UP="yes"
+	if [ x"$SERVERS_ARE_UP" != x"yes" ];then
+		if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
+			echo "SERVERS are down! Skipping: $cmdline"
+			echo "=========================================="
+			echo "TEST SKIPPED: $name (reason SERVERS are down)"
+			echo "=========================================="
+   		else
+			echo "TEST SKIPPED: $name (reason SERVERS are down)"
+		fi
+		return 1
+	fi
+
+	if [ x"$MAKE_TEST_ENABLE_PCAP" = x"yes" ];then
+		SOCKET_WRAPPER_PCAP_FILE=$TEST_PCAP
+		export SOCKET_WRAPPER_PCAP_FILE
+	fi
+
+	MAKE_TEST_BINARY=$binary
+	export MAKE_TEST_BINARY
+	( $cmdline > $TEST_LOG 2>&1 )
+	status=$?
+	MAKE_TEST_BINARY=
+	# show any additional output from smbd that has happened in this test
+	samba3_nmbd_test_log && {
+		new_log_size=`wc -l < $NMBD_TEST_LOG`;
+		test "$new_log_size" = "$nmbd_log_size" || {
+			echo "NMBD OUTPUT:";
+			incr_log_size=`expr $new_log_size - $nmbd_log_size`;
+			tail -$incr_log_size $NMBD_TEST_LOG;
+			nmbd_log_size=$new_log_size;
+		}
+	}
+	samba3_smbd_test_log && {
+		new_log_size=`wc -l < $SMBD_TEST_LOG`;
+		test "$new_log_size" = "$smbd_log_size" || {
+			echo "SMBD OUTPUT:";
+			incr_log_size=`expr $new_log_size - $smbd_log_size`;
+			tail -$incr_log_size $SMBD_TEST_LOG;
+			smbd_log_size=$new_log_size;
+		}
+	}
+
+	if [ x"$status" != x"0" ]; then
+		echo "TEST OUTPUT:"
+		cat $TEST_LOG;
+		rm -f $TEST_LOG;
+		if [ x"$MAKE_TEST_ENABLE_PCAP" = x"yes" ];then
+			echo "TEST PCAP: $TEST_PCAP"
+		fi
+		if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
+			echo "=========================================="
+			echo "TEST FAILED: $name (status $status)"
+			echo "=========================================="
+   		else
+			echo "TEST FAILED: $cmdline (status $status)"
+		fi
+		trap "" EXIT
+		return 1;
+	fi
+	rm -f $TEST_LOG;
+	if [ x"$MAKE_TEST_KEEP_PCAP" = x"yes" ];then
+		echo "TEST PCAP: $TEST_PCAP"
+	else
+		rm -f $TEST_PCAP;
+	fi
+	if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
+		echo "ALL OK: $cmdline"
+		echo "=========================================="
+		echo "TEST PASSED: $name"
+		echo "=========================================="
+	fi
+	trap "" EXIT
+	return 0;
+}
+
+testok() {
+	name=`basename $1`
+	failed=$2
+
+	if [ x"$failed" = x"0" ];then
+		:
+	else
+		echo "$failed TESTS FAILED or SKIPPED ($name)";
+	fi
+	exit $failed
 }
 
+teststatus() {
+	name=`basename $1`
+	failed=$2
+
+	if [ x"$failed" = x"0" ];then
+		echo "TEST STATUS: $failed";
+	else
+		echo "TEST STATUS: $failed";
+	fi
+	exit $failed
+}
+
+if [ -z "$VALGRIND" ]; then
+    MALLOC_CHECK_=2
+    export MALLOC_CHECK_
+fi
+
diff --git a/source3/script/tests/test_local_s3.sh b/source3/script/tests/test_local_s3.sh
index f016e5d28f..6117106c8a 100755
--- a/source3/script/tests/test_local_s3.sh
+++ b/source3/script/tests/test_local_s3.sh
@@ -2,11 +2,25 @@
 
 # this runs the file serving tests that are expected to pass with samba3
 
+if [ $# != 0 ]; then
+cat <<EOF
+Usage: test_local_s3.sh
+EOF
+exit 1;
+fi
+
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
-BINDIR=$incdir/../../bin
+failed=0
+
+testit "talloctort" $VALGRIND $BINDIR/talloctort || \
+    failed=`expr $failed + 1`
+
+testit "replacetort" $VALGRIND $BINDIR/replacetort || \
+    failed=`expr $failed + 1`
+
+testit "tdbtorture" $VALGRIND $BINDIR/tdbtorture || \
+    failed=`expr $failed +1`
 
-plantest "talloctort" none $VALGRIND $BINDIR/talloctort 
-plantest "replacetort" none $VALGRIND $BINDIR/replacetort 
-plantest "tdbtorture" none $VALGRIND $BINDIR/tdbtorture 
+testok $0 $failed
diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
new file mode 100755
index 0000000000..11c4ed7796
--- /dev/null
+++ b/source3/script/tests/test_posix_s3.sh
@@ -0,0 +1,80 @@
+#!/bin/sh
+
+# this runs the file serving tests that are expected to pass with samba3
+
+if [ $# -lt 3 ]; then
+cat <<EOF
+Usage: test_posix_s3.sh UNC USERNAME PASSWORD <first> <smbtorture args>
+EOF
+exit 1;
+fi
+
+unc="$1"
+username="$2"
+password="$3"
+start="$4"
+shift 4
+ADDARGS="$*"
+
+incdir=`dirname $0`
+. $incdir/test_functions.sh
+
+base="BASE-ATTR BASE-CHARSET BASE-CHKPATH BASE-DEFER_OPEN BASE-DELAYWRITE BASE-DELETE"
+base="$base BASE-DENY1 BASE-DENY2 BASE-DENY3 BASE-DENYDOS BASE-DIR1 BASE-DIR2"
+base="$base BASE-DISCONNECT BASE-FDPASS BASE-LOCK"
+base="$base BASE-MANGLE BASE-NEGNOWAIT BASE-NTDENY1"
+base="$base BASE-NTDENY2 BASE-OPEN BASE-OPENATTR BASE-PROPERTIES BASE-RENAME BASE-RW1"
+base="$base BASE-SECLEAK BASE-TCON BASE-TCONDEV BASE-TRANS2 BASE-UNLINK BASE-VUID"
+base="$base BASE-XCOPY BASE-SAMBA3ERROR"
+
+raw="RAW-ACLS RAW-CHKPATH RAW-CLOSE RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
+raw="$raw RAW-IOCTL RAW-LOCK RAW-MKDIR RAW-MUX RAW-NOTIFY RAW-OPEN RAW-OPLOCK"
+raw="$raw RAW-QFILEINFO RAW-QFSINFO RAW-READ RAW-RENAME RAW-SEARCH RAW-SEEK"
+raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
+raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH RAW-SFILEINFO-RENAME"
+raw="$raw RAW-SAMBA3CASEINSENSITIVE RAW-SAMBA3POSIXTIMEDLOCK"
+raw="$raw RAW-SAMBA3ROOTDIRFID"
+
+rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC"
+rpc="$rpc RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC"
+
+# NOTE: to enable the UNIX-WHOAMI test, we need to change the default share
+# config to allow guest access. I'm not sure whether this would break other
+# tests, so leaving it alone for now -- jpeach
+unix="UNIX-INFO2"
+
+if test x$RUN_FROM_BUILD_FARM = xyes; then
+	rpc="$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME"
+fi
+
+tests="$base $raw $rpc $unix"
+
+skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-OPENATTR BASE-TCONDEV"
+skipped="$skipped RAW-ACLS RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
+skipped="$skipped RAW-IOCTL RAW-MUX"
+skipped="$skipped RAW-QFILEINFO RAW-QFSINFO RAW-SEARCH"
+skipped="$skipped RAW-SFILEINFO RAW-STREAMS RAW-WRITE"
+
+echo "WARNING: Skipping tests $skipped"
+
+failed=0
+for t in $tests; do
+    if [ ! -z "$start" -a "$start" != $t ]; then
+	continue;
+    fi
+    skip=0
+    for s in $skipped; do
+    	if [ x"$s" = x"$t" ]; then
+    	    skip=1;
+	    break;
+	fi
+    done
+    if [ $skip = 1 ]; then
+    	continue;
+    fi
+    start=""
+    name="$t"
+    testit "$name" $VALGRIND $SMBTORTURE4 $TORTURE4_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
+done
+
+testok $0 $failed
diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh
index 762b0c37a5..3a8f3bd5b6 100755
--- a/source3/script/tests/test_smbclient_s3.sh
+++ b/source3/script/tests/test_smbclient_s3.sh
@@ -9,28 +9,14 @@ EOF
 exit 1;
 fi
 
-BINDIR=`dirname $0`/../../bin
-
 SERVER="$1"
 SERVER_IP="$2"
 SMBCLIENT="$VALGRIND ${SMBCLIENT:-$BINDIR/smbclient} $CONFIGURATION"
 
-failed=0
+incdir=`dirname $0`
+. $incdir/test_functions.sh
 
-testit() {
-	name="$1"
-	shift
-	cmdline="$*"
-	echo "test: $name"
-	$cmdline
-	status=$?
-	if [ x$status = x0 ]; then
-		echo "success: $name"
-	else
-		echo "failure: $name"
-	fi
-	return $status
-}
+failed=0
 
 # Test that a noninteractive smbclient does not prompt
 test_noninteractive_no_prompt()
@@ -96,4 +82,4 @@ testit "interactive smbclient -l prompts on stdout" \
    test_interactive_prompt_stdout -l /tmp || \
     failed=`expr $failed + 1`
 
-exit $failed
+testok $0 $failed
diff --git a/source3/script/tests/test_smbtorture_s3.sh b/source3/script/tests/test_smbtorture_s3.sh
index 21c0fca445..f662eacd3e 100755
--- a/source3/script/tests/test_smbtorture_s3.sh
+++ b/source3/script/tests/test_smbtorture_s3.sh
@@ -2,20 +2,47 @@
 
 # this runs the file serving tests that are expected to pass with samba3
 
+if [ $# -lt 3 ]; then
+cat <<EOF
+Usage: test_smbtorture_s3.sh UNC USERNAME PASSWORD <first> <smbtorture args>
+EOF
+exit 1;
+fi
+
+unc="$1"
+username="$2"
+password="$3"
+start="$4"
+shift 4
 ADDARGS="$*"
 
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
-BINDIR=$incdir/../../bin
-
 tests="FDPASS LOCK1 LOCK2 LOCK3 LOCK4 LOCK5 LOCK6 LOCK7"
-tests="$tests UNLINK BROWSE ATTR TRANS2 MAXFID TORTURE "
+#tests="$tests UNLINK BROWSE ATTR TRANS2 MAXFID TORTURE "
+tests="$tests UNLINK BROWSE ATTR TRANS2 TORTURE "
 tests="$tests OPLOCK1 OPLOCK2 OPLOCK3"
 tests="$tests DIR DIR1 TCON TCONDEV RW1 RW2 RW3"
 tests="$tests OPEN XCOPY RENAME DELETE PROPERTIES W2K"
 tests="$tests TCON2 IOCTL CHKPATH FDSESS LOCAL-SUBSTITUTE"
 
+skipped1="RANDOMIPC NEGNOWAIT NBENCH ERRMAPEXTRACT TRANS2SCAN NTTRANSSCAN"
+skipped2="DENY1 DENY2 OPENATTR CASETABLE EATEST"
+skipped3="MANGLE UTABLE PIPE_NUMBER"
+echo "Skipping the following tests:"
+echo "$skipped1"
+echo "$skipped2"
+echo "$skipped3"
+
+failed=0
 for t in $tests; do
-    plantest "SAMBA3-$t" dc $VALGRIND $BINDIR/smbtorture $ADDARGS //\$SERVER_IP/tmp -U"\$USERNAME"%"\$PASSWORD" $t
+    if [ ! -z "$start" -a "$start" != $t ]; then
+	continue;
+    fi
+    start=""
+    name="$t"
+    testit "$name" $VALGRIND $BINDIR/smbtorture $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
 done
+
+testok $0 $failed
diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index d001569c08..dd593899e4 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -1,7 +1,13 @@
-#!/bin/sh
-SCRIPTDIR=`dirname $0`
-. $SCRIPTDIR/test_functions.sh
 
-$SCRIPTDIR/test_local_s3.sh
-$SCRIPTDIR/test_smbtorture_s3.sh 
-plantest "smbclient" dc $SCRIPTDIR/test_smbclient_s3.sh \$SERVER \$SERVER_IP
+$SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?`
+$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
+$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
+
+SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
+if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
+	echo "Running Tests with Samba4's smbtorture"
+	echo $SMBTORTURE4VERSION
+	$SCRIPTDIR/test_posix_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
+else
+	echo "Skip Tests with Samba4's smbtorture"
+fi
diff --git a/source3/script/tests/tests_smbclient_s3.sh b/source3/script/tests/tests_smbclient_s3.sh
new file mode 100644
index 0000000000..d48a692d4b
--- /dev/null
+++ b/source3/script/tests/tests_smbclient_s3.sh
@@ -0,0 +1 @@
+. $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP
-- 
cgit 


From 801c0314b1e5a0df49846aa3c22e17aee457eabb Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 18 Oct 2007 11:03:18 +0200
Subject: make gdb_backtrace executable

metze
(This used to be commit f694df1919fe98c5efef36c867a2be6527efa6ed)
---
 source3/script/tests/gdb_backtrace | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 source3/script/tests/gdb_backtrace

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/gdb_backtrace b/source3/script/tests/gdb_backtrace
old mode 100644
new mode 100755
-- 
cgit 


From c595c8311bb77fe9c6e8a5794612735f3bbab517 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 18 Oct 2007 11:04:58 +0200
Subject: don't skip some tests which samba3 passes (at least on my laptop)

metze
(This used to be commit d70ddad2e8fc2f533fb9211223c172c25878254e)
---
 source3/script/tests/test_posix_s3.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 11c4ed7796..61205a5ec6 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -49,11 +49,11 @@ fi
 
 tests="$base $raw $rpc $unix"
 
-skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-OPENATTR BASE-TCONDEV"
+skipped="BASE-CHARSET BASE-DELAYWRITE BASE-TCONDEV"
 skipped="$skipped RAW-ACLS RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
-skipped="$skipped RAW-IOCTL RAW-MUX"
+skipped="$skipped RAW-IOCTL"
 skipped="$skipped RAW-QFILEINFO RAW-QFSINFO RAW-SEARCH"
-skipped="$skipped RAW-SFILEINFO RAW-STREAMS RAW-WRITE"
+skipped="$skipped RAW-SFILEINFO RAW-STREAMS"
 
 echo "WARNING: Skipping tests $skipped"
 
-- 
cgit 


From 8f1f2f04c796a8659d93bafadefca4a98fee00f0 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Wed, 31 Oct 2007 15:45:45 -0700
Subject: Fix some cases where file_set_dosmode was being passed False instead
 of NULL. Fix more of the notifications to be correct for Samba4 RAW-NOTIFY
 torture (we had missed one when calling set_ea_dos_attribute(). Jeremy. (This
 used to be commit 39d265375cf55eedddef2c4faa65398df73d5ed2)

---
 source3/script/tests/selftest.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 8de6420b10..30355a829d 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -139,6 +139,8 @@ cat >$SERVERCONFFILE<<EOF
 	printing = bsd
 	printcap name = /dev/null
 
+#	min receivefile size = 4000
+
 [tmp]
 	path = $PREFIX_ABS/tmp
 	read only = no
-- 
cgit 


From cfec6c3083544599a4047863e1f109ee8fb80283 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 5 Nov 2007 09:49:08 +0100
Subject: make test: activate nss_wrapper for make test

metze
(This used to be commit 02cfd283627bd8f10d7beb8d43cead35dd867346)
---
 source3/script/tests/selftest.sh | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 30355a829d..0801ec5c2c 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -30,6 +30,8 @@ export TORTURE_MAXTIME
 SERVER=localhost2
 SERVER_IP=127.0.0.2
 USERNAME=`PATH=/usr/ucb:$PATH whoami`
+USERID=`PATH=/usr/ucb:$PATH id -u`
+GROUPID=`PATH=/usr/ucb:$PATH id -g`
 PASSWORD=test
 
 SRCDIR="`dirname $0`/../.."
@@ -48,6 +50,8 @@ LOGDIR=$PREFIX_ABS/logs
 SOCKET_WRAPPER_DIR=$PREFIX/sw
 CONFIGURATION="-s $CONFFILE"
 SAMBA4CONFIGURATION="-s $SAMBA4CONFFILE"
+NSS_WRAPPER_PASSWD="$PRIVATEDIR/passwd"
+NSS_WRAPPER_GROUP="$PRIVATEDIR/group"
 
 export PREFIX PREFIX_ABS
 export CONFIGURATION CONFFILE SAMBA4CONFIGURATION SAMBA4CONFFILE
@@ -57,6 +61,7 @@ export SRCDIR SCRIPTDIR BINDIR
 export USERNAME PASSWORD
 export SMBTORTURE4
 export SERVER SERVER_IP
+export NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
 
 PATH=bin:$PATH
 export PATH
@@ -73,6 +78,15 @@ if test "x`smbd -b | grep SOCKET_WRAPPER`" = "x"; then
 	exit 1
 fi
 
+if test "x`smbd -b | grep NSS_WRAPPER`" = "x"; then
+	echo "***"
+	echo "*** You must include --enable-nss-wrapper when compiling Samba"
+	echo "*** in order to execute 'make test'.  Exiting...."
+	echo "***"
+	exit 1
+fi
+
+
 ## 
 ## create the test directory layout
 ##
@@ -128,9 +142,9 @@ cat >$SERVERCONFFILE<<EOF
 
 	passdb backend = tdbsam
 
-	; Necessary to add the build farm hacks
-	add user script = /bin/false
-	add machine script = /bin/false
+	add user script = $PERL $SRCDIR/lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_PASSWD --type passwd --action add --name %u
+	add machine script = $PERL $SRCDIR/lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_PASSWD --type passwd --action add --name %u
+	delete user script = $PERL $SRCDIR/lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_PASSWD --type passwd --action delete --name %u
 
 	kernel oplocks = no
 	kernel change notify = no
@@ -170,6 +184,17 @@ EOF
 ## create a test account
 ##
 
+cat >$NSS_WRAPPER_PASSWD<<EOF
+nobody:x:65534:65533:nobody gecos:$PREFIX_ABS:/bin/false
+$USERNAME:x:$USERID:$GROUPID:$USERNAME gecos:$PREFIX_ABS:/bin/false
+EOF
+
+cat >$NSS_WRAPPER_GROUP<<EOF
+nobody:x:65533:
+nogroup:x:65534:nobody
+$USERNAME-group:x:$GROUPID:
+EOF
+
 (echo $PASSWORD; echo $PASSWORD) | \
 	smbpasswd -c $CONFFILE -L -s -a $USERNAME >/dev/null || exit 1
 
-- 
cgit 


From f56e82ff8169fdcb2d132eef453dbf958650bf9d Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 18 Oct 2007 17:14:37 +0200
Subject: we don't have build-farm specific tests anymore

metze
(This used to be commit bb125f3e084a99125e92cc6c3aceb7f2b66db678)
---
 source3/script/tests/test_posix_s3.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 61205a5ec6..9f672897ac 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -37,16 +37,13 @@ raw="$raw RAW-SAMBA3ROOTDIRFID"
 
 rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC"
 rpc="$rpc RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC"
+rpc="$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME"
 
 # NOTE: to enable the UNIX-WHOAMI test, we need to change the default share
 # config to allow guest access. I'm not sure whether this would break other
 # tests, so leaving it alone for now -- jpeach
 unix="UNIX-INFO2"
 
-if test x$RUN_FROM_BUILD_FARM = xyes; then
-	rpc="$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME"
-fi
-
 tests="$base $raw $rpc $unix"
 
 skipped="BASE-CHARSET BASE-DELAYWRITE BASE-TCONDEV"
-- 
cgit 


From 702d227433e2f044796366cf28f5418f4b18debc Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 24 Oct 2007 13:18:42 +0200
Subject: make test: start winbindd

metze
(This used to be commit 8ad4287cca5393a7fef148365aef2e2377c29280)
---
 source3/script/tests/selftest.sh       | 14 ++++++++-
 source3/script/tests/test_functions.sh | 57 ++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 0801ec5c2c..dc9b4c2cb8 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -52,6 +52,8 @@ CONFIGURATION="-s $CONFFILE"
 SAMBA4CONFIGURATION="-s $SAMBA4CONFFILE"
 NSS_WRAPPER_PASSWD="$PRIVATEDIR/passwd"
 NSS_WRAPPER_GROUP="$PRIVATEDIR/group"
+WINBINDD_SOCKET_DIR=$PREFIX_ABS/winbindd
+WINBINDD_PRIV_PIPE_DIR=$LOCKDIR/winbindd_privileged
 
 export PREFIX PREFIX_ABS
 export CONFIGURATION CONFFILE SAMBA4CONFIGURATION SAMBA4CONFFILE
@@ -62,6 +64,7 @@ export USERNAME PASSWORD
 export SMBTORTURE4
 export SERVER SERVER_IP
 export NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
+export WINBINDD_SOCKET_DIR WINBINDD_PRIV_PIPE_DIR
 
 PATH=bin:$PATH
 export PATH
@@ -92,7 +95,10 @@ fi
 ##
 echo -n "CREATE TEST ENVIRONMENT IN '$PREFIX'"...
 /bin/rm -rf $PREFIX/*
-mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $LOCKDIR $LOGDIR $SOCKET_WRAPPER_DIR
+mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $LOCKDIR $LOGDIR
+mkdir -p $SOCKET_WRAPPER_DIR
+mkdir -p $WINBINDD_SOCKET_DIR
+chmod 755 $WINBINDD_SOCKET_DIR
 mkdir -p $PREFIX_ABS/tmp
 chmod 777 $PREFIX_ABS/tmp
 
@@ -153,6 +159,10 @@ cat >$SERVERCONFFILE<<EOF
 	printing = bsd
 	printcap name = /dev/null
 
+	winbindd:socket dir = $WINBINDD_SOCKET_DIR
+	idmap uid = 100000-200000
+	idmap gid = 100000-200000
+
 #	min receivefile size = 4000
 
 [tmp]
@@ -204,6 +214,8 @@ SERVER_TEST_FIFO="$PREFIX/server_test.fifo"
 export SERVER_TEST_FIFO
 NMBD_TEST_LOG="$PREFIX/nmbd_test.log"
 export NMBD_TEST_LOG
+WINBINDD_TEST_LOG="$PREFIX/winbindd_test.log"
+export WINBINDD_TEST_LOG
 SMBD_TEST_LOG="$PREFIX/smbd_test.log"
 export SMBD_TEST_LOG
 
diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh
index 1cc9ea1264..d707c30960 100644
--- a/source3/script/tests/test_functions.sh
+++ b/source3/script/tests/test_functions.sh
@@ -4,6 +4,9 @@ samba3_stop_sig_term() {
 	kill -USR1 `cat $PIDDIR/timelimit.nmbd.pid` >/dev/null 2>&1 || \
 		kill -ALRM `cat $PIDDIR/timelimit.nmbd.pid` || RET=$?
 
+	kill -USR1 `cat $PIDDIR/timelimit.winbindd.pid` >/dev/null 2>&1 || \
+		kill -ALRM `cat $PIDDIR/timelimit.winbindd.pid` || RET=$?
+
 	kill -USR1 `cat $PIDDIR/timelimit.smbd.pid` >/dev/null 2>&1 || \
 		kill -ALRM `cat $PIDDIR/timelimit.smbd.pid` || RET=$?
 
@@ -12,6 +15,7 @@ samba3_stop_sig_term() {
 
 samba3_stop_sig_kill() {
 	kill -ALRM `cat $PIDDIR/timelimit.nmbd.pid` >/dev/null 2>&1
+	kill -ALRM `cat $PIDDIR/timelimit.winbindd.pid` >/dev/null 2>&1
 	kill -ALRM `cat $PIDDIR/timelimit.smbd.pid` >/dev/null 2>&1
 	return 0;
 }
@@ -69,6 +73,38 @@ samba3_check_or_start() {
 		) || exit $? &) 2>/dev/null || exit $?
 		echo  "DONE"
 
+		rm -f $WINBINDD_TEST_LOG
+		echo -n "STARTING WINBINDD..."
+		((
+			if test x"$WINBINDD_MAXTIME" = x; then
+			    WINBINDD_MAXTIME=2700
+			fi
+			MAKE_TEST_BINARY=$BINDIR/winbindd
+			export MAKE_TEST_BINARY
+			timelimit $WINBINDD_MAXTIME $WINBINDD_VALGRIND $BINDIR/winbindd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $WINBINDD_TEST_LOG 2>&1 &
+			TIMELIMIT_WINBINDD_PID=$!
+			MAKE_TEST_BINARY=
+			echo $TIMELIMIT_WINBINDD_PID > $PIDDIR/timelimit.winbindd.pid
+			wait $TIMELIMIT_WINBINDD_PID
+			ret=$?;
+			rm -f $SERVER_TEST_FIFO
+			if [ -n "$SOCKET_WRAPPER_DIR" -a -d "$SOCKET_WRAPPER_DIR" ]; then
+				rm -f $SOCKET_WRAPPER_DIR/*
+			fi
+			if [ x"$ret" = x"0" ];then
+				echo "winbindd exits with status $ret";
+				echo "winbindd exits with status $ret" >>$WINBINDD_TEST_LOG;
+			elif [ x"$ret" = x"137" ];then
+				echo "winbindd got SIGXCPU and exits with status $ret!"
+				echo "winbindd got SIGXCPU and exits with status $ret!">>$WINBINDD_TEST_LOG;
+			else
+				echo "winbindd failed with status $ret!"
+				echo "winbindd failed with status $ret!">>$WINBINDD_TEST_LOG;
+			fi
+			exit $ret;
+		) || exit $? &) 2>/dev/null || exit $?
+		echo  "DONE"
+
 		rm -f $SMBD_TEST_LOG
 		echo -n "STARTING SMBD..."
 		((
@@ -113,6 +149,15 @@ samba3_nmbd_test_log() {
 	return 1;
 }
 
+samba3_winbindd_test_log() {
+	if [ -n "$WINBINDD_TEST_LOG" ];then
+		if [ -r "$WINBINDD_TEST_LOG" ];then
+			return 0;
+		fi
+	fi
+	return 1;
+}
+
 samba3_smbd_test_log() {
 	if [ -n "$SMBD_TEST_LOG" ];then
 		if [ -r "$SMBD_TEST_LOG" ];then
@@ -155,6 +200,9 @@ testit() {
 	if [ -z "$nmbd_log_size" ]; then
 		nmbd_log_size=`wc -l < $NMBD_TEST_LOG`;
 	fi
+	if [ -z "$winbindd_log_size" ]; then
+		winbindd_log_size=`wc -l < $WINBINDD_TEST_LOG`;
+	fi
 	if [ -z "$smbd_log_size" ]; then
 		smbd_log_size=`wc -l < $SMBD_TEST_LOG`;
 	fi
@@ -202,6 +250,15 @@ testit() {
 			nmbd_log_size=$new_log_size;
 		}
 	}
+	samba3_winbindd_test_log && {
+		new_log_size=`wc -l < $WINBINDD_TEST_LOG`;
+		test "$new_log_size" = "$winbindd_log_size" || {
+			echo "WINBINDD OUTPUT:";
+			incr_log_size=`expr $new_log_size - $winbindd_log_size`;
+			tail -$incr_log_size $WINBINDD_TEST_LOG;
+			winbindd_log_size=$new_log_size;
+		}
+	}
 	samba3_smbd_test_log && {
 		new_log_size=`wc -l < $SMBD_TEST_LOG`;
 		test "$new_log_size" = "$smbd_log_size" || {
-- 
cgit 


From 515eef851fa88e69f839f0c31cb9f258d3fe36d5 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 9 Nov 2007 14:35:58 +0100
Subject: make test: try to get a more portable way to get UID and GID

metze
(This used to be commit 0dc2d7ec010610c4bdab8eb6d488295a0259fbc9)
---
 source3/script/tests/selftest.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index dc9b4c2cb8..130ce339bf 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -30,8 +30,8 @@ export TORTURE_MAXTIME
 SERVER=localhost2
 SERVER_IP=127.0.0.2
 USERNAME=`PATH=/usr/ucb:$PATH whoami`
-USERID=`PATH=/usr/ucb:$PATH id -u`
-GROUPID=`PATH=/usr/ucb:$PATH id -g`
+USERID=`PATH=/usr/ucb:$PATH id | cut -d ' ' -f1 | sed -e 's/uid=\([0-9]*\).*/\1/g'`
+GROUPID=`PATH=/usr/ucb:$PATH id | cut -d ' ' -f2 | sed -e 's/gid=\([0-9]*\).*/\1/g'`
 PASSWORD=test
 
 SRCDIR="`dirname $0`/../.."
-- 
cgit 


From 9bcfb5af7dce2c2ef51b0164d87c23541fa4a222 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@sernet.de>
Date: Fri, 14 Dec 2007 16:14:32 +0100
Subject: selftest: move workgroup name into WORKGROUP envvar

metze
(This used to be commit 8ace8fa82c2ccd6fdb9ca076fb2d6fed203c8126)
---
 source3/script/tests/selftest.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 130ce339bf..6810ec1a54 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -27,6 +27,7 @@ export TORTURE_MAXTIME
 ## setup the various environment variables we need
 ##
 
+WORKGROUP=SAMBA-TEST
 SERVER=localhost2
 SERVER_IP=127.0.0.2
 USERNAME=`PATH=/usr/ucb:$PATH whoami`
@@ -62,7 +63,7 @@ export PRIVATEDIR LIBDIR PIDDIR LOCKDIR LOGDIR SERVERCONFFILE
 export SRCDIR SCRIPTDIR BINDIR
 export USERNAME PASSWORD
 export SMBTORTURE4
-export SERVER SERVER_IP
+export WORKGROUP SERVER SERVER_IP
 export NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
 export WINBINDD_SOCKET_DIR WINBINDD_PRIV_PIPE_DIR
 
@@ -107,7 +108,7 @@ chmod 777 $PREFIX_ABS/tmp
 ##
 
 cat >$COMMONCONFFILE<<EOF
-	workgroup = SAMBA-TEST
+	workgroup = $WORKGROUP
 
 	private dir = $PRIVATEDIR
 	pid directory = $PIDDIR
-- 
cgit 


From 28c7c831ed7b5ccf3567c7703964d6c1f6659d89 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 14 Dec 2007 16:54:01 +0100
Subject: selftest: add a bunch of wbinfo based tests for winbindd

metze
(This used to be commit 88b6d2c0e83f515e2f83e5b4edc0728c434c7294)
---
 source3/script/tests/test_wbinfo_s3.sh | 48 ++++++++++++++++++++++++++++++++++
 source3/script/tests/tests_all.sh      |  1 +
 2 files changed, 49 insertions(+)
 create mode 100755 source3/script/tests/test_wbinfo_s3.sh

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_wbinfo_s3.sh b/source3/script/tests/test_wbinfo_s3.sh
new file mode 100755
index 0000000000..abd6146e1a
--- /dev/null
+++ b/source3/script/tests/test_wbinfo_s3.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+if [ $# -lt 4 ]; then
+cat <<EOF
+Usage: test_wbinfo_s3.sh DOMAIN SERVER USERNAME PASSWORD <wbinfo args>
+EOF
+exit 1;
+fi
+
+domain="$1"
+server="$2"
+username="$3"
+password="$4"
+shift 4
+ADDARGS="$*"
+
+incdir=`dirname $0`
+. $incdir/test_functions.sh
+
+OLDIFS=$IFS;
+
+tests="--ping"
+tests="$tests:--separator"
+tests="$tests:--own-domain"
+tests="$tests:--all-domains"
+tests="$tests:--trusted-domains"
+tests="$tests:--domain-info=BUILTIN"
+tests="$tests:--domain-info=$server"
+tests="$tests:--sequence"
+tests="$tests:--sequence --domain=BUILTIN"
+tests="$tests:--sequence --domain=$server"
+#Didn't pass yet# tests="$tests:--domain-users"
+tests="$tests:--domain-groups"
+tests="$tests:--name-to-sid=$username"
+#Didn't pass yet# tests="$tests:--user-info=$username"
+tests="$tests:--user-groups=$username"
+
+OLDIFS=$IFS
+NEWIFS=$':'
+IFS=$NEWIFS
+for t in $tests; do
+   IFS=$OLDIFS
+   testit "wbinfo $t" $VALGRIND $BINDIR/wbinfo $ADDARGS $t || failed=`expr $failed + 1`
+   IFS=$NEWIFS
+done
+IFS=$OLDIFS
+
+testok $0 $failed
diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index dd593899e4..12789aa926 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -2,6 +2,7 @@
 $SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?`
 $SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
 $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
+$SCRIPTDIR/test_wbinfo_s3.sh $WORKGROUP $SERVER $USERNAME $PASSWORD || failed=`expr $failed + $?`
 
 SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
 if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
-- 
cgit 


From 4130053a5784122278fc02a8eb579f3cf81a1b0e Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 14 Dec 2007 18:02:05 +0100
Subject: selftest: disable wbinfo tests

wbinfo needs to take --config-file to work...

metze
(This used to be commit a8a74fc88cb6f4be1efdc1afab9b91defcd015ae)
---
 source3/script/tests/tests_all.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index 12789aa926..a110d60f98 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -2,7 +2,7 @@
 $SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?`
 $SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
 $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
-$SCRIPTDIR/test_wbinfo_s3.sh $WORKGROUP $SERVER $USERNAME $PASSWORD || failed=`expr $failed + $?`
+#$SCRIPTDIR/test_wbinfo_s3.sh $WORKGROUP $SERVER $USERNAME $PASSWORD || failed=`expr $failed + $?`
 
 SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
 if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
-- 
cgit 


From 9f2490c251991da316fb888947edf78024e5638a Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 14 Dec 2007 19:39:49 +0100
Subject: selftest: reenable wbinfo tests and pass --configfile instead of -s

metze
(This used to be commit 56251f78524416435299e26fca405e77d0f42043)
---
 source3/script/tests/selftest.sh       | 2 +-
 source3/script/tests/test_wbinfo_s3.sh | 2 +-
 source3/script/tests/tests_all.sh      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 6810ec1a54..2250a81245 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -49,7 +49,7 @@ PRIVATEDIR=$PREFIX_ABS/private
 LOCKDIR=$PREFIX_ABS/lockdir
 LOGDIR=$PREFIX_ABS/logs
 SOCKET_WRAPPER_DIR=$PREFIX/sw
-CONFIGURATION="-s $CONFFILE"
+CONFIGURATION="--configfile $CONFFILE"
 SAMBA4CONFIGURATION="-s $SAMBA4CONFFILE"
 NSS_WRAPPER_PASSWD="$PRIVATEDIR/passwd"
 NSS_WRAPPER_GROUP="$PRIVATEDIR/group"
diff --git a/source3/script/tests/test_wbinfo_s3.sh b/source3/script/tests/test_wbinfo_s3.sh
index abd6146e1a..6a8faa1f87 100755
--- a/source3/script/tests/test_wbinfo_s3.sh
+++ b/source3/script/tests/test_wbinfo_s3.sh
@@ -40,7 +40,7 @@ NEWIFS=$':'
 IFS=$NEWIFS
 for t in $tests; do
    IFS=$OLDIFS
-   testit "wbinfo $t" $VALGRIND $BINDIR/wbinfo $ADDARGS $t || failed=`expr $failed + 1`
+   testit "wbinfo $t" $VALGRIND $BINDIR/wbinfo $CONFIGURATION $ADDARGS $t || failed=`expr $failed + 1`
    IFS=$NEWIFS
 done
 IFS=$OLDIFS
diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index a110d60f98..12789aa926 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -2,7 +2,7 @@
 $SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?`
 $SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
 $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
-#$SCRIPTDIR/test_wbinfo_s3.sh $WORKGROUP $SERVER $USERNAME $PASSWORD || failed=`expr $failed + $?`
+$SCRIPTDIR/test_wbinfo_s3.sh $WORKGROUP $SERVER $USERNAME $PASSWORD || failed=`expr $failed + $?`
 
 SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
 if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
-- 
cgit 


From 98b21126a76991a011ccbfd9553e653ea6304cec Mon Sep 17 00:00:00 2001
From: "Gerald (Jerry) Carter" <jerry@samba.org>
Date: Fri, 21 Dec 2007 13:50:13 -0600
Subject: Fix "make test" using the LD_LIBRARY_PATH for selftest script so smbd
 can locate the libwbclient library (if neccessary). (This used to be commit
 481cc9ab6a6608e13710c93783ea4e62363e78be)

---
 source3/script/tests/selftest.sh | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 2250a81245..0ad0639cb9 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -70,6 +70,10 @@ export WINBINDD_SOCKET_DIR WINBINDD_PRIV_PIPE_DIR
 PATH=bin:$PATH
 export PATH
 
+LD_LIBRARY_PATH=$BINDIR
+echo "LD_LIBRRARY_PATH=$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH
+
 ##
 ## verify that we were built with --enable-socket-wrapper
 ##
-- 
cgit 


From d75d3bc021c5f9242dd786ebf1aab57aadf7df23 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sun, 23 Dec 2007 01:34:20 +0100
Subject: Fix typo in output.

Michael
(This used to be commit 2fe111c19bc827ec132365e718a2136bda57e568)
---
 source3/script/tests/selftest.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 0ad0639cb9..515c95bdbd 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -71,7 +71,7 @@ PATH=bin:$PATH
 export PATH
 
 LD_LIBRARY_PATH=$BINDIR
-echo "LD_LIBRRARY_PATH=$LD_LIBRARY_PATH"
+echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
 export LD_LIBRARY_PATH
 
 ##
-- 
cgit 


From 4c364e3078795ff38d55503c4351b2bf3bc9e6bc Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Sun, 23 Dec 2007 16:38:28 +0100
Subject: Attempt to make the build farm run s4torture again (This used to be
 commit 04710626e174d7237521f33a351b4425add063b8)

---
 source3/script/tests/selftest.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 515c95bdbd..d4264bab8c 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -70,7 +70,7 @@ export WINBINDD_SOCKET_DIR WINBINDD_PRIV_PIPE_DIR
 PATH=bin:$PATH
 export PATH
 
-LD_LIBRARY_PATH=$BINDIR
+LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"$BINDIR"
 echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
 export LD_LIBRARY_PATH
 
-- 
cgit 


From 4e53afccb1470b8d889f7300ad77a497f38ed418 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sun, 23 Dec 2007 20:09:16 +0100
Subject: selftest: also export LD_LIBRARY_PATH for samba4's smbtorture

metze
(This used to be commit f5570dcf503a4b28ebf624d06fd090f3b6b0a560)
---
 source3/script/tests/selftest.sh  | 13 +++++++++++--
 source3/script/tests/tests_all.sh |  3 +++
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index d4264bab8c..86abb15ed1 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -62,7 +62,6 @@ export PATH SOCKET_WRAPPER_DIR DOMAIN
 export PRIVATEDIR LIBDIR PIDDIR LOCKDIR LOGDIR SERVERCONFFILE
 export SRCDIR SCRIPTDIR BINDIR
 export USERNAME PASSWORD
-export SMBTORTURE4
 export WORKGROUP SERVER SERVER_IP
 export NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
 export WINBINDD_SOCKET_DIR WINBINDD_PRIV_PIPE_DIR
@@ -70,10 +69,20 @@ export WINBINDD_SOCKET_DIR WINBINDD_PRIV_PIPE_DIR
 PATH=bin:$PATH
 export PATH
 
-LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"$BINDIR"
+if test x"$LD_LIBRARY_PATH" != x""; then
+	LD_LIBRARY_PATH="$BINDIR:$LD_LIBRARY_PATH"
+else
+	LD_LIBRARY_PATH="$BINDIR"
+fi
 echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
 export LD_LIBRARY_PATH
 
+SAMBA4BINDIR=`dirname $SMBTORTURE4`
+SAMBA4SHAREDDIR="$SAMBA4BINDIR/shared"
+
+export SAMBA4SHAREDDIR
+export SMBTORTURE4
+
 ##
 ## verify that we were built with --enable-socket-wrapper
 ##
diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index 12789aa926..109e9c2920 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -4,6 +4,9 @@ $SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || fail
 $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
 $SCRIPTDIR/test_wbinfo_s3.sh $WORKGROUP $SERVER $USERNAME $PASSWORD || failed=`expr $failed + $?`
 
+LD_LIBRARY_PATH="$SAMBA4SHAREDDIR:$LD_LIBRARY_PATH"
+echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH
 SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
 if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
 	echo "Running Tests with Samba4's smbtorture"
-- 
cgit 


From 519277fcb77701f3fdb60aae79dea06d3bdbecda Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Sat, 29 Dec 2007 13:10:25 +0100
Subject: Attempt to fix the AIX make test failures

For some reason AIX does not return the sender address in the AF_UNIX recvfrom.
So the faked netbios name lookup does not work with socket wrapper, nmbd can't
know where to send the reply. This patch works around this by telling smbclient
explicitly where to connect.

If there's any AIX experts listening -- how do I get the sender address from
AF_UNIX recvfrom?

Volker
(This used to be commit 8ba3b8cf7aca657ad8426981d810c36ee6a34a2f)
---
 source3/script/tests/test_smbclient_s3.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh
index 3a8f3bd5b6..fdade5a617 100755
--- a/source3/script/tests/test_smbclient_s3.sh
+++ b/source3/script/tests/test_smbclient_s3.sh
@@ -24,7 +24,7 @@ test_noninteractive_no_prompt()
     prompt="smb"
 
     echo du | \
-	$SMBCLIENT $CONFIGURATION "$@" -U$USERNAME%$PASSWORD //$SERVER/tmp 2>&1 | \
+	$SMBCLIENT $CONFIGURATION "$@" -U$USERNAME%$PASSWORD //$SERVER/tmp -I SERVER_IP 2>&1 | \
     grep $prompt
 
     if [ $? = 0 ] ; then
@@ -48,7 +48,7 @@ quit
 EOF
 
     CLI_FORCE_INTERACTIVE=yes \
-    $SMBCLIENT $CONFIGURATION "$@" -U$USERNAME%$PASSWORD //$SERVER/tmp \
+    $SMBCLIENT $CONFIGURATION "$@" -U$USERNAME%$PASSWORD //$SERVER/tmp -I $SERVER_IP \
 	< $tmpfile 2>/dev/null | \
     grep $prompt
 
@@ -64,7 +64,7 @@ EOF
 }
 
 testit "smbclient -L $SERVER_IP" $SMBCLIENT $CONFIGURATION -L $SERVER_IP -N -p 139 || failed=`expr $failed + 1`
-testit "smbclient -L $SERVER" $SMBCLIENT $CONFIGURATION -L $SERVER -N -p 139 || failed=`expr $failed + 1`
+testit "smbclient -L $SERVER -I $SERVER_IP" $SMBCLIENT $CONFIGURATION -L $SERVER -I $SERVER_IP -N -p 139 || failed=`expr $failed + 1`
 
 testit "noninteractive smbclient does not prompt" \
     test_noninteractive_no_prompt || \
-- 
cgit 


From 95fa10d596199c1449ee17b5199c93702c017a6f Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 4 Jan 2008 16:09:48 -0800
Subject: Added -e tests for S3 smbtorture. Jeremy. (This used to be commit
 deeeae3ee96f7207a49e1edaa876410b77c33458)

---
 source3/script/tests/test_smbtorture_s3.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_smbtorture_s3.sh b/source3/script/tests/test_smbtorture_s3.sh
index f662eacd3e..e655381160 100755
--- a/source3/script/tests/test_smbtorture_s3.sh
+++ b/source3/script/tests/test_smbtorture_s3.sh
@@ -43,6 +43,8 @@ for t in $tests; do
     start=""
     name="$t"
     testit "$name" $VALGRIND $BINDIR/smbtorture $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
+    echo "testing encrypted connection"
+    testit "$name" $VALGRIND $BINDIR/smbtorture $ADDARGS $unc -U"$username"%"$password" -e $t || failed=`expr $failed + 1`
 done
 
 testok $0 $failed
-- 
cgit 


From c513ff3675bd38bf3e879ea862e82c7181538961 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 4 Jan 2008 16:58:23 -0800
Subject: Better way of testing enc. Jeremy. (This used to be commit
 c5800235018330f0c1bbe307cd733597ac9b6686)

---
 source3/script/tests/test_smbclient_s3.sh  | 8 +++++---
 source3/script/tests/test_smbtorture_s3.sh | 4 +---
 source3/script/tests/tests_all.sh          | 4 ++++
 3 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh
index fdade5a617..8bf9cd1ec4 100755
--- a/source3/script/tests/test_smbclient_s3.sh
+++ b/source3/script/tests/test_smbclient_s3.sh
@@ -2,7 +2,7 @@
 
 # this runs the file serving tests that are expected to pass with samba3
 
-if [ $# != 2 ]; then
+if [ $# -lt 2 ]; then
 cat <<EOF
 Usage: test_smbclient_s3.sh SERVER SERVER_IP
 EOF
@@ -12,6 +12,8 @@ fi
 SERVER="$1"
 SERVER_IP="$2"
 SMBCLIENT="$VALGRIND ${SMBCLIENT:-$BINDIR/smbclient} $CONFIGURATION"
+shift 3
+ADDARGS="$*"
 
 incdir=`dirname $0`
 . $incdir/test_functions.sh
@@ -24,7 +26,7 @@ test_noninteractive_no_prompt()
     prompt="smb"
 
     echo du | \
-	$SMBCLIENT $CONFIGURATION "$@" -U$USERNAME%$PASSWORD //$SERVER/tmp -I SERVER_IP 2>&1 | \
+	$SMBCLIENT $CONFIGURATION "$@" -U$USERNAME%$PASSWORD //$SERVER/tmp -I SERVER_IP $ADDARGS 2>&1 | \
     grep $prompt
 
     if [ $? = 0 ] ; then
@@ -49,7 +51,7 @@ EOF
 
     CLI_FORCE_INTERACTIVE=yes \
     $SMBCLIENT $CONFIGURATION "$@" -U$USERNAME%$PASSWORD //$SERVER/tmp -I $SERVER_IP \
-	< $tmpfile 2>/dev/null | \
+	$ADDARGS < $tmpfile 2>/dev/null | \
     grep $prompt
 
     if [ $? = 0 ] ; then
diff --git a/source3/script/tests/test_smbtorture_s3.sh b/source3/script/tests/test_smbtorture_s3.sh
index e655381160..acb641b9fb 100755
--- a/source3/script/tests/test_smbtorture_s3.sh
+++ b/source3/script/tests/test_smbtorture_s3.sh
@@ -42,9 +42,7 @@ for t in $tests; do
     fi
     start=""
     name="$t"
-    testit "$name" $VALGRIND $BINDIR/smbtorture $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
-    echo "testing encrypted connection"
-    testit "$name" $VALGRIND $BINDIR/smbtorture $ADDARGS $unc -U"$username"%"$password" -e $t || failed=`expr $failed + 1`
+    testit "$name" $VALGRIND $BINDIR/smbtorture $unc -U"$username"%"$password" $ADDARGS $t || failed=`expr $failed + 1`
 done
 
 testok $0 $failed
diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index 109e9c2920..c9fd748296 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -1,7 +1,11 @@
 
 $SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?`
 $SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
+echo testing encrypted
+$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" -e || failed=`expr $failed + $?`
 $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
+echo testing encrypted
+$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP -e || failed=`expr $failed + $?`
 $SCRIPTDIR/test_wbinfo_s3.sh $WORKGROUP $SERVER $USERNAME $PASSWORD || failed=`expr $failed + $?`
 
 LD_LIBRARY_PATH="$SAMBA4SHAREDDIR:$LD_LIBRARY_PATH"
-- 
cgit 


From ceba96c9151e211355186cf7ffea7318394c0365 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 4 Jan 2008 19:09:46 -0800
Subject: Try and fix the buildfarm. There's a scripting error and I'm hoping
 this is it... Jeremy. (This used to be commit
 0356f0efc4a18230ce7a9c0a17dc98c4242ad38d)

---
 source3/script/tests/test_smbclient_s3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh
index 8bf9cd1ec4..c10aed0ee6 100755
--- a/source3/script/tests/test_smbclient_s3.sh
+++ b/source3/script/tests/test_smbclient_s3.sh
@@ -12,7 +12,7 @@ fi
 SERVER="$1"
 SERVER_IP="$2"
 SMBCLIENT="$VALGRIND ${SMBCLIENT:-$BINDIR/smbclient} $CONFIGURATION"
-shift 3
+shift 2
 ADDARGS="$*"
 
 incdir=`dirname $0`
-- 
cgit 


From 4a95b17fd8739f3c82a17ac9cd65c0d84a0e9d63 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 4 Jan 2008 19:12:29 -0800
Subject: Try and fix scripting errors. Jeremy (This used to be commit
 c84f2234fe0068a69fefa3c3ec219d4a95479b0c)

---
 source3/script/tests/tests_all.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index c9fd748296..e9a88ce125 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -1,11 +1,11 @@
 
 $SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?`
 $SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
-echo testing encrypted
-$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" -e || failed=`expr $failed + $?`
+echo "Desting encrypted"
+$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" "-e" || failed=`expr $failed + $?`
 $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
-echo testing encrypted
-$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP -e || failed=`expr $failed + $?`
+echo "Testing encrypted"
+$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP "-e" || failed=`expr $failed + $?`
 $SCRIPTDIR/test_wbinfo_s3.sh $WORKGROUP $SERVER $USERNAME $PASSWORD || failed=`expr $failed + $?`
 
 LD_LIBRARY_PATH="$SAMBA4SHAREDDIR:$LD_LIBRARY_PATH"
-- 
cgit 


From e86fd65dcdcbff1e5fe6c3f87bd0fb44b63fa233 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 4 Jan 2008 19:34:43 -0800
Subject: "Desting" -> "Testing" Jeremy. (This used to be commit
 c3f3ec5cd5f9ffe8d08356dfd22b1cb6943829ad)

---
 source3/script/tests/tests_all.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index e9a88ce125..2edc025017 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -1,7 +1,7 @@
 
 $SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?`
 $SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
-echo "Desting encrypted"
+echo "Testing encrypted"
 $SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" "-e" || failed=`expr $failed + $?`
 $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
 echo "Testing encrypted"
-- 
cgit 


From 1f46aac357b986405215ea7cbf9a1c971a2482d0 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 6 Jan 2008 01:12:56 +0100
Subject: Use metze's approach. (This used to be commit
 126cc075995ffaeb65317627acae05c1b96cebd0)

---
 source3/script/tests/tests_all.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index 2edc025017..3871b33944 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -1,4 +1,3 @@
-
 $SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?`
 $SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
 echo "Testing encrypted"
@@ -8,9 +7,8 @@ echo "Testing encrypted"
 $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP "-e" || failed=`expr $failed + $?`
 $SCRIPTDIR/test_wbinfo_s3.sh $WORKGROUP $SERVER $USERNAME $PASSWORD || failed=`expr $failed + $?`
 
-LD_LIBRARY_PATH="$SAMBA4SHAREDDIR:$LD_LIBRARY_PATH"
-echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
-export LD_LIBRARY_PATH
+eval "$LIB_PATH_VAR="\$SAMBA4SHAREDDIR:\$LIB_PATH_VAR"; export $LIB_PATH_VAR"
+echo "$LIB_PATH_VAR=$LD_LIBRARY_PATH"
 SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
 if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
 	echo "Running Tests with Samba4's smbtorture"
@@ -19,3 +17,4 @@ if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
 else
 	echo "Skip Tests with Samba4's smbtorture"
 fi
+
-- 
cgit 


From 8dbeca6e9d06d573adebe8d9c5114b24d8782e43 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 6 Jan 2008 15:12:24 +0100
Subject: Review feedback from metze. (This used to be commit
 015cf6b6adfa87ff7c5bb1cec9f98237bad075e1)

---
 source3/script/tests/tests_all.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index 3871b33944..259e28e6e7 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -7,8 +7,8 @@ echo "Testing encrypted"
 $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP "-e" || failed=`expr $failed + $?`
 $SCRIPTDIR/test_wbinfo_s3.sh $WORKGROUP $SERVER $USERNAME $PASSWORD || failed=`expr $failed + $?`
 
-eval "$LIB_PATH_VAR="\$SAMBA4SHAREDDIR:\$LIB_PATH_VAR"; export $LIB_PATH_VAR"
-echo "$LIB_PATH_VAR=$LD_LIBRARY_PATH"
+eval "$LIB_PATH_VAR="\$SAMBA4SHAREDDIR:\$$LIB_PATH_VAR"; export $LIB_PATH_VAR"
+eval echo "$LIB_PATH_VAR=\$$LIB_PATH_VAR"
 SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
 if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
 	echo "Running Tests with Samba4's smbtorture"
@@ -17,4 +17,3 @@ if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
 else
 	echo "Skip Tests with Samba4's smbtorture"
 fi
-
-- 
cgit 


From 971abee49014c78fc5990225a130e1671ed776fd Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sun, 13 Jan 2008 23:54:48 +0100
Subject: Fix a syntax error in script/tests/test_local_s3.sh .

This will reveal the currently breaking tdbtorture to the build farm...

Michael
(This used to be commit 50f65c3c5500da8d657d5fc340e666ee8cfe148e)
---
 source3/script/tests/test_local_s3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_local_s3.sh b/source3/script/tests/test_local_s3.sh
index 6117106c8a..fd8f98ccab 100755
--- a/source3/script/tests/test_local_s3.sh
+++ b/source3/script/tests/test_local_s3.sh
@@ -21,6 +21,6 @@ testit "replacetort" $VALGRIND $BINDIR/replacetort || \
     failed=`expr $failed + 1`
 
 testit "tdbtorture" $VALGRIND $BINDIR/tdbtorture || \
-    failed=`expr $failed +1`
+    failed=`expr $failed + 1`
 
 testok $0 $failed
-- 
cgit 


From 8a76e6aff0bea259f4233f914c5987bb290e3b9e Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 14 Jan 2008 00:23:11 +0100
Subject: Reset the failed counter in test_wbinfo_s3.sh.

Michael
(This used to be commit 3eedb8928413da102446b76aa64d1feaecb95b52)
---
 source3/script/tests/test_wbinfo_s3.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_wbinfo_s3.sh b/source3/script/tests/test_wbinfo_s3.sh
index 6a8faa1f87..01eed6ead6 100755
--- a/source3/script/tests/test_wbinfo_s3.sh
+++ b/source3/script/tests/test_wbinfo_s3.sh
@@ -35,6 +35,8 @@ tests="$tests:--name-to-sid=$username"
 #Didn't pass yet# tests="$tests:--user-info=$username"
 tests="$tests:--user-groups=$username"
 
+failed=0
+
 OLDIFS=$IFS
 NEWIFS=$':'
 IFS=$NEWIFS
-- 
cgit 


From 57cc992e0f9a5d729ecf3c8effc862542ef7a84e Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@sernet.de>
Date: Mon, 22 Oct 2007 18:14:57 +0200
Subject: Implement vfs_ea_tdb

This is an option for file systems that do not implement xattrs: in
lockdir/eas.tdb an array of xatts per inode is stored.

It can not solve the problem that xattrs might reappear if a posix-level
process deletes a file and happens to re-create it under the same name. On file
systems with birthtime we might have a chance to detect this, but not with
standard posix. A future version might put relief on file systems that do have
xattrs but where these are severely limited in size/speed/whatever: We can put
a simple marker as a native xattr, but the xattrs proper are stored in the tdb.

Volker
(This used to be commit 2036b4c5ad677b8a477b34b0f076febab0abff5e)
---
 source3/script/tests/selftest.sh      | 1 +
 source3/script/tests/test_posix_s3.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 86abb15ed1..08bfdf601c 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -186,6 +186,7 @@ cat >$SERVERCONFFILE<<EOF
 	map hidden = yes
 	map system = yes
 	create mask = 755
+	vfs objects = $BINDIR/ea_tdb.so
 [hideunread]
 	copy = tmp
 	hide unreadable = yes
diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 9f672897ac..0b4a52d4b5 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -47,7 +47,7 @@ unix="UNIX-INFO2"
 tests="$base $raw $rpc $unix"
 
 skipped="BASE-CHARSET BASE-DELAYWRITE BASE-TCONDEV"
-skipped="$skipped RAW-ACLS RAW-COMPOSITE RAW-CONTEXT RAW-EAS"
+skipped="$skipped RAW-ACLS RAW-COMPOSITE RAW-CONTEXT"
 skipped="$skipped RAW-IOCTL"
 skipped="$skipped RAW-QFILEINFO RAW-QFSINFO RAW-SEARCH"
 skipped="$skipped RAW-SFILEINFO RAW-STREAMS"
-- 
cgit 


From c2acec43aed4fe9cca51a4227457accafeeb950b Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Tue, 15 Jan 2008 17:03:17 +0100
Subject: rename vfs_ea_tdb to vfs_xattr_tdb (This used to be commit
 151b42a150a17f566e7b4055bbdbc0564a3c106d)

---
 source3/script/tests/selftest.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 08bfdf601c..5a170b2117 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -186,7 +186,7 @@ cat >$SERVERCONFFILE<<EOF
 	map hidden = yes
 	map system = yes
 	create mask = 755
-	vfs objects = $BINDIR/ea_tdb.so
+	vfs objects = $BINDIR/xattr_tdb.so
 [hideunread]
 	copy = tmp
 	hide unreadable = yes
-- 
cgit 


From 152c720ddbff3566d64d7e09561354820ff840c9 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Sun, 20 Jan 2008 14:10:51 +0100
Subject: Active RAW-STREAMS in make test (This used to be commit
 63ee2ef775b48fcaecccf4dc7ef3601ceb8053c5)

---
 source3/script/tests/selftest.sh      | 2 +-
 source3/script/tests/test_posix_s3.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 5a170b2117..c6232cf301 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -186,7 +186,7 @@ cat >$SERVERCONFFILE<<EOF
 	map hidden = yes
 	map system = yes
 	create mask = 755
-	vfs objects = $BINDIR/xattr_tdb.so
+	vfs objects = $BINDIR/xattr_tdb.so $BINDIR/streams_xattr.so
 [hideunread]
 	copy = tmp
 	hide unreadable = yes
diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 0b4a52d4b5..91863b7a6b 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -50,7 +50,7 @@ skipped="BASE-CHARSET BASE-DELAYWRITE BASE-TCONDEV"
 skipped="$skipped RAW-ACLS RAW-COMPOSITE RAW-CONTEXT"
 skipped="$skipped RAW-IOCTL"
 skipped="$skipped RAW-QFILEINFO RAW-QFSINFO RAW-SEARCH"
-skipped="$skipped RAW-SFILEINFO RAW-STREAMS"
+skipped="$skipped RAW-SFILEINFO"
 
 echo "WARNING: Skipping tests $skipped"
 
-- 
cgit 


From a626fa59cc1df3e154c062c433f3c1e1d6f87029 Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Mon, 28 Jan 2008 11:28:38 +0100
Subject: ntlm_auth: Add a blackbox test. (This used to be commit
 f02b74fc067074d8e48e186a7b7255a244592f7d)

---
 source3/script/tests/test_ntlm_auth_s3.sh | 21 +++++++++++++++++++++
 source3/script/tests/tests_all.sh         |  1 +
 2 files changed, 22 insertions(+)
 create mode 100755 source3/script/tests/test_ntlm_auth_s3.sh

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_ntlm_auth_s3.sh b/source3/script/tests/test_ntlm_auth_s3.sh
new file mode 100755
index 0000000000..8568da97e4
--- /dev/null
+++ b/source3/script/tests/test_ntlm_auth_s3.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+incdir=`dirname $0`
+. $incdir/test_functions.sh
+
+failed=0
+
+(/usr/bin/env python --version > /dev/null 2&>1)
+
+if $? -ne 0:
+then
+	echo "Python binary not found in path. Skipping ntlm_auth tests."
+	exit 0
+fi
+
+testit "ntlm_auth" $VALGRIND $SRCDIR/torture/test_ntlm_auth.py $BINDIR/ntlm_auth || failed=`expr $failed + 1`
+# This should work even with NTLMv2
+testit "ntlm_auth" $VALGRIND $SRCDIR/torture/test_ntlm_auth.py $BINDIR/ntlm_auth --client-domain=fOo --server-domain=fOo || failed=`expr $failed + 1`
+
+
+testok $0 $failed
diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index 259e28e6e7..369cf3ebe3 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -6,6 +6,7 @@ $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
 echo "Testing encrypted"
 $SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP "-e" || failed=`expr $failed + $?`
 $SCRIPTDIR/test_wbinfo_s3.sh $WORKGROUP $SERVER $USERNAME $PASSWORD || failed=`expr $failed + $?`
+$SCRIPTDIR/test_ntlm_auth_s3.sh || failed=`expr $failed + $?`
 
 eval "$LIB_PATH_VAR="\$SAMBA4SHAREDDIR:\$$LIB_PATH_VAR"; export $LIB_PATH_VAR"
 eval echo "$LIB_PATH_VAR=\$$LIB_PATH_VAR"
-- 
cgit 


From 582e224af5e55909e4dfd4051f2e5b5011ec14e1 Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Wed, 30 Jan 2008 16:59:40 +0100
Subject: ntlm_auth: Fix typos in the torture test script.

This should fix the build farm. Sorry, wonder why it worked on my box
before.
(This used to be commit bfa919cde57a26cd2ae7397281923792b7afe83a)
---
 source3/script/tests/test_ntlm_auth_s3.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_ntlm_auth_s3.sh b/source3/script/tests/test_ntlm_auth_s3.sh
index 8568da97e4..6a52e59771 100755
--- a/source3/script/tests/test_ntlm_auth_s3.sh
+++ b/source3/script/tests/test_ntlm_auth_s3.sh
@@ -5,9 +5,9 @@ incdir=`dirname $0`
 
 failed=0
 
-(/usr/bin/env python --version > /dev/null 2&>1)
+(/usr/bin/env python --version > /dev/null 2>&1)
 
-if $? -ne 0:
+if test $? -ne 0;
 then
 	echo "Python binary not found in path. Skipping ntlm_auth tests."
 	exit 0
-- 
cgit 


From 5b5d56d84af1657b1aec29c134af5ad6be4348eb Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Wed, 30 Jan 2008 17:57:32 +0100
Subject: ntlm_auth: test should honour configfile option to run on build farm.
 (This used to be commit 11c9c1536b153047ba387b9804f34a6555a5ae26)

---
 source3/script/tests/test_ntlm_auth_s3.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_ntlm_auth_s3.sh b/source3/script/tests/test_ntlm_auth_s3.sh
index 6a52e59771..6bcb3e2066 100755
--- a/source3/script/tests/test_ntlm_auth_s3.sh
+++ b/source3/script/tests/test_ntlm_auth_s3.sh
@@ -13,9 +13,9 @@ then
 	exit 0
 fi
 
-testit "ntlm_auth" $VALGRIND $SRCDIR/torture/test_ntlm_auth.py $BINDIR/ntlm_auth || failed=`expr $failed + 1`
+testit "ntlm_auth" $VALGRIND $SRCDIR/torture/test_ntlm_auth.py $BINDIR/ntlm_auth --configfile $CONFFILE || failed=`expr $failed + 1`
 # This should work even with NTLMv2
-testit "ntlm_auth" $VALGRIND $SRCDIR/torture/test_ntlm_auth.py $BINDIR/ntlm_auth --client-domain=fOo --server-domain=fOo || failed=`expr $failed + 1`
+testit "ntlm_auth" $VALGRIND $SRCDIR/torture/test_ntlm_auth.py $BINDIR/ntlm_auth --configfile $CONFFILE --client-domain=fOo --server-domain=fOo || failed=`expr $failed + 1`
 
 
 testok $0 $failed
-- 
cgit 


From afaacdeb8d98420fafd6c2ae428e404e60b239f2 Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Wed, 30 Jan 2008 18:34:24 +0100
Subject: ntlm_auth: Fix another typo in the test.

This _should_ be the last one.
(This used to be commit d12c49e60f4390707c924b9e9f12fa9333b006e2)
---
 source3/script/tests/test_ntlm_auth_s3.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_ntlm_auth_s3.sh b/source3/script/tests/test_ntlm_auth_s3.sh
index 6bcb3e2066..6c97f2e650 100755
--- a/source3/script/tests/test_ntlm_auth_s3.sh
+++ b/source3/script/tests/test_ntlm_auth_s3.sh
@@ -13,9 +13,9 @@ then
 	exit 0
 fi
 
-testit "ntlm_auth" $VALGRIND $SRCDIR/torture/test_ntlm_auth.py $BINDIR/ntlm_auth --configfile $CONFFILE || failed=`expr $failed + 1`
+testit "ntlm_auth" $VALGRIND $SRCDIR/torture/test_ntlm_auth.py $BINDIR/ntlm_auth --configfile=$CONFFILE || failed=`expr $failed + 1`
 # This should work even with NTLMv2
-testit "ntlm_auth" $VALGRIND $SRCDIR/torture/test_ntlm_auth.py $BINDIR/ntlm_auth --configfile $CONFFILE --client-domain=fOo --server-domain=fOo || failed=`expr $failed + 1`
+testit "ntlm_auth" $VALGRIND $SRCDIR/torture/test_ntlm_auth.py $BINDIR/ntlm_auth --configfile=$CONFFILE --client-domain=fOo --server-domain=fOo || failed=`expr $failed + 1`
 
 
 testok $0 $failed
-- 
cgit 


From 1f635e3888d51641a414f84f7402f249de287a74 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 25 Feb 2008 11:34:44 +0100
Subject: make test: pass --option=torture:sharedelay=100000 to samba4
 smbtorture

BASE-DEFER_OPEN is now more strict with incorrect timing

metze
(This used to be commit 9b761062df80c45bf2b76af071131d0c78e94a09)
---
 source3/script/tests/test_posix_s3.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 91863b7a6b..7b4c0224ba 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -54,6 +54,8 @@ skipped="$skipped RAW-SFILEINFO"
 
 echo "WARNING: Skipping tests $skipped"
 
+ADDARGS="$ADDARGS --option=torture:sharedelay=100000"
+
 failed=0
 for t in $tests; do
     if [ ! -z "$start" -a "$start" != $t ]; then
-- 
cgit 


From aa4213bde782879dbe87460d86e09f1ff09df767 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Thu, 6 Mar 2008 09:25:38 +0100
Subject: Test: Properly track current test binary for tracking crashes.

Make sure the panic action always has the right test binary set.

Michael
(This used to be commit 567ac329dcec6fc839d6b25cbf1872f1f51ff7e5)
---
 source3/script/tests/selftest.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index c6232cf301..2f2cb7b086 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -220,11 +220,16 @@ nogroup:x:65534:nobody
 $USERNAME-group:x:$GROUPID:
 EOF
 
+MAKE_TEST_BINARY="bin/smbpasswd"
+export MAKE_TEST_BINARY
+
 (echo $PASSWORD; echo $PASSWORD) | \
-	smbpasswd -c $CONFFILE -L -s -a $USERNAME >/dev/null || exit 1
+	bin/smbpasswd -c $CONFFILE -L -s -a $USERNAME >/dev/null || exit 1
 
 echo "DONE";
 
+MAKE_TEST_BINARY=""
+
 SERVER_TEST_FIFO="$PREFIX/server_test.fifo"
 export SERVER_TEST_FIFO
 NMBD_TEST_LOG="$PREFIX/nmbd_test.log"
@@ -234,9 +239,6 @@ export WINBINDD_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
@@ -272,6 +274,7 @@ START=`date`
  echo "delaying for nbt name registration"
  sleep 10
  # This will return quickly when things are up, but be slow if we need to wait for (eg) SSL init 
+ MAKE_TEST_BINARY="bin/nmblookup"
  bin/nmblookup $CONFIGURATION -U $SERVER_IP __SAMBA__
  bin/nmblookup $CONFIGURATION __SAMBA__
  bin/nmblookup $CONFIGURATION -U 127.255.255.255 __SAMBA__
@@ -279,8 +282,10 @@ START=`date`
  bin/nmblookup $CONFIGURATION $SERVER
  # make sure smbd is also up set
  echo "wait for smbd"
+ MAKE_TEST_BINARY="bin/smbclient"
  bin/smbclient $CONFIGURATION -L $SERVER_IP -U% -p 139 | head -2
  bin/smbclient $CONFIGURATION -L $SERVER_IP -U% -p 139 | head -2
+ MAKE_TEST_BINARY=""
 
  failed=0
 
-- 
cgit 


From 5d3a31fbe1e9ebb56829eab10066a90e76f88168 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 11 Mar 2008 22:06:09 +0100
Subject: selftest: samba3 passes RAW-SEARCH now

As the resume key tests are skipped against samba3.

metze
(This used to be commit c765090871ed68a9ba650bca44f5f3b88997ea14)
---
 source3/script/tests/test_posix_s3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 7b4c0224ba..a40a0418eb 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -49,7 +49,7 @@ tests="$base $raw $rpc $unix"
 skipped="BASE-CHARSET BASE-DELAYWRITE BASE-TCONDEV"
 skipped="$skipped RAW-ACLS RAW-COMPOSITE RAW-CONTEXT"
 skipped="$skipped RAW-IOCTL"
-skipped="$skipped RAW-QFILEINFO RAW-QFSINFO RAW-SEARCH"
+skipped="$skipped RAW-QFILEINFO RAW-QFSINFO"
 skipped="$skipped RAW-SFILEINFO"
 
 echo "WARNING: Skipping tests $skipped"
-- 
cgit 


From e3aef196e44846ab8f8c34932eb6cc3037809d76 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 31 Mar 2008 13:20:08 +0200
Subject: test: in tests_all.sh, wrap calls to test scripts into shell
 functions.

This is in preparation for enabling running only selected test scripts
through "make test".

Michael
(This used to be commit ad1fbadf81c915425301ec495744c11f3103169f)
---
 source3/script/tests/tests_all.sh | 83 +++++++++++++++++++++++++++++----------
 1 file changed, 63 insertions(+), 20 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index 369cf3ebe3..6153b6d3a8 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -1,20 +1,63 @@
-$SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?`
-$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
-echo "Testing encrypted"
-$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" "-e" || failed=`expr $failed + $?`
-$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?`
-echo "Testing encrypted"
-$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP "-e" || failed=`expr $failed + $?`
-$SCRIPTDIR/test_wbinfo_s3.sh $WORKGROUP $SERVER $USERNAME $PASSWORD || failed=`expr $failed + $?`
-$SCRIPTDIR/test_ntlm_auth_s3.sh || failed=`expr $failed + $?`
-
-eval "$LIB_PATH_VAR="\$SAMBA4SHAREDDIR:\$$LIB_PATH_VAR"; export $LIB_PATH_VAR"
-eval echo "$LIB_PATH_VAR=\$$LIB_PATH_VAR"
-SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
-if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
-	echo "Running Tests with Samba4's smbtorture"
-	echo $SMBTORTURE4VERSION
-	$SCRIPTDIR/test_posix_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?`
-else
-	echo "Skip Tests with Samba4's smbtorture"
-fi
+local_s3() {
+	$SCRIPTDIR/test_local_s3.sh \
+	|| failed=`expr $failed + $?`
+}
+
+smbtorture_s3() {
+	$SCRIPTDIR/test_smbtorture_s3.sh \
+		//$SERVER_IP/tmp $USERNAME $PASSWORD "" \
+	|| failed=`expr $failed + $?`
+}
+
+smbtorture_s3_encrypted() {
+	echo "Testing encrypted"
+	$SCRIPTDIR/test_smbtorture_s3.sh \
+		//$SERVER_IP/tmp $USERNAME $PASSWORD "" "-e" \
+	|| failed=`expr $failed + $?`
+}
+
+smbclient_s3() {
+	$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP \
+	|| failed=`expr $failed + $?`
+}
+
+smbclient_s3_encrypted() {
+	echo "Testing encrypted"
+	$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP "-e" \
+	|| failed=`expr $failed + $?`
+}
+
+wbinfo_s3() {
+	$SCRIPTDIR/test_wbinfo_s3.sh $WORKGROUP $SERVER $USERNAME $PASSWORD \
+	|| failed=`expr $failed + $?`
+}
+
+ntlm_auth_s3() {
+	$SCRIPTDIR/test_ntlm_auth_s3.sh \
+	|| failed=`expr $failed + $?`
+}
+
+posix_s3() {
+	eval "$LIB_PATH_VAR="\$SAMBA4SHAREDDIR:\$$LIB_PATH_VAR"; export $LIB_PATH_VAR"
+	eval echo "$LIB_PATH_VAR=\$$LIB_PATH_VAR"
+	SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
+	if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
+		echo "Running Tests with Samba4's smbtorture"
+		echo $SMBTORTURE4VERSION
+		$SCRIPTDIR/test_posix_s3.sh \
+			//$SERVER_IP/tmp $USERNAME $PASSWORD "" \
+		|| failed=`expr $failed + $?`
+	else
+		echo "Skip Tests with Samba4's smbtorture"
+	fi
+}
+
+local_s3
+smbtorture_s3
+smbtorture_s3_encrypted
+smbclient_s3
+smbclient_s3_encrypted
+wbinfo_s3
+ntlm_auth_s3
+posix_s3
+
-- 
cgit 


From 0c3b8e2cab3eecd31d73022d52ab918f68b82131 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 31 Mar 2008 13:33:12 +0200
Subject: test: add possibility to select tests to run via tests_all.sh (make
 test)

This allows to select the tests to run with tests_all.sh by setting
the environment variable "RUNTESTS". Example:

RUNTESTS="smbclient_s3_encrypted wbinfo_s3" make test

Michael
(This used to be commit bf4af79f050cceb6611a8aa3d893b59b816a41ce)
---
 source3/script/tests/tests_all.sh | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index 6153b6d3a8..c2534679d7 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -52,12 +52,18 @@ posix_s3() {
 	fi
 }
 
-local_s3
-smbtorture_s3
-smbtorture_s3_encrypted
-smbclient_s3
-smbclient_s3_encrypted
-wbinfo_s3
-ntlm_auth_s3
-posix_s3
+if test "x$RUNTESTS" = "x" ; then
+	local_s3
+	smbtorture_s3
+	smbtorture_s3_encrypted
+	smbclient_s3
+	smbclient_s3_encrypted
+	wbinfo_s3
+	ntlm_auth_s3
+	posix_s3
+else
+	for THIS_TEST in $RUNTESTS; do
+		$THIS_TEST
+	done
+fi
 
-- 
cgit 


From 0ad8a002ce90c7567952cf9923bae57136cff565 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 31 Mar 2008 13:51:49 +0200
Subject: test: add (and unify) sectioning output of subtests in tests_all.sh

Michael
(This used to be commit d775194e9c7b75182c485fba427b20ec2bfcf16c)
---
 source3/script/tests/tests_all.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index c2534679d7..e2cfad6648 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -1,43 +1,49 @@
 local_s3() {
+	echo "RUNNING SUBTESTS local_s3"
 	$SCRIPTDIR/test_local_s3.sh \
 	|| failed=`expr $failed + $?`
 }
 
 smbtorture_s3() {
+	echo "RUNNING SUBTESTS smbtorture_s3"
 	$SCRIPTDIR/test_smbtorture_s3.sh \
 		//$SERVER_IP/tmp $USERNAME $PASSWORD "" \
 	|| failed=`expr $failed + $?`
 }
 
 smbtorture_s3_encrypted() {
-	echo "Testing encrypted"
+	echo "RUNNING SUBTESTS smbtorture_s3_encrypted"
 	$SCRIPTDIR/test_smbtorture_s3.sh \
 		//$SERVER_IP/tmp $USERNAME $PASSWORD "" "-e" \
 	|| failed=`expr $failed + $?`
 }
 
 smbclient_s3() {
+	echo "RUNNING SUBTESTS smbclient_s3"
 	$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP \
 	|| failed=`expr $failed + $?`
 }
 
 smbclient_s3_encrypted() {
-	echo "Testing encrypted"
+	echo "RUNNING SUBTESTS smbclient_s3_encrypted"
 	$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP "-e" \
 	|| failed=`expr $failed + $?`
 }
 
 wbinfo_s3() {
+	echo "RUNNING SUBTESTS wbinfo_s3"
 	$SCRIPTDIR/test_wbinfo_s3.sh $WORKGROUP $SERVER $USERNAME $PASSWORD \
 	|| failed=`expr $failed + $?`
 }
 
 ntlm_auth_s3() {
+	echo "RUNNING SUBTESTS ntlm_auth_s3"
 	$SCRIPTDIR/test_ntlm_auth_s3.sh \
 	|| failed=`expr $failed + $?`
 }
 
 posix_s3() {
+	echo "RUNNING SUBTESTS posix_s3"
 	eval "$LIB_PATH_VAR="\$SAMBA4SHAREDDIR:\$$LIB_PATH_VAR"; export $LIB_PATH_VAR"
 	eval echo "$LIB_PATH_VAR=\$$LIB_PATH_VAR"
 	SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
-- 
cgit 


From 96801c3f63d52ca2f4fd4bf109898daa4b5a3363 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 31 Mar 2008 13:54:39 +0200
Subject: test: add test script for testing "net registry".

Michael
(This used to be commit fa5968a26b552d7f13574a826e506ed2d6630feb)
---
 source3/script/tests/test_net_registry.sh | 378 ++++++++++++++++++++++++++++++
 source3/script/tests/tests_all.sh         |   7 +
 2 files changed, 385 insertions(+)
 create mode 100755 source3/script/tests/test_net_registry.sh

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh
new file mode 100755
index 0000000000..927882b703
--- /dev/null
+++ b/source3/script/tests/test_net_registry.sh
@@ -0,0 +1,378 @@
+#!/bin/sh
+
+# tests for the "net registry" command - local access to the registry db
+
+
+NET="$VALGRIND ${NET:-$BINDIR/net} $CONFIGURATION"
+
+NETREG="${NET} registry"
+
+incdir=`dirname $0`
+. $incdir/test_functions.sh
+
+failed=0
+
+test_enumerate()
+{
+	KEY="$1"
+
+	${NETREG} enumerate ${KEY}
+}
+
+test_getsd()
+{
+	KEY="$1"
+
+	${NETREG} getsd ${KEY}
+}
+
+test_enumerate_nonexisting()
+{
+	KEY="$1"
+	${NETREG} enumerate ${KEY}
+	if test "x$?" = "x0" ; then
+		echo "ERROR: enumerate succeeded with key '${KEY}'"
+		false
+	else
+		true
+	fi
+}
+
+test_enumerate_no_key()
+{
+	${NETREG} enumerate
+	if test "x$?" = "x0" ; then
+		echo "ERROR: enumerate succeeded without any key spcified"
+		false
+	else
+		true
+	fi
+}
+
+test_create_existing()
+{
+	KEY="HKLM"
+	EXPECTED="createkey opened existing ${KEY}"
+	OUTPUT=`${NETREG} createkey ${KEY}`
+	if test "x$?" = "x0" ; then
+		if test "$OUTPUT" = "$EXPECTED" ; then
+			true
+		else
+			echo "got '$OUTPUT', expected '$EXPECTED'"
+			false;
+		fi
+	else
+		echo -e "$OUTPUT"
+		false
+	fi
+}
+
+test_createkey()
+{
+	KEY="$1"
+	BASEKEY=`dirname $KEY`
+	SUBKEY=`basename $KEY`
+
+	${NETREG} createkey ${KEY}
+	if test "x$?" != "x0" ; then
+		false
+		return
+	fi
+
+	# check enumerate of basekey lists new key:
+	OUTPUT=`${NETREG} enumerate ${BASEKEY}`
+	if test "x$?" != "x0" ; then
+		echo "ERROR: failed to enumerate key '${BASEKEY}'"
+		echo "output:"
+		echo -e "$OUTPUT"
+		false
+		return
+	fi
+
+	EXPECTED="Keyname = ${SUBKEY}"
+	echo -e "$OUTPUT" | grep ^Keyname | grep ${SUBKEY}
+	if test "x$?" != "x0" ; then
+		echo "ERROR: did not find expexted '$EXPECTED' in output"
+		echo "output:"
+		echo -e "$OUTPUT"
+		false
+	fi
+
+	# check enumerate of new key works:
+	${NETREG} enumerate ${KEY}
+}
+
+test_deletekey()
+{
+	KEY="$1"
+	BASEKEY=`dirname ${KEY}`
+	SUBKEY=`basename ${KEY}`
+
+	test_createkey "${KEY}"
+
+	if test "x$?" != "x0" ; then
+		false
+		return
+	fi
+
+	${NETREG} deletekey ${KEY}
+
+	# check enumerate of basekey does not show key anymore:
+	OUTPUT=`${NETREG} enumerate ${BASEKEY}`
+	if test "x$?" != "x0" ; then
+		echo -e "$OUTPUT"
+		false
+		return
+	fi
+
+	UNEXPECTED="Keyname = ${SUBKEY}"
+	echo -e "$OUTPUT" | grep ^Keyname | grep ${SUBKEY}
+	if test "x$?" = "x0" ; then
+		echo "ERROR: found '$UNEXPECTED' after delete in output"
+		echo "output:"
+		echo -e "$OUTPUT"
+		false
+	fi
+
+	# check enumerate of key itself does not work anymore:
+	${NETREG} enumerate ${KEY}
+	if test "x$?" = "x0" ; then
+		echo "ERROR: 'enumerate ${KEY}' works after 'deletekey ${KEY}'"
+		false
+	else
+		true
+	fi
+}
+
+test_deletekey_nonexisting()
+{
+	KEY="$1"
+
+	test_deletekey "${KEY}"
+
+	if test "x$?" != "x0" ; then
+		false
+		return
+	fi
+
+	${NETREG} deletekey "${KEY}"
+	if test "x$?" = "x0" ; then
+		echo "ERROR: delete after delete succeeded for key '${KEY}'"
+		false
+	fi
+}
+
+test_createkey_with_subkey()
+{
+	KEY="$1"
+	KEY2=`dirname ${KEY}`
+	SUBKEYNAME2=`basename ${KEY}`
+	BASENAME=`dirname ${KEY2}`
+	SUBKEYNAME1=`basename ${KEY2}`
+
+	${NETREG} createkey ${KEY}
+
+	if test "x$?" != "x0" ; then
+		false
+		return
+	fi
+
+	# check we can enumerate to level key
+	${NETREG} enumerate ${KEY}
+	if test "x$?" != "x0" ; then
+		echo "ERROR: failed to enumerate '${KEY}' after creation"
+		false
+		return
+	fi
+
+	# clear:
+	${NETREG} deletekey ${KEY} && ${NETREG} deletekey ${KEY2}
+}
+
+test_deletekey_with_subkey()
+{
+	KEY="$1"
+	KEY2=`dirname ${KEY}`
+
+	${NETREG} createkey ${KEY}
+
+	if test "x$?" != "x0" ; then
+		false
+		return
+	fi
+
+	OUTPUT=`${NETREG} deletekey ${KEY2}`
+
+	if test "x$?" = "x0" ; then
+		echo "ERROR: delete of key with subkey succeeded"
+		echo "output:"
+		echo -e "$OUTPUT"
+		false
+		return
+	fi
+
+	${NETREG} deletekey ${KEY} && ${NETREG} deletekey ${KEY2}
+}
+
+test_setvalue()
+{
+	KEY="$1"
+	VALNAME="$2"
+	VALTYPE="$3"
+	VALVALUE="$4"
+
+	test_createkey ${KEY}
+	if test "x$?" != "x0" ; then
+		false
+		return
+	fi
+
+	${NETREG} setvalue ${KEY} ${VALNAME} ${VALTYPE} ${VALVALUE}
+	if test "x$?" != "x0" ; then
+		echo "ERROR: failed to set value testval in key ${KEY}"
+		false
+		return
+	fi
+
+	OUTPUT=`${NETREG} enumerate ${KEY}`
+	if test "x$?" != "x0" ; then
+		echo "ERROR: failure calling enumerate for key ${KEY}"
+		echo output:
+		echo -e "${OUTPUT}"
+		false
+		return
+	fi
+
+	echo -e "$OUTPUT" | {
+	FOUND=0
+	while read LINE ; do
+		SEARCH1=`echo $LINE | grep ^Valuename | grep ${VALNAME}`
+		if test "x$?" = "x0" ; then
+			read LINE
+			read LINE
+			SEARCH2=`echo $LINE | grep "^Value " | grep ${VALVALUE}`
+			if test "x$?" = "x0" ; then
+				FOUND=1
+				break
+			fi
+		fi
+	done
+
+	if test "x$FOUND" != "x1" ; then
+		echo "ERROR: did not find value '${VALNAME}' with enumerate"
+		echo "enumerate output:"
+		echo -e "$OUTPUT"
+		false
+		return
+	fi
+	}
+}
+
+test_deletevalue()
+{
+	KEY="$1"
+	VALNAME="$2"
+
+	${NETREG} deletevalue ${KEY} ${VALNAME}
+}
+
+test_deletevalue_nonexisting()
+{
+	KEY="$1"
+	VALNAME="$2"
+
+	${NETREG} deletevalue ${KEY} ${VALNAME}
+	if test "x$?" = "x0" ; then
+		echo "ERROR: succeeded deleting value ${VALNAME}"
+		false
+	else
+		true
+	fi
+}
+
+test_setvalue_twice()
+{
+	KEY="$1"
+	VALNAME="$2"
+	VALTYPE1="$3"
+	VALVALUE1="$4"
+	VALTYPE2="$5"
+	VALVALUE2="$6"
+
+	OUTPUT=`test_setvalue ${KEY} ${VALNAME} ${VALTYPE1} ${VALVALUE1}`
+	if test "x$?" != "x0" ; then
+		echo -e "$OUTPUT"
+		false
+		return
+	fi
+
+	${NETREG} setvalue ${KEY} ${VALNAME} ${VALTYPE2} ${VALVALUE2}
+}
+
+
+testit "enumerate HKLM" \
+	test_enumerate HKLM || \
+	failed=`expr $failed + 1`
+
+testit "enumerate nonexisting hive" \
+	test_enumerate_nonexisting XYZ || \
+	failed=`expr $failed + 1`
+
+testit "enumerate without key" \
+	test_enumerate_no_key || \
+	failed=`expr $failed + 1`
+
+testit "getsd HKLM" \
+	test_getsd HKLM || \
+	failed=`expr $failed + 1`
+
+testit "create existing HKLM" \
+	test_create_existing || \
+	failed=`expr $failed + 1`
+
+testit "create key" \
+	test_createkey HKLM/testkey || \
+	failed=`expr $failed + 1`
+
+testit "delete key" \
+	test_deletekey HKLM/testkey || \
+	failed=`expr $failed + 1`
+
+testit "delete^2 key" \
+	test_deletekey_nonexisting HKLM/testkey || \
+	failed=`expr $failed + 1`
+
+testit "enumerate nonexisting key" \
+	test_enumerate_nonexisting HKLM/testkey || \
+	failed=`expr $failed +1`
+
+testit "create key with subkey" \
+	test_createkey_with_subkey HKLM/testkey/subkey || \
+	failed=`expr $failed + 1`
+
+testit "delete key with subkey" \
+	test_deletekey_with_subkey HKLM/testkey/subkey || \
+	failed=`expr $failed + 1`
+
+testit "set value" \
+	test_setvalue HKLM/testkey testval sz moin || \
+	failed=`expr $failed + 1`
+
+testit "delete value" \
+	test_deletevalue HKLM/testkey testval || \
+	failed=`expr $failed + 1`
+
+testit "delete nonexisting value" \
+	test_deletevalue_nonexisting HKLM/testkey testval || \
+	failed=`expr $failed + 1`
+
+testit "set value to different type"
+	test_setvalue_twice HKLM/testkey testval sz moin dword 42 || \
+	failed=`expr $failed + 1`
+
+testit "delete key with value" \
+	test_deletekey HKLM/testkey || \
+	failed=`expr $failed + 1`
+
+testok $0 $failed
+
diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index e2cfad6648..5e215379f7 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -42,6 +42,12 @@ ntlm_auth_s3() {
 	|| failed=`expr $failed + $?`
 }
 
+net_registry() {
+	echo "RUNNING SUBTESTS net_registry"
+	$SCRIPTDIR/test_net_registry.sh \
+	|| failed=`expr $failed + $?`
+}
+
 posix_s3() {
 	echo "RUNNING SUBTESTS posix_s3"
 	eval "$LIB_PATH_VAR="\$SAMBA4SHAREDDIR:\$$LIB_PATH_VAR"; export $LIB_PATH_VAR"
@@ -66,6 +72,7 @@ if test "x$RUNTESTS" = "x" ; then
 	smbclient_s3_encrypted
 	wbinfo_s3
 	ntlm_auth_s3
+	net_registry
 	posix_s3
 else
 	for THIS_TEST in $RUNTESTS; do
-- 
cgit 


From ff08b55b45235067649eeefaaaf0bdc7a8166c42 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 1 Apr 2008 12:45:06 +0200
Subject: test: make registry tests more portable: use 'printf "%s"' instead of
 'echo -e'

Michael
(This used to be commit 5c1b7ee5c17489da90192309853aa1ecacc15512)
---
 source3/script/tests/test_net_registry.sh | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh
index 927882b703..42c062c21a 100755
--- a/source3/script/tests/test_net_registry.sh
+++ b/source3/script/tests/test_net_registry.sh
@@ -62,7 +62,7 @@ test_create_existing()
 			false;
 		fi
 	else
-		echo -e "$OUTPUT"
+		printf "%s" "$OUTPUT"
 		false
 	fi
 }
@@ -84,17 +84,17 @@ test_createkey()
 	if test "x$?" != "x0" ; then
 		echo "ERROR: failed to enumerate key '${BASEKEY}'"
 		echo "output:"
-		echo -e "$OUTPUT"
+		printf "%s" "$OUTPUT"
 		false
 		return
 	fi
 
 	EXPECTED="Keyname = ${SUBKEY}"
-	echo -e "$OUTPUT" | grep ^Keyname | grep ${SUBKEY}
+	printf "%s" "$OUTPUT" | grep ^Keyname | grep ${SUBKEY}
 	if test "x$?" != "x0" ; then
 		echo "ERROR: did not find expexted '$EXPECTED' in output"
 		echo "output:"
-		echo -e "$OUTPUT"
+		printf "%s" "$OUTPUT"
 		false
 	fi
 
@@ -120,17 +120,17 @@ test_deletekey()
 	# check enumerate of basekey does not show key anymore:
 	OUTPUT=`${NETREG} enumerate ${BASEKEY}`
 	if test "x$?" != "x0" ; then
-		echo -e "$OUTPUT"
+		printf "%s" "$OUTPUT"
 		false
 		return
 	fi
 
 	UNEXPECTED="Keyname = ${SUBKEY}"
-	echo -e "$OUTPUT" | grep ^Keyname | grep ${SUBKEY}
+	printf "%s" "$OUTPUT" | grep ^Keyname | grep ${SUBKEY}
 	if test "x$?" = "x0" ; then
 		echo "ERROR: found '$UNEXPECTED' after delete in output"
 		echo "output:"
-		echo -e "$OUTPUT"
+		printf "%s" "$OUTPUT"
 		false
 	fi
 
@@ -206,7 +206,7 @@ test_deletekey_with_subkey()
 	if test "x$?" = "x0" ; then
 		echo "ERROR: delete of key with subkey succeeded"
 		echo "output:"
-		echo -e "$OUTPUT"
+		printf "%s" "$OUTPUT"
 		false
 		return
 	fi
@@ -238,12 +238,12 @@ test_setvalue()
 	if test "x$?" != "x0" ; then
 		echo "ERROR: failure calling enumerate for key ${KEY}"
 		echo output:
-		echo -e "${OUTPUT}"
+		printf "%s" "${OUTPUT}"
 		false
 		return
 	fi
 
-	echo -e "$OUTPUT" | {
+	printf "%s" "$OUTPUT" | {
 	FOUND=0
 	while read LINE ; do
 		SEARCH1=`echo $LINE | grep ^Valuename | grep ${VALNAME}`
@@ -261,7 +261,7 @@ test_setvalue()
 	if test "x$FOUND" != "x1" ; then
 		echo "ERROR: did not find value '${VALNAME}' with enumerate"
 		echo "enumerate output:"
-		echo -e "$OUTPUT"
+		printf "%s" "$OUTPUT"
 		false
 		return
 	fi
@@ -301,7 +301,7 @@ test_setvalue_twice()
 
 	OUTPUT=`test_setvalue ${KEY} ${VALNAME} ${VALTYPE1} ${VALVALUE1}`
 	if test "x$?" != "x0" ; then
-		echo -e "$OUTPUT"
+		printf "%s" "$OUTPUT"
 		false
 		return
 	fi
-- 
cgit 


From 41281d3525e70f37aa7f61ef1f8ba90f5557de9a Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 1 Apr 2008 12:48:25 +0200
Subject: test: make registry tests more portable: protect some grep patterns
 in ' '.

Michael
(This used to be commit 1cb3b2f065566f981f6cfb8b5efdfad7db49c719)
---
 source3/script/tests/test_net_registry.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh
index 42c062c21a..fd9275a6d9 100755
--- a/source3/script/tests/test_net_registry.sh
+++ b/source3/script/tests/test_net_registry.sh
@@ -90,7 +90,7 @@ test_createkey()
 	fi
 
 	EXPECTED="Keyname = ${SUBKEY}"
-	printf "%s" "$OUTPUT" | grep ^Keyname | grep ${SUBKEY}
+	printf "%s" "$OUTPUT" | grep '^Keyname' | grep ${SUBKEY}
 	if test "x$?" != "x0" ; then
 		echo "ERROR: did not find expexted '$EXPECTED' in output"
 		echo "output:"
@@ -126,7 +126,7 @@ test_deletekey()
 	fi
 
 	UNEXPECTED="Keyname = ${SUBKEY}"
-	printf "%s" "$OUTPUT" | grep ^Keyname | grep ${SUBKEY}
+	printf "%s" "$OUTPUT" | 'grep ^Keyname' | grep ${SUBKEY}
 	if test "x$?" = "x0" ; then
 		echo "ERROR: found '$UNEXPECTED' after delete in output"
 		echo "output:"
@@ -246,11 +246,11 @@ test_setvalue()
 	printf "%s" "$OUTPUT" | {
 	FOUND=0
 	while read LINE ; do
-		SEARCH1=`echo $LINE | grep ^Valuename | grep ${VALNAME}`
+		SEARCH1=`echo $LINE | grep '^Valuename' | grep ${VALNAME}`
 		if test "x$?" = "x0" ; then
 			read LINE
 			read LINE
-			SEARCH2=`echo $LINE | grep "^Value " | grep ${VALVALUE}`
+			SEARCH2=`echo $LINE | grep '^Value ' | grep ${VALVALUE}`
 			if test "x$?" = "x0" ; then
 				FOUND=1
 				break
-- 
cgit 


From e61e4eb4e5ac5d3ea63549817b6973be693a49dd Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 1 Apr 2008 13:43:20 +0200
Subject: test: be more portable: replace 'echo -n' by 'printf "%s"' in
 selftest.sh

Michael
(This used to be commit b6122406fe938fdaf373ff45214db79de06eb989)
---
 source3/script/tests/selftest.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 2f2cb7b086..492a2c36c6 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -107,7 +107,7 @@ fi
 ## 
 ## create the test directory layout
 ##
-echo -n "CREATE TEST ENVIRONMENT IN '$PREFIX'"...
+printf "%s" "CREATE TEST ENVIRONMENT IN '$PREFIX'"...
 /bin/rm -rf $PREFIX/*
 mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $LOCKDIR $LOGDIR
 mkdir -p $SOCKET_WRAPPER_DIR
-- 
cgit 


From 52b463917e0a08bacc15b5d242952ba31e6339af Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 1 Apr 2008 13:45:55 +0200
Subject: test: be more portable. replace 'echo -n' by 'printf "%s"' in
 test_functions.sh

Michael
(This used to be commit c0c41184277044eb856f91c025f645c198cac188)
---
 source3/script/tests/test_functions.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh
index d707c30960..407d46aa9e 100644
--- a/source3/script/tests/test_functions.sh
+++ b/source3/script/tests/test_functions.sh
@@ -42,7 +42,7 @@ samba3_check_or_start() {
 		mkfifo $SERVER_TEST_FIFO
 
 		rm -f $NMBD_TEST_LOG
-		echo -n "STARTING NMBD..."
+		printf "%s" "STARTING NMBD..."
 		((
 			if test x"$NMBD_MAXTIME" = x; then
 			    NMBD_MAXTIME=2700
@@ -74,7 +74,7 @@ samba3_check_or_start() {
 		echo  "DONE"
 
 		rm -f $WINBINDD_TEST_LOG
-		echo -n "STARTING WINBINDD..."
+		printf "%s" "STARTING WINBINDD..."
 		((
 			if test x"$WINBINDD_MAXTIME" = x; then
 			    WINBINDD_MAXTIME=2700
@@ -106,7 +106,7 @@ samba3_check_or_start() {
 		echo  "DONE"
 
 		rm -f $SMBD_TEST_LOG
-		echo -n "STARTING SMBD..."
+		printf "%s" "STARTING SMBD..."
 		((
 			if test x"$SMBD_MAXTIME" = x; then
 			    SMBD_MAXTIME=2700
-- 
cgit 


From a63c396679f557875e9a949f50c0c1463548cb2b Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 1 Apr 2008 15:19:05 +0200
Subject: test: fix use of printf in net_registry tests.

actually 'printf "%s\n"' is the proper replacement of 'echo -e'

Michael
(This used to be commit 388a40931f1559b134317ef0c85c7cf2598e17fe)
---
 source3/script/tests/test_net_registry.sh | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh
index fd9275a6d9..4c6dd19100 100755
--- a/source3/script/tests/test_net_registry.sh
+++ b/source3/script/tests/test_net_registry.sh
@@ -62,7 +62,7 @@ test_create_existing()
 			false;
 		fi
 	else
-		printf "%s" "$OUTPUT"
+		printf "%s\n" "$OUTPUT"
 		false
 	fi
 }
@@ -84,17 +84,17 @@ test_createkey()
 	if test "x$?" != "x0" ; then
 		echo "ERROR: failed to enumerate key '${BASEKEY}'"
 		echo "output:"
-		printf "%s" "$OUTPUT"
+		printf "%s\n" "$OUTPUT"
 		false
 		return
 	fi
 
 	EXPECTED="Keyname = ${SUBKEY}"
-	printf "%s" "$OUTPUT" | grep '^Keyname' | grep ${SUBKEY}
+	printf "%s\n" "$OUTPUT" | grep '^Keyname' | grep ${SUBKEY}
 	if test "x$?" != "x0" ; then
 		echo "ERROR: did not find expexted '$EXPECTED' in output"
 		echo "output:"
-		printf "%s" "$OUTPUT"
+		printf "%s\n" "$OUTPUT"
 		false
 	fi
 
@@ -120,17 +120,17 @@ test_deletekey()
 	# check enumerate of basekey does not show key anymore:
 	OUTPUT=`${NETREG} enumerate ${BASEKEY}`
 	if test "x$?" != "x0" ; then
-		printf "%s" "$OUTPUT"
+		printf "%s\n" "$OUTPUT"
 		false
 		return
 	fi
 
 	UNEXPECTED="Keyname = ${SUBKEY}"
-	printf "%s" "$OUTPUT" | 'grep ^Keyname' | grep ${SUBKEY}
+	printf "%s\n" "$OUTPUT" | 'grep ^Keyname' | grep ${SUBKEY}
 	if test "x$?" = "x0" ; then
 		echo "ERROR: found '$UNEXPECTED' after delete in output"
 		echo "output:"
-		printf "%s" "$OUTPUT"
+		printf "%s\n" "$OUTPUT"
 		false
 	fi
 
@@ -206,7 +206,7 @@ test_deletekey_with_subkey()
 	if test "x$?" = "x0" ; then
 		echo "ERROR: delete of key with subkey succeeded"
 		echo "output:"
-		printf "%s" "$OUTPUT"
+		printf "%s\n" "$OUTPUT"
 		false
 		return
 	fi
@@ -238,12 +238,12 @@ test_setvalue()
 	if test "x$?" != "x0" ; then
 		echo "ERROR: failure calling enumerate for key ${KEY}"
 		echo output:
-		printf "%s" "${OUTPUT}"
+		printf "%s\n" "${OUTPUT}"
 		false
 		return
 	fi
 
-	printf "%s" "$OUTPUT" | {
+	printf "%s\n" "$OUTPUT" | {
 	FOUND=0
 	while read LINE ; do
 		SEARCH1=`echo $LINE | grep '^Valuename' | grep ${VALNAME}`
@@ -261,7 +261,7 @@ test_setvalue()
 	if test "x$FOUND" != "x1" ; then
 		echo "ERROR: did not find value '${VALNAME}' with enumerate"
 		echo "enumerate output:"
-		printf "%s" "$OUTPUT"
+		printf "%s\n" "$OUTPUT"
 		false
 		return
 	fi
@@ -301,7 +301,7 @@ test_setvalue_twice()
 
 	OUTPUT=`test_setvalue ${KEY} ${VALNAME} ${VALTYPE1} ${VALVALUE1}`
 	if test "x$?" != "x0" ; then
-		printf "%s" "$OUTPUT"
+		printf "%s\n" "$OUTPUT"
 		false
 		return
 	fi
-- 
cgit 


From 4a99bce73633db42dff632d209e379f45d9aec22 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 1 Apr 2008 15:35:12 +0200
Subject: test: fix net_registry tests to correctly capture output of commands
 inside one test

so that failure output is not clobbered by  output of previous
successful commands.

Michael
(This used to be commit cb3dafe5fd8867b000e01979d4232968d994d376)
---
 source3/script/tests/test_net_registry.sh | 37 +++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 12 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh
index 4c6dd19100..82861bae10 100755
--- a/source3/script/tests/test_net_registry.sh
+++ b/source3/script/tests/test_net_registry.sh
@@ -73,8 +73,11 @@ test_createkey()
 	BASEKEY=`dirname $KEY`
 	SUBKEY=`basename $KEY`
 
-	${NETREG} createkey ${KEY}
+	OUTPUT=`${NETREG} createkey ${KEY}`
 	if test "x$?" != "x0" ; then
+		echo "ERROR: createkey ${KEY} failed"
+		echo "output:"
+		printf "%s\n" "$OUTPUT"
 		false
 		return
 	fi
@@ -108,14 +111,20 @@ test_deletekey()
 	BASEKEY=`dirname ${KEY}`
 	SUBKEY=`basename ${KEY}`
 
-	test_createkey "${KEY}"
+	OUTPUT=`test_createkey "${KEY}"`
 
 	if test "x$?" != "x0" ; then
+		printf "%s\n" "${OUTPUT}"
 		false
 		return
 	fi
 
-	${NETREG} deletekey ${KEY}
+	OUTPUT=`${NETREG} deletekey ${KEY}`
+	if test "x$?" != "x0" ; then
+		printf "%s\n" "${OUTPUT}"
+		false
+		return
+	fi
 
 	# check enumerate of basekey does not show key anymore:
 	OUTPUT=`${NETREG} enumerate ${BASEKEY}`
@@ -148,9 +157,9 @@ test_deletekey_nonexisting()
 {
 	KEY="$1"
 
-	test_deletekey "${KEY}"
-
+	OUTPUT=`test_deletekey "${KEY}"`
 	if test "x$?" != "x0" ; then
+		printf "%s\n" "${OUTPUT}"
 		false
 		return
 	fi
@@ -170,17 +179,19 @@ test_createkey_with_subkey()
 	BASENAME=`dirname ${KEY2}`
 	SUBKEYNAME1=`basename ${KEY2}`
 
-	${NETREG} createkey ${KEY}
-
+	OUTPUT=`${NETREG} createkey ${KEY}`
 	if test "x$?" != "x0" ; then
+		echo "ERROR: createkey ${KEY} failed"
+		printf "%s\n" "${OUTPUT}"
 		false
 		return
 	fi
 
 	# check we can enumerate to level key
-	${NETREG} enumerate ${KEY}
+	OUTPUT=`${NETREG} enumerate ${KEY}`
 	if test "x$?" != "x0" ; then
 		echo "ERROR: failed to enumerate '${KEY}' after creation"
+		printf "%s\n" "${OUTPUT}"
 		false
 		return
 	fi
@@ -194,9 +205,9 @@ test_deletekey_with_subkey()
 	KEY="$1"
 	KEY2=`dirname ${KEY}`
 
-	${NETREG} createkey ${KEY}
-
+	OUTPUT=`${NETREG} createkey ${KEY}`
 	if test "x$?" != "x0" ; then
+		printf "%s\n" "${OUTPUT}"
 		false
 		return
 	fi
@@ -221,15 +232,17 @@ test_setvalue()
 	VALTYPE="$3"
 	VALVALUE="$4"
 
-	test_createkey ${KEY}
+	OUTPUT=`test_createkey ${KEY}`
 	if test "x$?" != "x0" ; then
+		printf "%s\n" "${OUTPUT}"
 		false
 		return
 	fi
 
-	${NETREG} setvalue ${KEY} ${VALNAME} ${VALTYPE} ${VALVALUE}
+	OUTPUT=`${NETREG} setvalue ${KEY} ${VALNAME} ${VALTYPE} ${VALVALUE}`
 	if test "x$?" != "x0" ; then
 		echo "ERROR: failed to set value testval in key ${KEY}"
+		printf "%s\n" "${OUTPUT}"
 		false
 		return
 	fi
-- 
cgit 


From fd64e6de8c708674f6e406171f82ccb2a7c45390 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 1 Apr 2008 15:43:35 +0200
Subject: test: some cosmetics to net_registry tests.

Michael
(This used to be commit dba9db5ae6581df18591eebd19d3649bed0d9367)
---
 source3/script/tests/test_net_registry.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh
index 82861bae10..3fac34e641 100755
--- a/source3/script/tests/test_net_registry.sh
+++ b/source3/script/tests/test_net_registry.sh
@@ -30,6 +30,7 @@ test_enumerate_nonexisting()
 {
 	KEY="$1"
 	${NETREG} enumerate ${KEY}
+
 	if test "x$?" = "x0" ; then
 		echo "ERROR: enumerate succeeded with key '${KEY}'"
 		false
@@ -53,13 +54,14 @@ test_create_existing()
 {
 	KEY="HKLM"
 	EXPECTED="createkey opened existing ${KEY}"
+
 	OUTPUT=`${NETREG} createkey ${KEY}`
 	if test "x$?" = "x0" ; then
 		if test "$OUTPUT" = "$EXPECTED" ; then
 			true
 		else
 			echo "got '$OUTPUT', expected '$EXPECTED'"
-			false;
+			false
 		fi
 	else
 		printf "%s\n" "$OUTPUT"
@@ -112,7 +114,6 @@ test_deletekey()
 	SUBKEY=`basename ${KEY}`
 
 	OUTPUT=`test_createkey "${KEY}"`
-
 	if test "x$?" != "x0" ; then
 		printf "%s\n" "${OUTPUT}"
 		false
-- 
cgit 


From 048dcbb75f42d8a0a6896cf70fdf840375d531f4 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 1 Apr 2008 15:50:24 +0200
Subject: test: fix net_registry test "set value to different type" to track
 error count

missing backslash in call... :-}

Michael
(This used to be commit 8f0c25f01f11857d24556346dc2758549919eba3)
---
 source3/script/tests/test_net_registry.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh
index 3fac34e641..7b6faede0b 100755
--- a/source3/script/tests/test_net_registry.sh
+++ b/source3/script/tests/test_net_registry.sh
@@ -380,7 +380,7 @@ testit "delete nonexisting value" \
 	test_deletevalue_nonexisting HKLM/testkey testval || \
 	failed=`expr $failed + 1`
 
-testit "set value to different type"
+testit "set value to different type" \
 	test_setvalue_twice HKLM/testkey testval sz moin dword 42 || \
 	failed=`expr $failed + 1`
 
-- 
cgit 


From 8d7257453cddca5cb4c35f60814953a9c2ebc9be Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 1 Apr 2008 15:51:51 +0200
Subject: test: add diagnostic message to net_registry test.

Michael
(This used to be commit c04a234f8f6fbdf8e54c69414024d84aa71fec45)
---
 source3/script/tests/test_net_registry.sh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh
index 7b6faede0b..9ea78cfd81 100755
--- a/source3/script/tests/test_net_registry.sh
+++ b/source3/script/tests/test_net_registry.sh
@@ -315,6 +315,7 @@ test_setvalue_twice()
 
 	OUTPUT=`test_setvalue ${KEY} ${VALNAME} ${VALTYPE1} ${VALVALUE1}`
 	if test "x$?" != "x0" ; then
+		echo "ERROR: first setvalue call failed"
 		printf "%s\n" "$OUTPUT"
 		false
 		return
-- 
cgit 


From 406da3a9628f7e631ad17ec3c37c841359d0ccbf Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 12 Mar 2008 18:26:43 +0100
Subject: selftest: samba3 passes BASE-DELAYWRITE

metze
(This used to be commit 5df34634317633820993c9ef924d694a8fe1c4fe)
---
 source3/script/tests/test_posix_s3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index a40a0418eb..c0983ad3ff 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -46,7 +46,7 @@ unix="UNIX-INFO2"
 
 tests="$base $raw $rpc $unix"
 
-skipped="BASE-CHARSET BASE-DELAYWRITE BASE-TCONDEV"
+skipped="BASE-CHARSET BASE-TCONDEV"
 skipped="$skipped RAW-ACLS RAW-COMPOSITE RAW-CONTEXT"
 skipped="$skipped RAW-IOCTL"
 skipped="$skipped RAW-QFILEINFO RAW-QFSINFO"
-- 
cgit 


From c5cf066c8b212a41bb6d947bf411c68deb67ac29 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 8 Apr 2008 18:50:49 +0200
Subject: selftest: run the BASE-DELAYWRITE test 4 times faster in make test

metze
(This used to be commit 83b6da7c52a6f5285a9765d22d13a53fe9dc80e5)
---
 source3/script/tests/selftest.sh      | 1 +
 source3/script/tests/test_posix_s3.sh | 1 +
 2 files changed, 2 insertions(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 492a2c36c6..b53940ea40 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -183,6 +183,7 @@ cat >$SERVERCONFFILE<<EOF
 	path = $PREFIX_ABS/tmp
 	read only = no
 	smbd:sharedelay = 100000
+	smbd:writetimeupdatedelay = 500000
 	map hidden = yes
 	map system = yes
 	create mask = 755
diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index c0983ad3ff..11f1f0eda4 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -55,6 +55,7 @@ skipped="$skipped RAW-SFILEINFO"
 echo "WARNING: Skipping tests $skipped"
 
 ADDARGS="$ADDARGS --option=torture:sharedelay=100000"
+ADDARGS="$ADDARGS --option=torture:writetimeupdatedelay=500000"
 
 failed=0
 for t in $tests; do
-- 
cgit 


From 6dd73c2866ad01e092d9879ac23b75467250fe71 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 8 Apr 2008 12:08:18 +0200
Subject: test: run smbconftort testsuite from the local_s3 tests

Michael
(This used to be commit 6641061f76d2175b9476a96d24b99a52163936ca)
---
 source3/script/tests/test_local_s3.sh | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_local_s3.sh b/source3/script/tests/test_local_s3.sh
index fd8f98ccab..5de7f1aa82 100755
--- a/source3/script/tests/test_local_s3.sh
+++ b/source3/script/tests/test_local_s3.sh
@@ -23,4 +23,7 @@ testit "replacetort" $VALGRIND $BINDIR/replacetort || \
 testit "tdbtorture" $VALGRIND $BINDIR/tdbtorture || \
     failed=`expr $failed + 1`
 
+testit "smbconftort" $VALGRIND $BINDIR/tdbtorture $CONFIGURATION || \
+	failed =`expr $failed + 1`
+
 testok $0 $failed
-- 
cgit 


From 83a6605b3a5e444f3b5c1b543d7fa442e357f1ab Mon Sep 17 00:00:00 2001
From: Björn Jacke <bj@sernet.de>
Date: Fri, 11 Apr 2008 10:33:46 +0200
Subject: some shells are pickier than others ... (This used to be commit
 9aabfa44d95128ded567d0949a6dd42786cbf6fb)

---
 source3/script/tests/test_local_s3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_local_s3.sh b/source3/script/tests/test_local_s3.sh
index 5de7f1aa82..b960620a5b 100755
--- a/source3/script/tests/test_local_s3.sh
+++ b/source3/script/tests/test_local_s3.sh
@@ -24,6 +24,6 @@ testit "tdbtorture" $VALGRIND $BINDIR/tdbtorture || \
     failed=`expr $failed + 1`
 
 testit "smbconftort" $VALGRIND $BINDIR/tdbtorture $CONFIGURATION || \
-	failed =`expr $failed + 1`
+	failed=`expr $failed + 1`
 
 testok $0 $failed
-- 
cgit 


From c575c85d587284eaf0afde269f6d4c2ae61423ee Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Fri, 11 Apr 2008 10:57:50 +0200
Subject: test: not only pretend to call smbconftort - really do it :-}

Michael
(This used to be commit e0947537e61cdc7aaaf1256a7f9a590f006cb3d9)
---
 source3/script/tests/test_local_s3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_local_s3.sh b/source3/script/tests/test_local_s3.sh
index b960620a5b..aed8637abd 100755
--- a/source3/script/tests/test_local_s3.sh
+++ b/source3/script/tests/test_local_s3.sh
@@ -23,7 +23,7 @@ testit "replacetort" $VALGRIND $BINDIR/replacetort || \
 testit "tdbtorture" $VALGRIND $BINDIR/tdbtorture || \
     failed=`expr $failed + 1`
 
-testit "smbconftort" $VALGRIND $BINDIR/tdbtorture $CONFIGURATION || \
+testit "smbconftort" $VALGRIND $BINDIR/smbconftort $CONFIGURATION || \
 	failed=`expr $failed + 1`
 
 testok $0 $failed
-- 
cgit 


From 5c3b9a38f51ce69a3e15d8799809a117acb85a72 Mon Sep 17 00:00:00 2001
From: "Gerald W. Carter" <jerry@samba.org>
Date: Wed, 23 Apr 2008 11:26:35 -0500
Subject: Use wbinfo --online-status in make test rather than --sequence (This
 used to be commit f8c364da94fac96450116be980e38ddddd3f304a)

---
 source3/script/tests/test_wbinfo_s3.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_wbinfo_s3.sh b/source3/script/tests/test_wbinfo_s3.sh
index 01eed6ead6..b0b6824500 100755
--- a/source3/script/tests/test_wbinfo_s3.sh
+++ b/source3/script/tests/test_wbinfo_s3.sh
@@ -26,9 +26,9 @@ tests="$tests:--all-domains"
 tests="$tests:--trusted-domains"
 tests="$tests:--domain-info=BUILTIN"
 tests="$tests:--domain-info=$server"
-tests="$tests:--sequence"
-tests="$tests:--sequence --domain=BUILTIN"
-tests="$tests:--sequence --domain=$server"
+tests="$tests:--online-status"
+tests="$tests:--online-status --domain=BUILTIN"
+tests="$tests:--online-status --domain=$server"
 #Didn't pass yet# tests="$tests:--domain-users"
 tests="$tests:--domain-groups"
 tests="$tests:--name-to-sid=$username"
-- 
cgit 


From 60fedc43e75cebbef10a94cacfe9733e947b1386 Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Sat, 3 May 2008 01:45:33 +0200
Subject: selftest: Use TESTS env var to specify tests to run like Samba4 does.
 (This used to be commit 6fb1fe803ccbd3af2946fcbe4586c11d394d5dc2)

---
 source3/script/tests/selftest.sh  | 4 ++--
 source3/script/tests/tests_all.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index b53940ea40..5f07e2d76e 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -6,7 +6,7 @@ if [ $# != 3 ]; then
 fi
 
 SMBTORTURE4=$3
-TESTS=$2
+SUBTESTS=$2
 
 ##
 ## create the test directory
@@ -290,7 +290,7 @@ START=`date`
 
  failed=0
 
- . $SCRIPTDIR/tests_$TESTS.sh
+ . $SCRIPTDIR/tests_$SUBTESTS.sh
  exit $failed
 )
 failed=$?
diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index 5e215379f7..6e5334da31 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -64,7 +64,7 @@ posix_s3() {
 	fi
 }
 
-if test "x$RUNTESTS" = "x" ; then
+if test "x$TESTS" = "x" ; then
 	local_s3
 	smbtorture_s3
 	smbtorture_s3_encrypted
@@ -75,7 +75,7 @@ if test "x$RUNTESTS" = "x" ; then
 	net_registry
 	posix_s3
 else
-	for THIS_TEST in $RUNTESTS; do
+	for THIS_TEST in $TESTS; do
 		$THIS_TEST
 	done
 fi
-- 
cgit 


From 49264b539ddab90d03fb6a179b5a6ad302a5340a Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Mon, 5 May 2008 15:26:11 +0200
Subject: selftest: Advertise as PDC and time server during make test (This
 used to be commit 65c619b36d08ac2f24b622c71b7e05d50bdeea50)

---
 source3/script/tests/selftest.sh | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 5f07e2d76e..26dd0cbbee 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -162,6 +162,10 @@ cat >$SERVERCONFFILE<<EOF
 
 	passdb backend = tdbsam
 
+	domain master = yes
+	domain logons = yes
+	time server = yes
+
 	add user script = $PERL $SRCDIR/lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_PASSWD --type passwd --action add --name %u
 	add machine script = $PERL $SRCDIR/lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_PASSWD --type passwd --action add --name %u
 	delete user script = $PERL $SRCDIR/lib/nss_wrapper/nss_wrapper.pl --path $NSS_WRAPPER_PASSWD --type passwd --action delete --name %u
-- 
cgit 


From 4cbb87adad09a0e9cfdd82d6aa794c5af91bb654 Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Sat, 3 May 2008 01:50:20 +0200
Subject: tests: Add a net_misc test. (This used to be commit
 026d701aff2c035359894786ec22b4ed829cfb31)

---
 source3/script/tests/test_net_misc.sh | 50 +++++++++++++++++++++++++++++++++++
 source3/script/tests/test_net_s3.sh   | 26 ++++++++++++++++++
 source3/script/tests/tests_all.sh     |  8 +++---
 3 files changed, 80 insertions(+), 4 deletions(-)
 create mode 100755 source3/script/tests/test_net_misc.sh
 create mode 100755 source3/script/tests/test_net_s3.sh

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_net_misc.sh b/source3/script/tests/test_net_misc.sh
new file mode 100755
index 0000000000..3ceb087885
--- /dev/null
+++ b/source3/script/tests/test_net_misc.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+# various tests for the "net" command
+
+NET="$VALGRIND ${NET:-$BINDIR/net} $CONFIGURATION"
+
+NETTIME="${NET} time"
+NETLOOKUP="${NET} lookup"
+
+incdir=`dirname $0`
+. $incdir/test_functions.sh
+
+failed=0
+
+test_time()
+{
+	PARAM="$1"
+
+	${NETTIME} ${PARAM} -S localhost2
+}
+
+test_lookup()
+{
+	PARAM="$1"
+
+	${NETLOOKUP} ${PARAM}
+}
+
+testit "get the time" \
+	test_time || \
+	failed=`expr $failed + 1`
+
+testit "get the system time" \
+	test_time system || \
+	failed=`expr $failed + 1`
+
+testit "get the tize zone" \
+	test_time zone || \
+	failed=`expr $failed + 1`
+
+testit "lookup the PDC" \
+	test_lookup pdc || \
+	failed=`expr $failed + 1`
+
+testit "lookup the master browser" \
+	test_lookup master || \
+	failed=`expr $failed + 1`
+
+testok $0 $failed
+
diff --git a/source3/script/tests/test_net_s3.sh b/source3/script/tests/test_net_s3.sh
new file mode 100755
index 0000000000..24732580fa
--- /dev/null
+++ b/source3/script/tests/test_net_s3.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# tests for the "net" command
+
+incdir=`dirname $0`
+. $incdir/test_functions.sh
+
+failed=0
+
+net_misc() {
+	echo "Running misc tests"
+	$SCRIPTDIR/test_net_misc.sh \
+	|| failed=`expr $failed + $?`
+}
+
+net_registry() {
+	echo "Running registry tests"
+	$SCRIPTDIR/test_net_registry.sh \
+	|| failed=`expr $failed + $?`
+}
+
+net_misc
+net_registry
+
+testok $0 $failed
+
diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index 6e5334da31..cb545674e3 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -42,9 +42,9 @@ ntlm_auth_s3() {
 	|| failed=`expr $failed + $?`
 }
 
-net_registry() {
-	echo "RUNNING SUBTESTS net_registry"
-	$SCRIPTDIR/test_net_registry.sh \
+net_s3() {
+	echo "RUNNING SUBTESTS net_s3"
+	$SCRIPTDIR/test_net_s3.sh \
 	|| failed=`expr $failed + $?`
 }
 
@@ -72,7 +72,7 @@ if test "x$TESTS" = "x" ; then
 	smbclient_s3_encrypted
 	wbinfo_s3
 	ntlm_auth_s3
-	net_registry
+	net_s3
 	posix_s3
 else
 	for THIS_TEST in $TESTS; do
-- 
cgit 


From 41075fbfa1cad4e8e978927850bb6010577f029f Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 6 May 2008 11:40:05 +0200
Subject: testsuite: use domain==workgroup in wbinfo tests now that we are PDC.

Previously domain==netbios name was the right thing to use.

Michael
(This used to be commit a5fc47c2457ce370a4f6150b9f2a417dac7589bf)
---
 source3/script/tests/test_wbinfo_s3.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_wbinfo_s3.sh b/source3/script/tests/test_wbinfo_s3.sh
index b0b6824500..e3bf1b9e70 100755
--- a/source3/script/tests/test_wbinfo_s3.sh
+++ b/source3/script/tests/test_wbinfo_s3.sh
@@ -25,10 +25,10 @@ tests="$tests:--own-domain"
 tests="$tests:--all-domains"
 tests="$tests:--trusted-domains"
 tests="$tests:--domain-info=BUILTIN"
-tests="$tests:--domain-info=$server"
+tests="$tests:--domain-info=$domain"
 tests="$tests:--online-status"
 tests="$tests:--online-status --domain=BUILTIN"
-tests="$tests:--online-status --domain=$server"
+tests="$tests:--online-status --domain=$domain"
 #Didn't pass yet# tests="$tests:--domain-users"
 tests="$tests:--domain-groups"
 tests="$tests:--name-to-sid=$username"
-- 
cgit 


From 6989228d69466bbe37f9a7deacd5b4237fdcb516 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 6 May 2008 11:43:27 +0200
Subject: testsuite: adapt informative message to say "Running _local_ registry
 tests".

The plan is to also test remote registry  with "net rpc registry".

Michael
(This used to be commit b5507f8a95399193099a0474fb8b8bc95ba04a48)
---
 source3/script/tests/test_net_s3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_net_s3.sh b/source3/script/tests/test_net_s3.sh
index 24732580fa..073a5e2c58 100755
--- a/source3/script/tests/test_net_s3.sh
+++ b/source3/script/tests/test_net_s3.sh
@@ -14,7 +14,7 @@ net_misc() {
 }
 
 net_registry() {
-	echo "Running registry tests"
+	echo "Running local registry tests"
 	$SCRIPTDIR/test_net_registry.sh \
 	|| failed=`expr $failed + $?`
 }
-- 
cgit 


From c5db4d17cd875bc91e0cb3bafb455c1eb1d8dc63 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Fri, 4 Apr 2008 18:26:34 +0200
Subject: testsuite: add the ability to test "net rpc registry" with the
 net_registry tests

by specifying a parameter "rpc" on the commandline.

Michael
(This used to be commit 110c26374ef3e0bdefe2e54db2b8ffd4544780ef)
---
 source3/script/tests/test_net_registry.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh
index 9ea78cfd81..b263ecbea6 100755
--- a/source3/script/tests/test_net_registry.sh
+++ b/source3/script/tests/test_net_registry.sh
@@ -2,10 +2,15 @@
 
 # tests for the "net registry" command - local access to the registry db
 
+RPC="$1"
 
 NET="$VALGRIND ${NET:-$BINDIR/net} $CONFIGURATION"
 
-NETREG="${NET} registry"
+if test "x${RPC}" = "xrpc" ; then
+	NETREG="${NET} -U${USERNAME}%${PASSWORD} -I ${SERVER_IP} rpc registry"
+else
+	NETREG="${NET} registry"
+fi
 
 incdir=`dirname $0`
 . $incdir/test_functions.sh
@@ -324,7 +329,6 @@ test_setvalue_twice()
 	${NETREG} setvalue ${KEY} ${VALNAME} ${VALTYPE2} ${VALVALUE2}
 }
 
-
 testit "enumerate HKLM" \
 	test_enumerate HKLM || \
 	failed=`expr $failed + 1`
@@ -337,9 +341,12 @@ testit "enumerate without key" \
 	test_enumerate_no_key || \
 	failed=`expr $failed + 1`
 
+# skip getsd test for registry currently: it fails
+if test "x${RPC}" != "xrpc" ; then
 testit "getsd HKLM" \
 	test_getsd HKLM || \
 	failed=`expr $failed + 1`
+fi
 
 testit "create existing HKLM" \
 	test_create_existing || \
-- 
cgit 


From 447df4dc853d3876bc74effe42a1243dc0f5cba4 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 6 May 2008 12:01:49 +0200
Subject: testsuite: run the net rpc registry tests from the net_s3 tests.

Michael
(This used to be commit dcf39078cf0524a7450db3f67c8e004eb42690c2)
---
 source3/script/tests/test_net_s3.sh | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_net_s3.sh b/source3/script/tests/test_net_s3.sh
index 073a5e2c58..70be135c3f 100755
--- a/source3/script/tests/test_net_s3.sh
+++ b/source3/script/tests/test_net_s3.sh
@@ -19,8 +19,15 @@ net_registry() {
 	|| failed=`expr $failed + $?`
 }
 
+net_rpc_registry() {
+	echo "Running remote registry tests"
+	$SCRIPTDIR/test_net_registry.sh rpc \
+	|| failed=`expr $failed + $?`
+}
+
 net_misc
 net_registry
+net_rpc_registry
 
 testok $0 $failed
 
-- 
cgit 


From e7fa8e2700b888548d49472f8a22c16724cafa7f Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Fri, 4 Apr 2008 18:29:44 +0200
Subject: testsuite: give the testuser administrative rights in selftest.sh

(by adding him to builtin\administrators)

Michael
(This used to be commit baea0615003cc2db8b27872e87064364f2deb079)
---
 source3/script/tests/selftest.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 26dd0cbbee..5cec6d6d03 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -254,6 +254,7 @@ SOCKET_WRAPPER_DEFAULT_IFACE=2
 export SOCKET_WRAPPER_DEFAULT_IFACE
 samba3_check_or_start
 
+
 # ensure any one smbtorture call doesn't run too long
 # and smbtorture will use 127.0.0.6 as source address by default
 SOCKET_WRAPPER_DEFAULT_IFACE=6
@@ -292,6 +293,15 @@ START=`date`
  bin/smbclient $CONFIGURATION -L $SERVER_IP -U% -p 139 | head -2
  MAKE_TEST_BINARY=""
 
+ MAKE_TEST_BINARY="bin/net"
+ printf "%s" "GIVING USER ${USERNAME} ADMINISTRATIVE RIGHTS..."
+ bin/net -s $SERVERCONFFILE sam createbuiltingroup \
+   Administrators > /dev/null 2>&1 ||  exit 1
+ bin/net -s $SERVERCONFFILE sam addmem \
+   BUILTIN\\Administrators $USERNAME > /dev/null 2>&1 || exit 1
+ echo "DONE"
+ MAKE_TEST_BINARY=""
+
  failed=0
 
  . $SCRIPTDIR/tests_$SUBTESTS.sh
-- 
cgit 


From dadc6a4f3526d8d361069a5e4db65fa9aab73be4 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 6 May 2008 12:08:27 +0200
Subject: testsuite: make diagnostic output more appropriate in tests_all.sh

Say "RUNNING TESTS ..." instead of "RUNNING SUBTESTS ..."

Michael
(This used to be commit b73821c392a23c213e4b1ad25a8a2d0c845cee3a)
---
 source3/script/tests/tests_all.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index cb545674e3..5a6b4678b1 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -1,55 +1,55 @@
 local_s3() {
-	echo "RUNNING SUBTESTS local_s3"
+	echo "RUNNING TESTS local_s3"
 	$SCRIPTDIR/test_local_s3.sh \
 	|| failed=`expr $failed + $?`
 }
 
 smbtorture_s3() {
-	echo "RUNNING SUBTESTS smbtorture_s3"
+	echo "RUNNING TESTS smbtorture_s3"
 	$SCRIPTDIR/test_smbtorture_s3.sh \
 		//$SERVER_IP/tmp $USERNAME $PASSWORD "" \
 	|| failed=`expr $failed + $?`
 }
 
 smbtorture_s3_encrypted() {
-	echo "RUNNING SUBTESTS smbtorture_s3_encrypted"
+	echo "RUNNING TESTS smbtorture_s3_encrypted"
 	$SCRIPTDIR/test_smbtorture_s3.sh \
 		//$SERVER_IP/tmp $USERNAME $PASSWORD "" "-e" \
 	|| failed=`expr $failed + $?`
 }
 
 smbclient_s3() {
-	echo "RUNNING SUBTESTS smbclient_s3"
+	echo "RUNNING TESTS smbclient_s3"
 	$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP \
 	|| failed=`expr $failed + $?`
 }
 
 smbclient_s3_encrypted() {
-	echo "RUNNING SUBTESTS smbclient_s3_encrypted"
+	echo "RUNNING TESTS smbclient_s3_encrypted"
 	$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP "-e" \
 	|| failed=`expr $failed + $?`
 }
 
 wbinfo_s3() {
-	echo "RUNNING SUBTESTS wbinfo_s3"
+	echo "RUNNING TESTS wbinfo_s3"
 	$SCRIPTDIR/test_wbinfo_s3.sh $WORKGROUP $SERVER $USERNAME $PASSWORD \
 	|| failed=`expr $failed + $?`
 }
 
 ntlm_auth_s3() {
-	echo "RUNNING SUBTESTS ntlm_auth_s3"
+	echo "RUNNING TESTS ntlm_auth_s3"
 	$SCRIPTDIR/test_ntlm_auth_s3.sh \
 	|| failed=`expr $failed + $?`
 }
 
 net_s3() {
-	echo "RUNNING SUBTESTS net_s3"
+	echo "RUNNING TESTS net_s3"
 	$SCRIPTDIR/test_net_s3.sh \
 	|| failed=`expr $failed + $?`
 }
 
 posix_s3() {
-	echo "RUNNING SUBTESTS posix_s3"
+	echo "RUNNING TESTS posix_s3"
 	eval "$LIB_PATH_VAR="\$SAMBA4SHAREDDIR:\$$LIB_PATH_VAR"; export $LIB_PATH_VAR"
 	eval echo "$LIB_PATH_VAR=\$$LIB_PATH_VAR"
 	SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
-- 
cgit 


From 1f582b73b3cc0880fe313fa9b02a3272c9e6442a Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 6 May 2008 12:09:59 +0200
Subject: testsuite: make structuring output of net_s3 tests stand out more.

say "RUNNING SUBTESTS ..." instead of "Running ... tests"

Michael
(This used to be commit 0b879817ba20861c7d0b239d7f7199b0a5ed2ca1)
---
 source3/script/tests/test_net_s3.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_net_s3.sh b/source3/script/tests/test_net_s3.sh
index 70be135c3f..f7dc2b7e10 100755
--- a/source3/script/tests/test_net_s3.sh
+++ b/source3/script/tests/test_net_s3.sh
@@ -8,19 +8,19 @@ incdir=`dirname $0`
 failed=0
 
 net_misc() {
-	echo "Running misc tests"
+	echo "RUNNING SUBTESTS net_misc"
 	$SCRIPTDIR/test_net_misc.sh \
 	|| failed=`expr $failed + $?`
 }
 
 net_registry() {
-	echo "Running local registry tests"
+	echo "RUNNING SUBTESTS net_registry"
 	$SCRIPTDIR/test_net_registry.sh \
 	|| failed=`expr $failed + $?`
 }
 
 net_rpc_registry() {
-	echo "Running remote registry tests"
+	echo "RUNNING SUBTESTS net_rpc_registry"
 	$SCRIPTDIR/test_net_registry.sh rpc \
 	|| failed=`expr $failed + $?`
 }
-- 
cgit 


From 5621ce6fb45a85e5f381286ef307e02ed8178c7f Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 6 May 2008 23:43:37 +0200
Subject: testsuite: allow selection of posix_s3 subtests by env var
 POSIX_SUBTESTS.

This allows for calling e.g.

TESTS=posix_s3 POSIX_SUBTESTS="RPC-SAMBA3-GETUSERNAME" make test

Michael
(This used to be commit 7418d89b2941fff307e0980d1f71f106aed8cbce)
---
 source3/script/tests/test_posix_s3.sh | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 11f1f0eda4..3e9998666c 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -46,6 +46,10 @@ unix="UNIX-INFO2"
 
 tests="$base $raw $rpc $unix"
 
+if test "x$POSIX_SUBTESTS" != "x" ; then
+	tests="$POSIX_SUBTESTS"
+fi
+
 skipped="BASE-CHARSET BASE-TCONDEV"
 skipped="$skipped RAW-ACLS RAW-COMPOSITE RAW-CONTEXT"
 skipped="$skipped RAW-IOCTL"
-- 
cgit 


From 5d6528e44fc49924b99ac9b49db298d5fa6ac920 Mon Sep 17 00:00:00 2001
From: Karolin Seeger <kseeger@samba.org>
Date: Tue, 13 May 2008 14:01:52 +0200
Subject: tests_all.sh: Do not execute $SMB4TORTURE --version if it is not
 available.

Improve error message if no SMB4TORTURE is available.

Karolin
(This used to be commit 443691eb2614919043406f94e9c71b49230612d5)
---
 source3/script/tests/tests_all.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index 5a6b4678b1..fa62a5129c 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -52,7 +52,9 @@ posix_s3() {
 	echo "RUNNING TESTS posix_s3"
 	eval "$LIB_PATH_VAR="\$SAMBA4SHAREDDIR:\$$LIB_PATH_VAR"; export $LIB_PATH_VAR"
 	eval echo "$LIB_PATH_VAR=\$$LIB_PATH_VAR"
-	SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
+	if [ -x "$SMBTORTURE4" ]; then
+		SMBTORTURE4VERSION=`$SMBTORTURE4 --version`
+	fi
 	if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then
 		echo "Running Tests with Samba4's smbtorture"
 		echo $SMBTORTURE4VERSION
@@ -61,6 +63,7 @@ posix_s3() {
 		|| failed=`expr $failed + $?`
 	else
 		echo "Skip Tests with Samba4's smbtorture"
+		echo "Try to compile with --with-smbtorture4-path=PATH to enable"
 	fi
 }
 
-- 
cgit 


From aeec9c7f553963625d4c9b5378eb18d8551a1b14 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 17 Jun 2008 23:51:23 +0200
Subject: testsuite: don't give the testuser administrative rights globally.

It breaks RPC-SAMBA3-GETUSERNAME for reasons I have not quite
understood yet. Somhow loosing rights fails when the user
belogns to BUILTIN\Administrators at some point.

Michael
(This used to be commit 9fe99c69f35b005b66c1eacb5d999cc73f1bb521)
---
 source3/script/tests/selftest.sh | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 5cec6d6d03..15e48b00ef 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -293,15 +293,6 @@ START=`date`
  bin/smbclient $CONFIGURATION -L $SERVER_IP -U% -p 139 | head -2
  MAKE_TEST_BINARY=""
 
- MAKE_TEST_BINARY="bin/net"
- printf "%s" "GIVING USER ${USERNAME} ADMINISTRATIVE RIGHTS..."
- bin/net -s $SERVERCONFFILE sam createbuiltingroup \
-   Administrators > /dev/null 2>&1 ||  exit 1
- bin/net -s $SERVERCONFFILE sam addmem \
-   BUILTIN\\Administrators $USERNAME > /dev/null 2>&1 || exit 1
- echo "DONE"
- MAKE_TEST_BINARY=""
-
  failed=0
 
  . $SCRIPTDIR/tests_$SUBTESTS.sh
-- 
cgit 


From ba3eee6cf883a2692b313674829f9316f783ecde Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 17 Jun 2008 23:54:15 +0200
Subject: testsuite: give admin rights to testuser only for the "net rpc
 registry" test.

Remove the user from BUILTIN\Administrators at the end of the tests.
Note: BUILTIN\Administrators is not deletet at the end because that
functionality is not implemented.

Michael
(This used to be commit 1734f9305a38eff05f0147d9c7391ef34085e7b2)
---
 source3/script/tests/test_net_registry.sh | 41 +++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh
index b263ecbea6..4fe6db42d7 100755
--- a/source3/script/tests/test_net_registry.sh
+++ b/source3/script/tests/test_net_registry.sh
@@ -329,6 +329,41 @@ test_setvalue_twice()
 	${NETREG} setvalue ${KEY} ${VALNAME} ${VALTYPE2} ${VALVALUE2}
 }
 
+give_administrative_rights()
+{
+	bin/net -s $SERVERCONFFILE sam createbuiltingroup Administrators
+	if test "x$?" != "x0" ; then
+		echo "ERROR: creating builtin group Administrators"
+		false
+		return
+	fi
+
+	bin/net -s $SERVERCONFFILE sam addmem BUILTIN\\Administrators $USERNAME
+	if test "x$?" != "x0" ; then
+		echo "ERROR: adding user $USERNAME to BUILTIN\\Administrators"
+		false
+	else
+		true
+	fi
+}
+
+take_administrative_rights()
+{
+	bin/net -s $SERVERCONFFILE sam delmem BUILTIN\\Administrators $USERNAME
+	if test "x$?" != "x0" ; then
+		echo "ERROR: removing user $USERNAME from BUILTIN\\Administrators"
+		false
+	else
+		true
+	fi
+}
+
+if test "x${RPC}" = "xrpc" ; then
+testit "giving user ${USERNAME} administrative rights" \
+	give_administrative_rights || \
+	failed=`expr $failed +1`
+fi
+
 testit "enumerate HKLM" \
 	test_enumerate HKLM || \
 	failed=`expr $failed + 1`
@@ -396,5 +431,11 @@ testit "delete key with value" \
 	test_deletekey HKLM/testkey || \
 	failed=`expr $failed + 1`
 
+if test "x${RPC}" = "xrpc" ; then
+testit "taking administrative rights from user ${USERNAME}" \
+	take_administrative_rights || \
+	failed=`expr $failed +1`
+fi
+
 testok $0 $failed
 
-- 
cgit 


From 809b992b17fa225abbef1ef146104302102d5e1e Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Thu, 19 Jun 2008 11:59:55 +0200
Subject: Fix typo (This used to be commit
 2eef2c682c18ad37b78214c755b9dd7c8b607cb8)

---
 source3/script/tests/test_net_misc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_net_misc.sh b/source3/script/tests/test_net_misc.sh
index 3ceb087885..0a0636ac8a 100755
--- a/source3/script/tests/test_net_misc.sh
+++ b/source3/script/tests/test_net_misc.sh
@@ -34,7 +34,7 @@ testit "get the system time" \
 	test_time system || \
 	failed=`expr $failed + 1`
 
-testit "get the tize zone" \
+testit "get the time zone" \
 	test_time zone || \
 	failed=`expr $failed + 1`
 
-- 
cgit 


From b0c3f1459d45e6cd923811e993b994f7905f7eda Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Thu, 19 Jun 2008 13:52:49 +0200
Subject: testsuite: update introductory comment to test_net_regsistry.sh

This is now used to test rpc and local access depending on
command line parameters.

Michael
(This used to be commit 73c17b630317b5019e5d5f2b989b8de081a73e07)
---
 source3/script/tests/test_net_registry.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh
index 4fe6db42d7..b6d27970cc 100755
--- a/source3/script/tests/test_net_registry.sh
+++ b/source3/script/tests/test_net_registry.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-# tests for the "net registry" command - local access to the registry db
+# Tests for the "net registry" and "net rpc registry" commands.
+# rpc tests are chose by specifying "rpc" as commandline parameter.
 
 RPC="$1"
 
-- 
cgit 


From 24de341973b7325b0f15dc01317bf6ae60b2196f Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Thu, 19 Jun 2008 17:14:39 +0200
Subject: testsuite: add a testparm_s3 test script.

This is a first testparm/lp_load test that runs testparm on a couple
of configuration files. The main purpose for now is to test the options
that have special handlers (to check whether the handlers succeed).
In particular, all the Macro expansions that are available via
alloc_sub_basic() are tested with the include handler. This is to
catch such crashbugs as #5548 where %m expansion led to a segfault.

The tests now are very simple. Just check if testparm completes
successfully on the given config files. This can (and should) be
elaborated in the future.

Michael
(This used to be commit eb28146d40b8a8bc2c20b8d222abf191ea178d5a)
---
 source3/script/tests/test_testparm_s3.sh | 90 ++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100755 source3/script/tests/test_testparm_s3.sh

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_testparm_s3.sh b/source3/script/tests/test_testparm_s3.sh
new file mode 100755
index 0000000000..f1316e922c
--- /dev/null
+++ b/source3/script/tests/test_testparm_s3.sh
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# Tests for lp_load() via testparm.
+#
+# The main purpose (for now) is to test all the special handlers
+# and the macro expansions.
+
+TEMP_CONFFILE=${LIBDIR}/smb.conf.tmp
+TESTPARM="$VALGRIND ${TESTPARM:-$BINDIR/testparm} --suppress-prompt"
+
+incdir=`dirname $0`
+. $incdir/test_functions.sh
+
+failed=0
+
+test_include_expand_macro()
+{
+	MACRO=$1
+	rm -f ${TEMP_CONFFILE}
+	cat >${TEMP_CONFFILE}<<EOF
+[global]
+	include = ${TEMP_CONFFILE}.%${MACRO}
+EOF
+	${TESTPARM} ${TEMP_CONFFILE}
+}
+
+test_one_global_option()
+{
+	OPTION=$1
+	rm -f ${TEMP_CONFFILE}
+	cat > ${TEMP_CONFFILE}<<EOF
+[global]
+	${OPTION}
+EOF
+	${TESTPARM} ${TEMP_CONFFILE}
+}
+
+test_copy()
+{
+	rm -f ${TEMP_CONFFILE}
+	cat > ${TEMP_CONFFILE}<<EOF
+[share1]
+	path = /tmp
+	read only = no
+
+[share2]
+	copy = share1
+EOF
+	${TESTPARM} ${TEMP_CONFFILE}
+}
+
+
+testit "netbios name" \
+	test_one_global_option "netbios name = funky" || \
+	failed=`expr ${failed} + 1`
+
+testit "netbios aliases" \
+	test_one_global_option "netbios aliases = funky1 funky2 funky3" || \
+	failed=`expr ${failed} + 1`
+
+testit "netbios scope" \
+	test_one_global_option "netbios scope = abc" || \
+	failed=`expr ${failed} + 1`
+
+testit "workgroup" \
+	test_one_global_option "workgroup = samba" || \
+	failed=`expr ${failed} + 1`
+
+testit "display charset" \
+	test_one_global_option "display charset = UTF8" || \
+	failed=`expr ${failed} + 1`
+
+testit "ldap debug level" \
+	test_one_global_option "ldap debug level = 7" || \
+	failed=`expr ${failed} + 1`
+
+for LETTER in U G D I i L N M R T a d h m v w V ; do
+testit "include with %${LETTER} macro expansion" \
+	test_include_expand_macro "${LETTER}" || \
+	failed=`expr ${failed} + 1`
+done
+
+testit "copy" \
+	test_copy || \
+	failed=`expr ${failed} + 1`
+
+rm -f ${TEMP_CONFFILE}
+
+testok $0 ${failed}
+
-- 
cgit 


From 0f32b220317de40cbcb285361f9457164cd10323 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Thu, 19 Jun 2008 17:19:21 +0200
Subject: testsuite: enable the testparm_s3 tests.

Michael
(This used to be commit 0f5c13e5735990f4325f98156a7dc410276372fe)
---
 source3/script/tests/tests_all.sh | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index fa62a5129c..e44ec8b3c4 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -48,6 +48,12 @@ net_s3() {
 	|| failed=`expr $failed + $?`
 }
 
+testparm_s3() {
+	echo "RUNNING TESTS testparm_s3"
+	$SCRIPTDIR/test_testparm_s3.sh \
+	|| failed=`expr $failed +$?`
+}
+
 posix_s3() {
 	echo "RUNNING TESTS posix_s3"
 	eval "$LIB_PATH_VAR="\$SAMBA4SHAREDDIR:\$$LIB_PATH_VAR"; export $LIB_PATH_VAR"
@@ -76,6 +82,7 @@ if test "x$TESTS" = "x" ; then
 	wbinfo_s3
 	ntlm_auth_s3
 	net_s3
+	testparm_s3
 	posix_s3
 else
 	for THIS_TEST in $TESTS; do
-- 
cgit 


From b65d497c33058a1613421ee19981089ad1f1cfab Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Wed, 9 Jul 2008 00:33:14 +0200
Subject: testsuite: fix expr typo in net registry testscript.

Michael
(This used to be commit 5b6c32160a5d8fafc807fbefb66aa8c98662baae)
---
 source3/script/tests/test_net_registry.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh
index b6d27970cc..0c26527aa5 100755
--- a/source3/script/tests/test_net_registry.sh
+++ b/source3/script/tests/test_net_registry.sh
@@ -402,7 +402,7 @@ testit "delete^2 key" \
 
 testit "enumerate nonexisting key" \
 	test_enumerate_nonexisting HKLM/testkey || \
-	failed=`expr $failed +1`
+	failed=`expr $failed + 1`
 
 testit "create key with subkey" \
 	test_createkey_with_subkey HKLM/testkey/subkey || \
-- 
cgit 


From 733cf7602670d6762dd9aa85d3332f6e10ee78cd Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Wed, 9 Jul 2008 00:33:54 +0200
Subject: testsuite: fix another expr typo in net registry test script.

Michael
(This used to be commit 73312e4e21b6d14363bd0987e0c9716c4ec91834)
---
 source3/script/tests/test_net_registry.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh
index 0c26527aa5..0f29b25019 100755
--- a/source3/script/tests/test_net_registry.sh
+++ b/source3/script/tests/test_net_registry.sh
@@ -435,7 +435,7 @@ testit "delete key with value" \
 if test "x${RPC}" = "xrpc" ; then
 testit "taking administrative rights from user ${USERNAME}" \
 	take_administrative_rights || \
-	failed=`expr $failed +1`
+	failed=`expr $failed + 1`
 fi
 
 testok $0 $failed
-- 
cgit 


From 9978cc6c23ef6591f0be93b244f89ad6a8454346 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 15 Jul 2008 00:27:01 +0200
Subject: testsuite: fix bug #5594 by using the new --skip-global-ckecks switch

Michael
(This used to be commit 32f4b1443af12026c419684be45a7d8b96ccfaac)
---
 source3/script/tests/test_testparm_s3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_testparm_s3.sh b/source3/script/tests/test_testparm_s3.sh
index f1316e922c..875f138f87 100755
--- a/source3/script/tests/test_testparm_s3.sh
+++ b/source3/script/tests/test_testparm_s3.sh
@@ -6,7 +6,7 @@
 # and the macro expansions.
 
 TEMP_CONFFILE=${LIBDIR}/smb.conf.tmp
-TESTPARM="$VALGRIND ${TESTPARM:-$BINDIR/testparm} --suppress-prompt"
+TESTPARM="$VALGRIND ${TESTPARM:-$BINDIR/testparm} --suppress-prompt --skip-global-checks"
 
 incdir=`dirname $0`
 . $incdir/test_functions.sh
-- 
cgit 


From 7cc155bdc11bed7564b1ee5564b358ff6a337459 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 15 Jul 2008 12:52:25 +0200
Subject: testparm: rename -g|--skip-global-ckecks to -l|--skip-logic-checks

as suggested by Karolin.

That is what it really means. And per-share logic tests will be
disabled by the same switch, too...

Michael
(This used to be commit 5b8a4c33482917a1ef7071df224957ba831d853a)
---
 source3/script/tests/test_testparm_s3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_testparm_s3.sh b/source3/script/tests/test_testparm_s3.sh
index 875f138f87..0962ca0764 100755
--- a/source3/script/tests/test_testparm_s3.sh
+++ b/source3/script/tests/test_testparm_s3.sh
@@ -6,7 +6,7 @@
 # and the macro expansions.
 
 TEMP_CONFFILE=${LIBDIR}/smb.conf.tmp
-TESTPARM="$VALGRIND ${TESTPARM:-$BINDIR/testparm} --suppress-prompt --skip-global-checks"
+TESTPARM="$VALGRIND ${TESTPARM:-$BINDIR/testparm} --suppress-prompt --skip-logic-checks"
 
 incdir=`dirname $0`
 . $incdir/test_functions.sh
-- 
cgit 


From a197e2571331af804d4025535bb660ecc06ca008 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sun, 20 Jul 2008 23:49:40 +0200
Subject: testsuite: fix expr syntax error in net registry test.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Pointed out by Björn Jacke <bj@sernet.de>.

Michael
(This used to be commit 87e02bca04cb26d0d237f3ccd17be0ba2dd6d85f)
---
 source3/script/tests/test_net_registry.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh
index 0f29b25019..5edcb061ee 100755
--- a/source3/script/tests/test_net_registry.sh
+++ b/source3/script/tests/test_net_registry.sh
@@ -362,7 +362,7 @@ take_administrative_rights()
 if test "x${RPC}" = "xrpc" ; then
 testit "giving user ${USERNAME} administrative rights" \
 	give_administrative_rights || \
-	failed=`expr $failed +1`
+	failed=`expr $failed + 1`
 fi
 
 testit "enumerate HKLM" \
-- 
cgit 


From eac08b0fc5ef4fc4efc9f84910280b0a628276ee Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 21 Jul 2008 11:17:36 +0200
Subject: testsuite: fix another expr syntax error. in tests_all.sh.

Michael
(This used to be commit 486b1bc5b5021565ec443fd463c8287c02c686b3)
---
 source3/script/tests/tests_all.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index e44ec8b3c4..ffe1c91284 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -51,7 +51,7 @@ net_s3() {
 testparm_s3() {
 	echo "RUNNING TESTS testparm_s3"
 	$SCRIPTDIR/test_testparm_s3.sh \
-	|| failed=`expr $failed +$?`
+	|| failed=`expr $failed + $?`
 }
 
 posix_s3() {
-- 
cgit 


From 739e9cfbe0b5eff80bdcba1cf10bd5bfe6873d6a Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 21 Jul 2008 11:23:55 +0200
Subject: testsuite: fix expr error on Tru64, triggered by uninitialized failed
 variable.

Michael
(This used to be commit 25cd227aaecf91dfa3114ae0fd2b47c783434aad)
---
 source3/script/tests/tests_all.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source3/script/tests')

diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh
index ffe1c91284..2b46da0e77 100755
--- a/source3/script/tests/tests_all.sh
+++ b/source3/script/tests/tests_all.sh
@@ -73,6 +73,8 @@ posix_s3() {
 	fi
 }
 
+failed=0
+
 if test "x$TESTS" = "x" ; then
 	local_s3
 	smbtorture_s3
-- 
cgit