[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  4ce3b53 s3:selftest: fix knownfail for samba3.posix_s3.rpc.spoolss.*printserver.enum_printers_old
       via  1865bdc s4:heimdal_build: replace '+' by '_' for vscripts in HEIMDAL_LIBRARY()
      from  a43a1d9 s3-selftest: support differing VFSLIBDIR in autoconf and waf build.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4ce3b53f122afb1eb3eaa3fbc2b8ef7fa8d075f5
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Dec 13 12:04:28 2010 +0100

    s3:selftest: fix knownfail for samba3.posix_s3.rpc.spoolss.*printserver.enum_printers_old
    
    The name is in lowercase since commit 35fbc7bbda5851f7172538f79fc79be201f1d521
    (s4-smbtorture: Make test names lowercase and dot-separated.)
    
    This should avoid intermittent failures in make test.
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Mon Dec 13 13:52:18 CET 2010 on sn-devel-104

commit 1865bdc0f0129e03c4c71f1eef1c3d1bc55678e7
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Dec 13 11:53:03 2010 +0100

    s4:heimdal_build: replace '+' by '_' for vscripts in HEIMDAL_LIBRARY()
    
    metze

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

Summary of changes:
 source3/selftest/knownfail          |    2 +-
 source4/heimdal_build/wscript_build |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/selftest/knownfail b/source3/selftest/knownfail
index c00d031..54cffa8 100644
--- a/source3/selftest/knownfail
+++ b/source3/selftest/knownfail
@@ -1,5 +1,5 @@
 .*printer.*print_test_extended # fails on some hosts due to timing issues ?
 .*printer.*print_test # fails on some hosts due to timing issues ?
 samba3.posix_s3.rap.printing # fails sometimes on sn-devel
-samba3.posix_s3.rpc.spoolss.*PRINTSERVER.enum_printers_old
+samba3.posix_s3.rpc.spoolss.*printserver.enum_printers_old # fails on some hosts due to timing issues ?
 samba3.posix_s3.rpc.spoolss.printer.*addprinterex.print_test # another intermittent failure
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index 5607701..16af81a 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -242,8 +242,9 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum,
 
     if bld.env.HAVE_LD_VERSION_SCRIPT:
         vscript = "%s.vscript" % libname
+        namespace = version.replace("-","_").replace("+","_").upper(),
         HEIMDAL_GENERATOR(vscript,
-                          rule="echo %s \{ global: \*\; \}\; > ${TGT}" % version.replace("-","_").upper(),
+                          rule="echo %s \{ global: \*\; \}\; > ${TGT}" % namespace,
                           group='vscripts',
                           target=vscript)
         ldflags.append("-Wl,--version-script=%s/%s" % (bld.path.abspath(bld.env), vscript))


-- 
Samba Shared Repository