[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Tue Feb 8 14:17:02 MST 2011
The branch, master has been updated
via 698d339 selftest: remove make oldtest.
via 4806714 s3-selftest: let valgrindtest use the new make test.
via 587cfd1 waf: bring back shared Makefile and configure (needed by s3-waf).
from 8b64d06 s3-spoolss: Dont wipe out all drivers when only one should be deleted.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 698d339ffd8abf59f0f000d4155241c267975c68
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 8 14:56:32 2011 +0100
selftest: remove make oldtest.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Tue Feb 8 22:16:31 CET 2011 on sn-devel-104
commit 480671481e69f0646ab78086dc275f798f713af6
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 8 14:55:12 2011 +0100
s3-selftest: let valgrindtest use the new make test.
Guenther
commit 587cfd1832d297a1a7e472e20889da356f9e6815
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 8 20:44:55 2011 +0100
waf: bring back shared Makefile and configure (needed by s3-waf).
Guenther
Revert "build: removed unused build scripts"
This reverts commit 2e520ca91180920e4c8b71be4eaa7fabb56d2a12.
-----------------------------------------------------------------------
Summary of changes:
Makefile => buildtools/scripts/Makefile.waf | 19 +-
{source3 => buildtools/scripts}/autogen-waf.sh | 4 +-
.../configure => buildtools/scripts/configure.waf | 4 +-
source3/Makefile.in | 9 +-
source3/script/tests/selftest.sh | 513 --------------------
5 files changed, 14 insertions(+), 535 deletions(-)
copy Makefile => buildtools/scripts/Makefile.waf (74%)
copy {source3 => buildtools/scripts}/autogen-waf.sh (83%)
copy source4/configure => buildtools/scripts/configure.waf (81%)
delete mode 100755 source3/script/tests/selftest.sh
Changeset truncated at 500 lines:
diff --git a/Makefile b/buildtools/scripts/Makefile.waf
similarity index 74%
copy from Makefile
copy to buildtools/scripts/Makefile.waf
index cbbf045..716ab93 100644
--- a/Makefile
+++ b/buildtools/scripts/Makefile.waf
@@ -1,6 +1,6 @@
# simple makefile wrapper to run waf
-WAF_BINARY=./buildtools/bin/waf
+WAF_BINARY=BUILDTOOLS/bin/waf
WAF=WAF_MAKE=1 $(WAF_BINARY)
all:
@@ -19,9 +19,6 @@ help:
@echo NOTE: to run extended waf options use $(WAF_BINARY) or modify your PATH
$(WAF) --help
-subunit-test:
- $(WAF) test --filtered-subunit $(TEST_OPTIONS)
-
testenv:
$(WAF) test --testenv $(TEST_OPTIONS)
@@ -29,12 +26,10 @@ quicktest:
$(WAF) test --quick $(TEST_OPTIONS)
dist:
- touch .tmplock
- WAFLOCK=.tmplock $(WAF) dist
+ $(WAF) dist
distcheck:
- touch .tmplock
- WAFLOCK=.tmplock $(WAF) distcheck
+ $(WAF) distcheck
clean:
$(WAF) clean
@@ -66,10 +61,12 @@ etags:
ctags:
$(WAF) ctags
-# this allows for things like "make bin/smbtorture"
bin/%:: FORCE
$(WAF) --targets=`basename $@`
FORCE:
-pydoctor:
- $(WAF) pydoctor
+configure: autogen-waf.sh BUILDTOOLS/scripts/configure.waf
+ ./autogen-waf.sh
+
+Makefile: autogen-waf.sh configure BUILDTOOLS/scripts/Makefile.waf
+ ./autogen-waf.sh
diff --git a/source3/autogen-waf.sh b/buildtools/scripts/autogen-waf.sh
similarity index 83%
copy from source3/autogen-waf.sh
copy to buildtools/scripts/autogen-waf.sh
index 432b523..7a6e94c 100755
--- a/source3/autogen-waf.sh
+++ b/buildtools/scripts/autogen-waf.sh
@@ -22,6 +22,6 @@ sed "s|BUILDTOOLS|$d|g" < "$p/$d/scripts/Makefile.waf" > $p/Makefile
echo "done. Now run $p/configure or $p/configure.developer then make."
if [ $p != "." ]; then
- echo "Notice: The build invoke path is not 'source3'! Use make with the parameter"
- echo "-C <'source3' path>. Example: make -C source3 all"
+ echo "Notice: The build invoke path is not 'source4'! Use make with the parameter"
+ echo "-C <'source4' path>. Example: make -C source4 all"
fi
diff --git a/source4/configure b/buildtools/scripts/configure.waf
similarity index 81%
copy from source4/configure
copy to buildtools/scripts/configure.waf
index fbd81fe..a7d8d1d 100755
--- a/source4/configure
+++ b/buildtools/scripts/configure.waf
@@ -2,13 +2,13 @@
PREVPATH=`dirname $0`
-WAF=../buildtools/bin/waf
+WAF=BUILDTOOLS/bin/waf
# using JOBS=1 gives maximum compatibility with
# systems like AIX which have broken threading in python
JOBS=1
export JOBS
-cd . || exit 1
+cd BUILDPATH || exit 1
$WAF configure "$@" || exit 1
cd $PREVPATH
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 2055a6e..15d854e 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3402,18 +3402,13 @@ test_pam_modules:: pam_modules
TEST_EXTRA_ARGS = ${smbtorture4_option} ${selftest_shrdir} ${selftest_custom_conf}
-oldtest:: all torture timelimit
- @echo Running Test suite
- @LIB_PATH_VAR=$(LIB_PATH_VAR) PERL="$(PERL)" NSS_WRAPPER_WINBIND_SO_PATH="$(srcdir)/@WINBIND_NSS@" $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all ${TEST_EXTRA_ARGS}
-
valgrindtest:: all torture timelimit
@echo Running Test suite with valgrind
- @LIB_PATH_VAR=$(LIB_PATH_VAR) \
+ @$(MAKE) test \
NMBD_VALGRIND="xterm -n nmbd -e valgrind -q --db-attach=yes --num-callers=30" \
WINBINDD_VALGRIND="xterm -n winbindd -e valgrind -q --db-attach=yes --num-callers=30" \
SMBD_VALGRIND="xterm -n smbd -e valgrind -q --db-attach=yes --num-callers=30" \
- VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \
- PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all ${TEST_EXTRA_ARGS}
+ VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log"
selftestdir = ../selftest
diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
deleted file mode 100755
index 3da4fac..0000000
--- a/source3/script/tests/selftest.sh
+++ /dev/null
@@ -1,513 +0,0 @@
-#!/bin/sh
-
-if [ $# -lt 2 ]; then
- echo "$0 <directory> <all | quick> [-t <smbtorture4>] [-s <shrdir>] " \
- "[-c <custom conf>]"
- exit 1
-fi
-
-##
-## Setup the required args
-##
-DIRECTORY=$1; shift;
-SUBTESTS=$1; shift;
-
-##
-## Parse oprtional args
-##
-while getopts s:c:t: f
-do
- case $f in
- t) SMBTORTURE4=$OPTARG;;
- s) ALT_SHRDIR_ARG=$OPTARG;;
- c) CUSTOM_CONF_ARG=$OPTARG;;
- esac
-done
-
-echo "Running selftest with the following"
-echo "Selftest Directory: $DIRECTORY"
-echo "Subtests to Run: $SUBTESTS"
-echo "smbtorture4 Path: $SMBTORTURE4"
-echo "Alternative Share Dir: $ALT_SHRDIR_ARG"
-echo "Custom Configuration: $CUSTOM_CONF_ARG"
-
-if [ $CUSTOM_CONF_ARG ]; then
- INCLUDE_CUSTOM_CONF="include = $CUSTOM_CONF_ARG"
-fi
-
-##
-## create the test directory layout
-##
-PREFIX=`echo $DIRECTORY | sed s+//+/+`
-printf "%s" "CREATE TEST ENVIRONMENT IN '$PREFIX'"...
-/bin/rm -rf $PREFIX
-if [ -e "$PREFIX" ]; then
- echo "***"
- echo "*** Failed to delete test environment $PREFIX"
- echo "*** Was a previous run done as root ?"
- echo "***"
- exit 1
-fi
-
-##
-## create the test directory
-##
-mkdir -p $PREFIX || exit $?
-OLD_PWD=`pwd`
-cd $PREFIX || exit $?
-PREFIX_ABS=`pwd`
-cd $OLD_PWD
-
-if [ -z "$TORTURE_MAXTIME" ]; then
- TORTURE_MAXTIME=300
-fi
-export TORTURE_MAXTIME
-
-##
-## setup the various environment variables we need
-##
-
-WORKGROUP=SAMBA-TEST
-SERVER=localhost2
-SERVER_IP=127.0.0.2
-if [ ! "x$USER" = "x" ]; then
- USERNAME=$USER
-else
- if [ ! "x$LOGNAME" = "x" ]; then
- USERNAME=$LOGNAME
- else
- USERNAME=`PATH=/usr/ucb:$PATH whoami || id -un`
- fi
-fi
-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=testPw
-
-SRCDIR="`dirname $0`/../.."
-BINDIR="`pwd`/bin"
-SCRIPTDIR=$SRCDIR/script/tests
-LIBDIR=$PREFIX_ABS/lib
-VFS_MODULESDIR=$BINDIR
-PIDDIR=$PREFIX_ABS/pid
-CONFFILE=$LIBDIR/client.conf
-SAMBA4CONFFILE=$LIBDIR/samba4client.conf
-SERVERCONFFILE=$LIBDIR/server.conf
-COMMONCONFFILE=$LIBDIR/common.conf
-PRIVATEDIR=$PREFIX_ABS/private
-NCALRPCDIR=$PREFIX_ABS/ncalrpc
-LOCKDIR=$PREFIX_ABS/lockdir
-EVENTLOGDIR=$LOCKDIR/eventlog
-LOGDIR=$PREFIX_ABS/logs
-SOCKET_WRAPPER_DIR=$PREFIX_ABS/sw
-CONFIGURATION="--configfile $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
-TEST_DIRECTORY=$DIRECTORY
-
-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
-export WORKGROUP SERVER SERVER_IP
-export NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
-export WINBINDD_SOCKET_DIR WINBINDD_PRIV_PIPE_DIR
-export TEST_DIRECTORY
-
-PATH=bin:$PATH
-export PATH
-
-if [ $SMBTORTURE4 ]; then
- SAMBA4BINDIR=`dirname $SMBTORTURE4`
-fi
-
-SAMBA4SHAREDDIR="$SAMBA4BINDIR/shared"
-
-export SAMBA4SHAREDDIR
-export SMBTORTURE4
-
-if [ -z "$LIB_PATH_VAR" ] ; then
- echo "Warning: LIB_PATH_VAR not set. Using best guess LD_LIBRARY_PATH." >&2
- LIB_PATH_VAR=LD_LIBRARY_PATH
- export LIB_PATH_VAR
-fi
-
-eval $LIB_PATH_VAR=$BINDIR:$SAMBA4SHAREDDIR:\$$LIB_PATH_VAR
-export $LIB_PATH_VAR
-
-##
-## 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
-
-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
-
-
-mkdir -p $PRIVATEDIR $NCALRPCDIR $LIBDIR $PIDDIR $LOCKDIR $LOGDIR $EVENTLOGDIR
-mkdir -p $SOCKET_WRAPPER_DIR
-mkdir -p $WINBINDD_SOCKET_DIR
-chmod 755 $WINBINDD_SOCKET_DIR
-
-##
-## Create an alternate shrdir if one was specified.
-##
-if [ $ALT_SHRDIR_ARG ]; then
- ALT_SHRDIR=`echo $ALT_SHRDIR_ARG | sed s+//+/+`
- mkdir -p $ALT_SHRDIR || exit $?
- OLD_PWD=`pwd`
- cd $ALT_SHRDIR || exit $?
- SHRDIR=`pwd`
- cd $OLD_PWD
- /bin/rm -rf $SHRDIR/*
-else
- SHRDIR=$PREFIX_ABS/tmp
- mkdir -p $SHRDIR
-fi
-chmod 777 $SHRDIR
-
-LOCAL_PATH=$SHRDIR
-export LOCAL_PATH
-
-##
-## Create driver share dirs
-##
-mkdir $SHRDIR/W32X86
-mkdir $SHRDIR/x64
-mkdir $SHRDIR/WIN40
-
-##
-## Create a read-only directory.
-##
-RO_SHRDIR=`echo $SHRDIR | sed -e 's:/[^/]*$::'`
-RO_SHRDIR=$RO_SHRDIR/root-tmp
-mkdir -p $RO_SHRDIR
-chmod 755 $RO_SHRDIR
-touch $RO_SHRDIR/unreadable_file
-chmod 600 $RO_SHRDIR/unreadable_file
-##
-## Create an MS-DFS root share.
-##
-MSDFS_SHRDIR=`echo $SHRDIR | sed -e 's:/[^/]*$::'`
-MSDFS_SHRDIR=$MSDFS_SHRDIR/msdfsshare
-mkdir -p $MSDFS_SHRDIR
-chmod 777 $MSDFS_SHRDIR
-mkdir -p $MSDFS_SHRDIR/deeppath
-chmod 777 $MSDFS_SHRDIR/deeppath
-## Create something visible in the target.
-touch $RO_SHRDIR/msdfs-target
-chmod 666 $RO_SHRDIR/msdfs-target
-ln -s msdfs:$SERVER_IP\\ro-tmp $MSDFS_SHRDIR/msdfs-src1
-ln -s msdfs:$SERVER_IP\\ro-tmp $MSDFS_SHRDIR/deeppath/msdfs-src2
-
-##
-## Create the common config include file with the basic settings
-##
-
-cat >$COMMONCONFFILE<<EOF
- workgroup = $WORKGROUP
-
- private dir = $PRIVATEDIR
- pid directory = $PIDDIR
- lock directory = $LOCKDIR
- log file = $LOGDIR/log.%m
- log level = 0
-
- 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 = TORTURE_6
- interfaces = $TORTURE_INTERFACES
- panic action = $SCRIPTDIR/gdb_backtrace %d %\$(MAKE_TEST_BINARY)
- include = $COMMONCONFFILE
-
- passdb backend = tdbsam
-EOF
-
-cat >$SAMBA4CONFFILE<<EOF
-[global]
- netbios name = TORTURE_6
- interfaces = $TORTURE_INTERFACES
- panic action = $SCRIPTDIR/gdb_backtrace %PID% %PROG%
- include = $COMMONCONFFILE
- modules dir = $SRCDIR/bin/modules
- ncalrpc dir = $NCALRPCDIR
-EOF
-
-##
-## calculate uids and gids
-##
-
-if [ $USERID -lt $(( 0xffff - 2 )) ]; then
- MAXUID=0xffff
-else
- MAXUID=$USERID
-fi
-
-UID_ROOT=$(( $MAXUID - 1 ))
-UID_NOBODY=$(( MAXUID - 2 ))
-
-if [ $GROUPID -lt $(( 0xffff - 3 )) ]; then
- MAXGID=0xffff
-else
- MAXGID=$GROUPID
-fi
-
-GID_NOBODY=$(( $MAXGID - 3 ))
-GID_NOGROUP=$(( $MAXGID - 2 ))
-GID_ROOT=$(( $MAXGID - 1 ))
-
-cat >$SERVERCONFFILE<<EOF
-[global]
- netbios name = $SERVER
- interfaces = $SERVER_IP/8
- bind interfaces only = yes
- panic action = $SCRIPTDIR/gdb_backtrace %d %\$(MAKE_TEST_BINARY)
- include = $COMMONCONFFILE
-
- state directory = $LOCKDIR
- cache directory = $LOCKDIR
-
- passdb backend = tdbsam
-
- domain master = yes
- domain logons = yes
- lanman auth = yes
- time server = yes
-
- add user script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --passwd_path $NSS_WRAPPER_PASSWD --type passwd --action add --name %u --gid $GID_NOGROUP
- add group script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --group_path $NSS_WRAPPER_GROUP --type group --action add --name %g
- add user to group script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --group_path $NSS_WRAPPER_GROUP --type member --action add --name %g --member %u --passwd_path $NSS_WRAPPER_PASSWD
- add machine script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --passwd_path $NSS_WRAPPER_PASSWD --type passwd --action add --name %u --gid $GID_NOGROUP
- delete user script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --passwd_path $NSS_WRAPPER_PASSWD --type passwd --action delete --name %u
- delete group script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --group_path $NSS_WRAPPER_GROUP --type group --action delete --name %g
- delete user from group script = $PERL $SRCDIR/../lib/nss_wrapper/nss_wrapper.pl --group_path $NSS_WRAPPER_GROUP --type member --action delete --name %g --member %u --passwd_path $NSS_WRAPPER_PASSWD
-
- addprinter command = $PERL $SRCDIR/../source3/script/tests/printing/modprinter.pl -a -s $SERVERCONFFILE --
- deleteprinter command = $PERL $SRCDIR/../source3/script/tests/printing/modprinter.pl -d -s $SERVERCONFFILE --
-
- eventlog list = "dns server" application
- kernel oplocks = no
- kernel change notify = no
-
- syslog = no
- printing = bsd
- printcap name = /dev/null
-
- winbindd:socket dir = $WINBINDD_SOCKET_DIR
- idmap uid = 100000-200000
- idmap gid = 100000-200000
- winbind enum users = yes
- winbind enum groups = yes
-
-# min receivefile size = 4000
-
- max protocol = SMB2
- read only = no
- smbd:sharedelay = 100000
-# smbd:writetimeupdatedelay = 500000
- map hidden = no
- map system = no
- map readonly = no
- store dos attributes = yes
- create mask = 755
- vfs objects = $VFS_MODULESDIR/xattr_tdb.so $VFS_MODULESDIR/streams_depot.so
-
- printing = vlp
- print command = $BINDIR/vlp tdbfile=$LOCKDIR/vlp.tdb print %p %s
- lpq command = $BINDIR/vlp tdbfile=$LOCKDIR/vlp.tdb lpq %p
- lp rm command = $BINDIR/vlp tdbfile=$LOCKDIR/vlp.tdb lprm %p %j
- lp pause command = $BINDIR/vlp tdbfile=$LOCKDIR/vlp.tdb lppause %p %j
- lp resume command = $BINDIR/vlp tdbfile=$LOCKDIR/vlp.tdb lpresume %p %j
- queue pause command = $BINDIR/vlp tdbfile=$LOCKDIR/vlp.tdb queuepause %p
- queue resume command = $BINDIR/vlp tdbfile=$LOCKDIR/vlp.tdb queueresume %p
- lpq cache time = 0
-
- rpc_server:epmapper = embedded
-
- #Include user defined custom parameters if set
- $INCLUDE_CUSTOM_CONF
-
-[tmp]
- path = $SHRDIR
-[ro-tmp]
- path = $RO_SHRDIR
- guest ok = yes
-[msdfs-share]
- path = $MSDFS_SHRDIR
- msdfs root = yes
- guest ok = yes
-[hideunread]
- copy = tmp
- hide unreadable = yes
-[tmpcase]
- copy = tmp
- case sensitive = yes
-[hideunwrite]
- copy = tmp
- hide unwriteable files = yes
-[print1]
- copy = tmp
- printable = yes
-
-[print2]
- copy = print1
--
Samba Shared Repository
More information about the samba-cvs
mailing list