The branch, master has been updated via f36e51617c7bd316f3ef393532bbc169895d6a66 (commit) via 4ba0453c3ca98ed0ac27e4aa04d36d0bdc42f9e8 (commit) via 8ac2da0d0947c3dcfc9c1e7b38739fece395642d (commit) via e422f638bc3b3780bf5784b1ce218d3e87d068cf (commit) from fe02004865144dd5061a6cc9889bef6195de995e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit f36e51617c7bd316f3ef393532bbc169895d6a66 Author: Jelmer Vernooij <[EMAIL PROTECTED]> Date: Tue Oct 21 18:49:43 2008 +0200 Don't include a (relative path) srcdir in samba4-data.mk. commit 4ba0453c3ca98ed0ac27e4aa04d36d0bdc42f9e8 Author: Jelmer Vernooij <[EMAIL PROTECTED]> Date: Tue Oct 21 18:33:38 2008 +0200 Fix AC_SEARCH_LIBS_EXT() usage. commit 8ac2da0d0947c3dcfc9c1e7b38739fece395642d Author: Jelmer Vernooij <[EMAIL PROTECTED]> Date: Tue Oct 21 18:26:46 2008 +0200 Allow running individual tests in the testsuite, normalize test names, fix some tests. commit e422f638bc3b3780bf5784b1ce218d3e87d068cf Author: Jelmer Vernooij <[EMAIL PROTECTED]> Date: Tue Oct 21 17:48:05 2008 +0200 Use socket wrapper for selftest.pl, find binaries correctly. ----------------------------------------------------------------------- Summary of changes: lib/replace/crypt.m4 | 5 ++--- selftest/selftest.pl | 9 ++++----- source3/Makefile.in | 14 +++++++++++--- source3/samba4.m4 | 2 +- source3/samba4.mk | 6 +++--- source3/selftest/skip | 15 +++++++++++++++ source3/selftest/tests.sh | 20 +++++++++++++++++++- 7 files changed, 55 insertions(+), 16 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/replace/crypt.m4 b/lib/replace/crypt.m4 index 4e90866..684c351 100644 --- a/lib/replace/crypt.m4 +++ b/lib/replace/crypt.m4 @@ -1,7 +1,6 @@ ############################################### # test for where we get crypt() from AC_CHECK_HEADERS(crypt.h) -AC_SEARCH_LIBS_EXT(crypt, [crypt], - [test "$ac_cv_search_ext_crypt" = "none required" || CRYPT_LIBS="-lcrypt" - AC_DEFINE(HAVE_CRYPT,1,[Whether the system has the crypt() function])], +AC_SEARCH_LIBS_EXT(crypt, [crypt], CRYPT_LIBS, + [ AC_DEFINE(HAVE_CRYPT,1,[Whether the system has the crypt() function]) ], [ LIBREPLACEOBJ="${LIBREPLACEOBJ} crypt.o" ]) diff --git a/selftest/selftest.pl b/selftest/selftest.pl index b1908d4..96b58cc 100755 --- a/selftest/selftest.pl +++ b/selftest/selftest.pl @@ -300,14 +300,12 @@ Target Specific: --socket-wrapper-keep-pcap keep all pcap files, not just those for tests that failed --socket-wrapper enable socket wrapper + --bindir=PATH path to target binaries --expected-failures=FILE specify list of tests that is guaranteed to fail Samba4 Specific: --ldap=openldap|fedora-ds back samba onto specified ldap server -Samba3 Specific: - --bindir=PATH path to binaries - Kvm Specific: --image=PATH path to KVM image @@ -447,12 +445,13 @@ if ($opt_target eq "samba4") { require target::Samba4; $target = new Samba4($opt_bindir or "$srcdir/bin", $ldap, "$srcdir/setup"); } elsif ($opt_target eq "samba3") { - if ($opt_socket_wrapper and `$opt_bindir/smbd -b | grep SOCKET_WRAPPER` eq "") { + my $bindir = ($opt_bindir or "$srcdir/bin"); + if ($opt_socket_wrapper and `$bindir/smbd -b | grep SOCKET_WRAPPER` eq "") { die("You must include --enable-socket-wrapper when compiling Samba in order to execute 'make test'. Exiting...."); } $testenv_default = "dc"; require target::Samba3; - $target = new Samba3($opt_bindir); + $target = new Samba3($bindir); } elsif ($opt_target eq "win") { die("Windows tests will not run with socket wrapper enabled.") if ($opt_socket_wrapper); diff --git a/source3/Makefile.in b/source3/Makefile.in index ac330b3..25c3a59 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -1154,9 +1154,11 @@ RPC_OPEN_TCP_OBJ = torture/rpc_open_tcp.o \ ###################################################################### # now the rules... ###################################################################### -all:: SHOWFLAGS libs $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \ +all:: SHOWFLAGS basics libs $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \ $(MODULES) $(NSS_MODULES) $(PAM_MODULES) @EXTRA_ALL_TARGETS@ +basics:: + nss_modules:: $(NSS_MODULES) pam_modules:: $(PAM_MODULES) @@ -1167,7 +1169,7 @@ pam_winbind: SHOWFLAGS bin/[EMAIL PROTECTED]@ gpext_modules:: $(GPEXT_MODULES) -torture:: SHOWFLAGS $(TORTURE_PROGS) +torture:: SHOWFLAGS basics $(TORTURE_PROGS) smbtorture : SHOWFLAGS bin/[EMAIL PROTECTED]@ @@ -2807,11 +2809,17 @@ valgrindtest:: all torture timelimit VALGRIND="valgrind -q --num-callers=30 --log-file=${selftest_prefix}/valgrind.log" \ PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all "${smbtorture4_path}" +SELFTEST_FORMAT = plain + selftest:: all torture timelimit @../selftest/selftest.pl --prefix=st --target=samba3 \ --testlist="$(srcdir)/selftest/tests.sh|" \ --expected-failures=$(srcdir)/selftest/knownfail \ - --exclude=$(srcdir)/selftest/skip + --exclude=$(srcdir)/selftest/skip \ + --socket-wrapper $(TESTS) --format=$(SELFTEST_FORMAT) + +selftest-%: + $(MAKE) selftest TESTS=$* # Check for Winbind struct 32/64bit padding test_wbpad: diff --git a/source3/samba4.m4 b/source3/samba4.m4 index ed49347..15fffb9 100644 --- a/source3/samba4.m4 +++ b/source3/samba4.m4 @@ -125,7 +125,7 @@ m4_include(nsswitch/config.m4) dnl Samba 4 files AC_SUBST(LD) AC_LIBREPLACE_SHLD_FLAGS -SMB_WRITE_MAKEVARS(samba4-config.mk, [prefix exec_prefix CPPFLAGS LDSHFLAGS POPT_OBJ CFLAGS TALLOC_OBJ POPT_LIBS]) +SMB_WRITE_MAKEVARS(samba4-config.mk, [prefix exec_prefix CPPFLAGS LDSHFLAGS POPT_OBJ CFLAGS TALLOC_OBJ POPT_LIBS srcdir builddir]) oldbuilddir="$builddir" builddir="$builddir/../source4" diff --git a/source3/samba4.mk b/source3/samba4.mk index 27fb210..5d1f0d1 100644 --- a/source3/samba4.mk +++ b/source3/samba4.mk @@ -158,6 +158,6 @@ clean:: proto:: $(PROTO_HEADERS) modules:: $(PLUGINS) -all:: basics bin/samba4 bin/regpatch4 bin/regdiff4 bin/regshell4 bin/regtree4 bin/smbclient4 -torture:: basics bin/smbtorture4 -everything:: basics $(patsubst %,%4,$(BINARIES)) +all:: bin/samba4 bin/regpatch4 bin/regdiff4 bin/regshell4 bin/regtree4 bin/smbclient4 +torture:: bin/smbtorture4 +everything:: $(patsubst %,%4,$(BINARIES)) diff --git a/source3/selftest/skip b/source3/selftest/skip index e69de29..152c076 100644 --- a/source3/selftest/skip +++ b/source3/selftest/skip @@ -0,0 +1,15 @@ +samba3.smbconftort # Errors, needs smb.conf file +samba3.randomipc +samba3.negnowait +samba3.nbench +samba3.errmapextract +samba3.trans2scan +samba3.nttransscan +samba3.deny1 +samba3.deny2 +samba3.openattr +samba3.casetable +samba3.eatest +samba3.mangle +samba3.utable +samba3.pipe_number diff --git a/source3/selftest/tests.sh b/source3/selftest/tests.sh index 01f87de..98568b6 100755 --- a/source3/selftest/tests.sh +++ b/source3/selftest/tests.sh @@ -45,8 +45,26 @@ normalize_testname() { } BINDIR=`dirname $0`/../bin +SCRIPTDIR=`dirname $0`/../script/tests +export SCRIPTDIR plantest "talloctort" none $VALGRIND $BINDIR/talloctort plantest "replacetort" none $VALGRIND $BINDIR/replacetort plantest "tdbtorture" none $VALGRIND $BINDIR/tdbtorture -#plantest "smbconftort" none $VALGRIND $BINDIR/smbconftort $CONFIGURATION +plantest "smbconftort" none $VALGRIND $BINDIR/smbconftort $CONFIGURATION + +tests="FDPASS LOCK1 LOCK2 LOCK3 LOCK4 LOCK5 LOCK6 LOCK7" +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" + +for t in $tests; do + name=`normalize_testname $t` + plantest "$name" dc $VALGRIND $BINDIR/smbtorture //\$SERVER/tmp -U\$USERNAME%\$PASSWORD $t +done + +plantest "blackbox.smbclient" dc BINDIR="$BINDIR" script/tests/test_smbclient_s3.sh \$SERVER \$SERVER_IP +plantest "blackbox.wbinfo" dc BINDIR="$BINDIR" script/tests/test_wbinfo_s3.sh \$DOMAIN \$SERVER \$USERNAME \$PASSWORD +plantest "blackbox.net" dc BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" script/tests/test_net_s3.sh -- Samba Shared Repository