[SCM] Samba Shared Repository - branch master updated -
fe02004865144dd5061a6cc9889bef6195de995e
Jelmer Vernooij
jelmer at samba.org
Tue Oct 21 15:33:09 GMT 2008
The branch, master has been updated
via fe02004865144dd5061a6cc9889bef6195de995e (commit)
via ecd293325c05ab5c179403b023747baf3ee5ed37 (commit)
via 59a6e534cd64f766342546ff59bc1399a3c8237e (commit)
via dadde7e8f065e1d5c339c7b5692bd1712d35820c (commit)
via 8834b9c787dbffedfa8c0789080650b49599dd04 (commit)
via 70eba79edb3cba9432508ff3c439200e980f9468 (commit)
via 86576f0f1627bf799e422d16baac5a7057de0316 (commit)
from d14244459243ec317438bb0bb06fad0094d1a5e2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit fe02004865144dd5061a6cc9889bef6195de995e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Oct 21 17:32:07 2008 +0200
Specify skip list to selftest.pl, make make target depend on test
binaries.
commit ecd293325c05ab5c179403b023747baf3ee5ed37
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Oct 21 17:23:48 2008 +0200
Correctly report when merged-build is used in developer mode.
commit 59a6e534cd64f766342546ff59bc1399a3c8237e
Merge: d14244459243ec317438bb0bb06fad0094d1a5e2 dadde7e8f065e1d5c339c7b5692bd1712d35820c
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Oct 21 17:19:23 2008 +0200
Merge branch 'selftest' of git://git.samba.org/jelmer/samba
commit dadde7e8f065e1d5c339c7b5692bd1712d35820c
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Oct 20 12:09:36 2008 +0200
Make warning a bit more user-friendly.
commit 8834b9c787dbffedfa8c0789080650b49599dd04
Merge: 70eba79edb3cba9432508ff3c439200e980f9468 640847b4fc74c93dd74b2325b4ac92a001a81c92
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Oct 20 11:33:44 2008 +0200
Merge branch 'master' of ssh://git.samba.org/data/git/samba into selftest
commit 70eba79edb3cba9432508ff3c439200e980f9468
Merge: 86576f0f1627bf799e422d16baac5a7057de0316 221ea78e2e1688f2e79703784b3d1d1a68057604
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Oct 20 11:07:38 2008 +0200
Merge branch 'master' of ssh://git.samba.org/data/git/samba into selftest
commit 86576f0f1627bf799e422d16baac5a7057de0316
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Oct 19 14:56:29 2008 +0200
Add 'selftest' target to Samba 3 that uses the perl selftest code.
-----------------------------------------------------------------------
Summary of changes:
selftest/selftest.pl | 4 ++-
source3/Makefile.in | 6 +++++
source3/m4/check_path.m4 | 1 +
source3/selftest/tests.sh | 52 ++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 62 insertions(+), 1 deletions(-)
create mode 100644 source3/selftest/knownfail
create mode 100644 source3/selftest/skip
create mode 100755 source3/selftest/tests.sh
Changeset truncated at 500 lines:
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 60eabe4..b1908d4 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -434,7 +434,9 @@ if ($opt_socket_wrapper) {
$socket_wrapper_dir = SocketWrapper::setup_dir("$prefix/w", $opt_socket_wrapper_pcap);
print "SOCKET_WRAPPER_DIR=$socket_wrapper_dir\n";
} else {
- warn("Not using socket wrapper, but also not running as root. Will not be able to listen on proper ports") unless $< == 0;
+ unless ($< == 0) {
+ print "WARNING: Not using socket wrapper, but also not running as root. Will not be able to listen on proper ports\n";
+ }
}
my $target;
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 0e1d17f..ac330b3 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2807,6 +2807,12 @@ 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:: all torture timelimit
+ @../selftest/selftest.pl --prefix=st --target=samba3 \
+ --testlist="$(srcdir)/selftest/tests.sh|" \
+ --expected-failures=$(srcdir)/selftest/knownfail \
+ --exclude=$(srcdir)/selftest/skip
+
# Check for Winbind struct 32/64bit padding
test_wbpad:
@echo "Testing winbind request/response structure for 32/64bit padding"
diff --git a/source3/m4/check_path.m4 b/source3/m4/check_path.m4
index 40a97d3..9c99468 100644
--- a/source3/m4/check_path.m4
+++ b/source3/m4/check_path.m4
@@ -303,6 +303,7 @@ AC_ARG_ENABLE(debug,
debug=yes
fi])
+AC_SUBST(developer)
developer=no
AC_ARG_ENABLE(developer, [AS_HELP_STRING([--enable-developer], [Turn on developer warnings and debugging (default=no)])],
[if eval "test x$enable_developer = xyes"; then
diff --git a/source3/selftest/knownfail b/source3/selftest/knownfail
new file mode 100644
index 0000000..e69de29
diff --git a/source3/selftest/skip b/source3/selftest/skip
new file mode 100644
index 0000000..e69de29
diff --git a/source3/selftest/tests.sh b/source3/selftest/tests.sh
new file mode 100755
index 0000000..01f87de
--- /dev/null
+++ b/source3/selftest/tests.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# This script generates a list of testsuites that should be run as part of
+# the Samba 3 test suite.
+
+# The output of this script is parsed by selftest.pl, which then decides
+# which of the tests to actually run. It will, for example, skip all tests
+# listed in selftest/skip or only run a subset during "make quicktest".
+
+# The idea is that this script outputs all of the tests of Samba 3, not
+# just those that are known to pass, and list those that should be skipped
+# or are known to fail in selftest/skip or selftest/samba4-knownfail. This makes it
+# very easy to see what functionality is still missing in Samba 3 and makes
+# it possible to run the testsuite against other servers, such as Samba 4 or
+# Windows that have a different set of features.
+
+# The syntax for a testsuite is "-- TEST --" on a single line, followed
+# by the name of the test, the environment it needs and the command to run, all
+# three separated by newlines. All other lines in the output are considered
+# comments.
+
+if [ ! -n "$PERL" ]
+then
+ PERL=perl
+fi
+
+plantest() {
+ name=$1
+ env=$2
+ shift 2
+ cmdline="$*"
+ echo "-- TEST --"
+ if [ "$env" = "none" ]; then
+ echo "samba3.$name"
+ else
+ echo "samba3.$name ($env)"
+ fi
+ echo $env
+ echo $cmdline
+}
+
+normalize_testname() {
+ name=$1
+ shift 1
+ echo $name | tr "A-Z-" "a-z."
+}
+
+BINDIR=`dirname $0`/../bin
+
+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
--
Samba Shared Repository
More information about the samba-cvs
mailing list