[SCM] Samba Shared Repository - branch v3-6-test updated

Günther Deschner gd at samba.org
Mon Dec 13 06:15:15 MST 2010


The branch, v3-6-test has been updated
       via  bccb901 s3-selftest: support differing VFSLIBDIR in autoconf and waf build.
       via  e082fb6 s3-waf: add -Wl,--export-dynamic to LDFLAGS.
       via  73afa49 nss_wrapper: make nss_wrapper.pl executeable.
      from  ce4a7dc s4-smbtorture: Make test names lowercase and dot-separated.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit bccb901658ceb4ff301ac1e30b332342717f2f59
Author: Günther Deschner <gd at samba.org>
Date:   Fri Dec 10 17:15:18 2010 +0100

    s3-selftest: support differing VFSLIBDIR in autoconf and waf build.
    
    With this change make test in the s3 waf build (w/o s4 smbtorture yet) works!
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Mon Dec 13 13:06:05 CET 2010 on sn-devel-104
    (cherry picked from commit a43a1d922611a0610f8d815285e91dff6d77d629)

commit e082fb6055e250aa298617ff4da9d0e6f18b8208
Author: Günther Deschner <gd at samba.org>
Date:   Thu Dec 9 15:44:30 2010 +0100

    s3-waf: add -Wl,--export-dynamic to LDFLAGS.
    
    Our binaries did not export symbols so e.g. smbd could not load vfs modules.
    Patch from tridge.
    
    We might remove this later on, once we decide to resolve all symbols and fix all
    dependencies in s3 modules.
    
    Guenther
    (cherry picked from commit b4d398f8e3f5f073f0424395b792c1487a2f2ca8)

commit 73afa49c2958ae2ac866e0ea1d66dcbc22011671
Author: Günther Deschner <gd at samba.org>
Date:   Thu Dec 9 15:33:25 2010 +0100

    nss_wrapper: make nss_wrapper.pl executeable.
    
    Guenther
    (cherry picked from commit cb15d73c0bb8526b99f7f5067680a39bd8fbf03f)

-----------------------------------------------------------------------

Summary of changes:
 selftest/target/Samba3.pm      |    2 +-
 source3/Makefile.in            |    1 +
 source3/selftest/wscript       |    1 +
 source3/wscript                |    2 ++
 4 files changed, 5 insertions(+), 1 deletions(-)
 mode change 100644 => 100755 lib/nss_wrapper/nss_wrapper.pl


Changeset truncated at 500 lines:

diff --git a/lib/nss_wrapper/nss_wrapper.pl b/lib/nss_wrapper/nss_wrapper.pl
old mode 100644
new mode 100755
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 3d1ae4e..279fc65 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -356,7 +356,7 @@ sub provision($$$$$$)
 
 	my $prefix_abs = abs_path($prefix);
 	my $bindir_abs = abs_path($self->{bindir});
-	my $vfs_modulesdir_abs = $bindir_abs;
+	my $vfs_modulesdir_abs = ($ENV{VFSLIBDIR} or $bindir_abs);
 
 	my @dirs = ();
 
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 61ec157..1525888 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3413,6 +3413,7 @@ test:: all torture timelimit
 		NSS_WRAPPER_WINBIND_SO_PATH="$(srcdir)/../nsswitch/libnss_winbind.so" \
 		SELFTESTDIR="$(selftestdir)" SELFTESTPREFIX="$(selftest_prefix)" \
 		SOURCEDIR="$(srcdir)" \
+		VFSLIBDIR="$(builddir)/bin" \
 		RUN_FROM_BUILD_FARM="$(RUN_FROM_BUILD_FARM)" \
 		SUBUNIT_FORMATTER="$(SUBUNIT_FORMATTER)" \
 		PERL="$(PERL)" PYTHON="$(PYTHON)" \
diff --git a/source3/selftest/wscript b/source3/selftest/wscript
index b3139d5..0e3ee9e 100644
--- a/source3/selftest/wscript
+++ b/source3/selftest/wscript
@@ -120,6 +120,7 @@ def cmd_testonly(opt):
 
     # tell build system where to find config.h
     os.environ['CONFIG_H'] = 'bin/default/source3/include/config.h'
+    os.environ['VFSLIBDIR'] = os.path.abspath('bin/modules/vfs')
 
     st_done = os.path.join(env.SELFTEST_PREFIX, 'st_done')
     if os.path.exists(st_done):
diff --git a/source3/wscript b/source3/wscript
index da9a9db..e38da59 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -96,6 +96,8 @@ def configure(conf):
     conf.RECURSE('../lib/zlib')
     conf.RECURSE('../libcli/smbreadline')
 
+    conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True)
+
     conf.CHECK_HEADERS('execinfo.h libexc.h libunwind.h netdb.h')
 
     conf.CHECK_FUNCS('getcwd fchown chmod fchmod mknod mknod64')


-- 
Samba Shared Repository


More information about the samba-cvs mailing list