[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha7-2376-g8178a40
Jelmer Vernooij
jelmer at samba.org
Thu Jun 18 01:11:00 GMT 2009
The branch, master has been updated
via 8178a40dcd0f66e3858fcac8fe23d9fc8b54ecf4 (commit)
via edbbbff7ec27ba37a5c413f1e0de861c38eb5fac (commit)
via a5563d29255672c348bf435d0cb18cb26f900e53 (commit)
via 4e293e37803d63fc3fc9094f3a2b84758cad5c09 (commit)
via 4657f52c06c947d57f01722cb140b55306fa94d3 (commit)
from 76bf5a4edeecd366da58fdb1f64a023d1f2a8461 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8178a40dcd0f66e3858fcac8fe23d9fc8b54ecf4
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Jun 18 03:09:36 2009 +0200
Use system LDB by default if the right version was found.
commit edbbbff7ec27ba37a5c413f1e0de861c38eb5fac
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Jun 18 03:09:14 2009 +0200
dsdb: Fix build against system ldb.
commit a5563d29255672c348bf435d0cb18cb26f900e53
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Jun 18 03:08:21 2009 +0200
selftest: Use common function when skipping testsuites based on run-time
conditions.
commit 4e293e37803d63fc3fc9094f3a2b84758cad5c09
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Jun 18 02:32:26 2009 +0200
smb_build: Always build modules for system-libraries as shared libraries,
since they can't be included in the static library.
commit 4657f52c06c947d57f01722cb140b55306fa94d3
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Jun 18 01:21:35 2009 +0200
Fix build with system LDB.
-----------------------------------------------------------------------
Summary of changes:
source4/build/smb_build/input.pm | 5 ++-
source4/configure.ac | 4 +-
source4/dsdb/samdb/ldb_modules/partition.c | 2 +-
source4/dsdb/samdb/ldb_modules/rootdse.c | 2 +-
source4/dsdb/samdb/ldb_modules/update_keytab.c | 2 +-
source4/dsdb/schema/schema_set.c | 2 +-
source4/lib/ldb-samba/ldif_handlers.c | 2 +-
source4/nbt_server/wins/winsserver.c | 2 +-
source4/selftest/tests.sh | 43 +++++++++++++++++------
source4/torture/nbt/wins.c | 2 +-
10 files changed, 44 insertions(+), 22 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index df9a525..27a0089 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -93,9 +93,10 @@ sub check_module($$$)
unless (defined($mod->{INIT_FUNCTION_SENTINEL})) { $mod->{INIT_FUNCTION_SENTINEL} = "NULL"; }
if (not defined($mod->{OUTPUT_TYPE})) {
- if ((not defined($INPUT->{$mod->{SUBSYSTEM}}->{TYPE})) or
+ if ((not defined($INPUT->{$mod->{SUBSYSTEM}})) or
+ (not defined($INPUT->{$mod->{SUBSYSTEM}}->{TYPE})) or
$INPUT->{$mod->{SUBSYSTEM}}->{TYPE} eq "EXT_LIB") {
- $mod->{OUTPUT_TYPE} = undef;
+ $mod->{OUTPUT_TYPE} = ["SHARED_LIBRARY"];
} else {
$mod->{OUTPUT_TYPE} = $default_ot;
}
diff --git a/source4/configure.ac b/source4/configure.ac
index c99205a..4b644d4 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -7,7 +7,7 @@ AC_INIT([samba],[4],[samba-technical at samba.org])
AC_CONFIG_SRCDIR([include/includes.h])
AC_CONFIG_HEADER(include/config_tmp.h)
-AC_DEFINE(CONFIG_H_IS_FROM_SAMBA,1,[Marker for samba's config.h])
+AC_DEFINE(CONFIG_H_IS_FROM_SAMBA,1,[Marker for samba's config.h.])
# Configuration rules.
m4_include(build/m4/env.m4)
@@ -103,7 +103,7 @@ SMB_INCLUDED_LIB_PKGCONFIG(LIBLDB, ldb = LDB_REQUIRED_VERSION,
m4_include(lib/ldb/libldb.m4)
SMB_INCLUDE_MK(lib/ldb/config.mk)
AC_CONFIG_FILES(lib/ldb/ldb.pc)
- ], [no])
+ ])
SMB_INCLUDE_MK(lib/ldb/python.mk)
m4_include(lib/tls/config.m4)
diff --git a/source4/dsdb/samdb/ldb_modules/partition.c b/source4/dsdb/samdb/ldb_modules/partition.c
index 663ff07..965b4c5 100644
--- a/source4/dsdb/samdb/ldb_modules/partition.c
+++ b/source4/dsdb/samdb/ldb_modules/partition.c
@@ -34,7 +34,7 @@
*/
#include "includes.h"
-#include "ldb_private.h"
+#include "lib/ldb/include/ldb_private.h"
#include "dsdb/samdb/samdb.h"
struct partition_private_data {
diff --git a/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c
index 9ae894d..a02a12e 100644
--- a/source4/dsdb/samdb/ldb_modules/rootdse.c
+++ b/source4/dsdb/samdb/ldb_modules/rootdse.c
@@ -21,7 +21,7 @@
*/
#include "includes.h"
-#include "ldb_private.h"
+#include "lib/ldb/include/ldb_private.h"
#include "system/time.h"
#include "dsdb/samdb/samdb.h"
#include "version.h"
diff --git a/source4/dsdb/samdb/ldb_modules/update_keytab.c b/source4/dsdb/samdb/ldb_modules/update_keytab.c
index f1b6863..302c1c8 100644
--- a/source4/dsdb/samdb/ldb_modules/update_keytab.c
+++ b/source4/dsdb/samdb/ldb_modules/update_keytab.c
@@ -29,7 +29,7 @@
#include "includes.h"
#include "ldb_module.h"
-#include "dlinklist.h"
+#include "lib/util/dlinklist.h"
#include "auth/credentials/credentials.h"
#include "auth/credentials/credentials_krb5.h"
#include "system/kerberos.h"
diff --git a/source4/dsdb/schema/schema_set.c b/source4/dsdb/schema/schema_set.c
index b949935..976abc2 100644
--- a/source4/dsdb/schema/schema_set.c
+++ b/source4/dsdb/schema/schema_set.c
@@ -21,7 +21,7 @@
*/
#include "includes.h"
-#include "dlinklist.h"
+#include "lib/util/dlinklist.h"
#include "dsdb/samdb/samdb.h"
#include "lib/ldb/include/ldb_module.h"
#include "param/param.h"
diff --git a/source4/lib/ldb-samba/ldif_handlers.c b/source4/lib/ldb-samba/ldif_handlers.c
index d895f09..30be444 100644
--- a/source4/lib/ldb-samba/ldif_handlers.c
+++ b/source4/lib/ldb-samba/ldif_handlers.c
@@ -22,7 +22,7 @@
*/
#include "includes.h"
-#include "ldb_private.h"
+#include "lib/ldb/include/ldb_private.h"
#include "ldb_handlers.h"
#include "dsdb/samdb/samdb.h"
#include "librpc/gen_ndr/ndr_security.h"
diff --git a/source4/nbt_server/wins/winsserver.c b/source4/nbt_server/wins/winsserver.c
index 798e9c7..4b8b8cc 100644
--- a/source4/nbt_server/wins/winsserver.c
+++ b/source4/nbt_server/wins/winsserver.c
@@ -21,7 +21,7 @@
*/
#include "includes.h"
-#include "dlinklist.h"
+#include "lib/util/dlinklist.h"
#include "nbt_server/nbt_server.h"
#include "nbt_server/wins/winsdb.h"
#include "nbt_server/wins/winsserver.h"
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 56462ac..70fc994 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -43,12 +43,32 @@ plantest() {
echo $cmdline
}
+skiptestsuite() {
+ name=$1
+ reason=$2
+ shift 2
+ # FIXME: Report this using subunit, but re-adjust the testsuite count somehow
+ echo "skipping $name ($reason)"
+}
+
normalize_testname() {
name=$1
shift 1
echo $name | tr "A-Z-" "a-z."
}
+planperltest() {
+ name=$1
+ env=$2
+ shift 2
+ cmdline="$*"
+ if $PERL -e 'eval require Test::More;' > /dev/null 2>&1; then
+ plantest "$name" "$env" $PERL $cmdline "|" $TAP2SUBUNIT
+ else
+ skiptestsuite "$name" "Test::More not available"
+ fi
+}
+
plansmbtorturetest() {
name=$1
env=$2
@@ -109,7 +129,12 @@ done
# is now pretty well tested by the rest of the quick tests anyway
LDBDIR=$samba4srcdir/lib/ldb
export LDBDIR
-plantest "ldb" none TEST_DATA_PREFIX=\$PREFIX $LDBDIR/tests/test-tdb.sh
+# Don't run LDB tests when using system ldb, as we won't have ldbtest installed
+if [ -f $samba4bindir/ldbtest ]; then
+ plantest "ldb" none TEST_DATA_PREFIX=\$PREFIX $LDBDIR/tests/test-tdb.sh
+else
+ skiptestsuite "ldb" "Using system LDB, ldbtest not available"
+fi
# Tests for RPC
@@ -284,20 +309,16 @@ tdbtorture4="$samba4bindir/tdbtorture${EXEEXT}"
if test -f $tdbtorture4
then
plantest "tdb.stress" none $VALGRIND $tdbtorture4
+else
+ skiptestsuite "tdb.stress" "Using system TDB, tdbtorture not available"
fi
# Pidl tests
-if test x"${PIDL_TESTS_SKIP}" = x"yes"; then
- echo "Skipping pidl tests - PIDL_TESTS_SKIP=yes"
-elif $PERL -e 'eval require Test::More;' > /dev/null 2>&1; then
- for f in $samba4srcdir/../pidl/tests/*.pl; do
- plantest "pidl.`basename $f .pl`" none $PERL $f "|" $TAP2SUBUNIT
- done
- plantest "selftest.samba4.pl" none $PERL $samba4srcdir/../selftest/test_samba4.pl "|" $TAP2SUBUNIT
-else
- echo "Skipping pidl tests - Test::More not installed"
-fi
+for f in $samba4srcdir/../pidl/tests/*.pl; do
+ planperltest "pidl.`basename $f .pl`" none $f
+done
+planperltest "selftest.samba4.pl" none $samba4srcdir/../selftest/test_samba4.pl
# Blackbox Tests:
# tests that interact directly with the command-line tools rather than using
diff --git a/source4/torture/nbt/wins.c b/source4/torture/nbt/wins.c
index 8c29f7e..13dc066 100644
--- a/source4/torture/nbt/wins.c
+++ b/source4/torture/nbt/wins.c
@@ -20,7 +20,7 @@
*/
#include "includes.h"
-#include "dlinklist.h"
+#include "lib/util/dlinklist.h"
#include "lib/events/events.h"
#include "lib/socket/socket.h"
#include "libcli/resolve/resolve.h"
--
Samba Shared Repository
More information about the samba-cvs
mailing list