[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  5e82d1d script/autobuild.py: don't force usage of ccache and gcc
       via  a23d88e script/autobuild.py: make sure --with-selftest-prefix keeps working
       via  6ae2ecc selftest: use env.SELFTEST_PREFIX instead of hardcoded "${srcdir}/st"
      from  b832234 s4:torture/nbt/winsreplication: ignore incoming broadcast messages

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


- Log -----------------------------------------------------------------
commit 5e82d1d0a770f23082d6cb8baf49482b4a35cc28
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sat Apr 30 09:54:43 2011 +0200

    script/autobuild.py: don't force usage of ccache and gcc
    
    If someone wants to use it, CC="ccache gcc" script/autobuild.py will work.
    
    It also makes it possible to use other compilers than gcc.
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Sat Apr 30 13:47:47 CEST 2011 on sn-devel-104

commit a23d88e3df5a905a1423e626900d4b5a5bc3ce8c
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sat Apr 30 09:35:56 2011 +0200

    script/autobuild.py: make sure --with-selftest-prefix keeps working
    
    metze

commit 6ae2ecc4b8ca76eed5e987e4e8eabb7436aac5a6
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Apr 29 21:12:53 2011 +0200

    selftest: use env.SELFTEST_PREFIX instead of hardcoded "${srcdir}/st"
    
    metze

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

Summary of changes:
 script/autobuild.py |    4 +---
 selftest/wscript    |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/script/autobuild.py b/script/autobuild.py
index 4775143..545e47e 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -14,8 +14,6 @@ samba_master_ssh = os.getenv('SAMBA_MASTER_SSH', 'git+ssh://git.samba.org/data/g
 
 cleanup_list = []
 
-os.environ['CC'] = "ccache gcc"
-
 builddirs = {
     "samba3"  : "source3",
     "samba3-waf": "source3",
@@ -50,7 +48,7 @@ tasks = {
                  ("clean", "make clean", "text/plain") ],
 
     # We have 'test' before 'install' because, 'test' should work without 'install'
-    "samba4" : [ ("configure", "./configure.developer ${PREFIX}", "text/plain"),
+    "samba4" : [ ("configure", "./configure.developer ${PREFIX} --with-selftest-prefix=./bin/ab", "text/plain"),
                  ("make", "make -j", "text/plain"),
                  ("test", "TDB_NO_FSYNC=1 make test FAIL_IMMEDIATELY=1", "text/plain"),
                  ("install", "make install", "text/plain"),
diff --git a/selftest/wscript b/selftest/wscript
index 5ba1c53..ce1be81 100644
--- a/selftest/wscript
+++ b/selftest/wscript
@@ -203,7 +203,7 @@ def cmd_testonly(opt):
                           env.srcdir + "/source3/selftest/" + f,
                           env.SELFTEST_PREFIX + "/" + f)
 
-        env.SELFTEST_DIR = "${srcdir}/st"
+        env.SELFTEST_DIR = env.SELFTEST_PREFIX
         env.TESTLISTS = ('--testlist="${PYTHON} ${srcdir}/source3/selftest/tests.py|" ' +
                          '--testlist="${PYTHON} ${srcdir}/source4/selftest/tests.py|"')
     else:


-- 
Samba Shared Repository