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

Günther Deschner gd at samba.org
Fri Feb 11 09:08:52 MST 2011


The branch, v3-6-test has been updated
       via  ac14dcf s3-waf: next attempt to fix cups and non-cups builds.
       via  04605c3 s3-rpc_server: fix some buildwarnings in non-developer mode.
       via  f7b6da4 s3-selftest: revamp selftest wscript with s4 one.
      from  93bfcc0 s3-waf: try to deal with underlinked cups libraries.

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


- Log -----------------------------------------------------------------
commit ac14dcf763ae3ea0c029fc2775f3dede5ecc93d2
Author: Günther Deschner <gd at samba.org>
Date:   Fri Feb 11 16:10:07 2011 +0100

    s3-waf: next attempt to fix cups and non-cups builds.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Fri Feb 11 16:57:40 CET 2011 on sn-devel-104
    (cherry picked from commit 6531ac6a650a04a332082f38fe4ffabdaceec6de)

commit 04605c329867694c23a7b889159eda855b519d03
Author: Günther Deschner <gd at samba.org>
Date:   Fri Feb 11 16:04:28 2011 +0100

    s3-rpc_server: fix some buildwarnings in non-developer mode.
    
    Guenther
    (cherry picked from commit 7ff5bf56c85851a58f80ed9122f0817f60d11d69)

commit f7b6da4b5cadbf7d8faa7dc2b0034feb65d7fc75
Author: Günther Deschner <gd at samba.org>
Date:   Fri Feb 11 15:30:27 2011 +0100

    s3-selftest: revamp selftest wscript with s4 one.
    
    Guenther
    (cherry picked from commit 16af2539dc94bb35a629bc5a16efae8dd8cb5f91)

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

Summary of changes:
 source3/rpc_server/srv_rpc_register.c |    6 ++++--
 source3/selftest/wscript              |   22 +++++++++++-----------
 source3/wscript                       |    1 +
 3 files changed, 16 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_rpc_register.c b/source3/rpc_server/srv_rpc_register.c
index 634adfd..9d213ec 100644
--- a/source3/rpc_server/srv_rpc_register.c
+++ b/source3/rpc_server/srv_rpc_register.c
@@ -255,7 +255,7 @@ static bool initshutdown_shutdown_cb(void *ptr)
 {
 	return NT_STATUS_IS_OK(_rpc_ep_unregister(&ndr_table_initshutdown));
 }
-
+#ifdef DEVELOPER
 static bool rpcecho_init_cb(void *ptr) {
 	return NT_STATUS_IS_OK(_rpc_ep_register(&ndr_table_rpcecho, "rpcecho"));
 }
@@ -264,7 +264,7 @@ static bool rpcecho_shutdown_cb(void *ptr)
 {
 	return NT_STATUS_IS_OK(_rpc_ep_unregister(&ndr_table_rpcecho));
 }
-
+#endif
 static bool netdfs_init_cb(void *ptr)
 {
 	return NT_STATUS_IS_OK(_rpc_ep_register(&ndr_table_netdfs, "netdfs"));
@@ -304,7 +304,9 @@ bool srv_rpc_register(struct messaging_context *msg_ctx) {
 	struct rpc_srv_callbacks eventlog_cb;
 	struct rpc_srv_callbacks initshutdown_cb;
 	struct rpc_srv_callbacks netdfs_cb;
+#ifdef DEVELOPER
 	struct rpc_srv_callbacks rpcecho_cb;
+#endif
 	struct rpc_srv_callbacks dssetup_cb;
 	struct rpc_srv_callbacks wkssvc_cb;
 
diff --git a/source3/selftest/wscript b/source3/selftest/wscript
index 632e585..0e44f07 100644
--- a/source3/selftest/wscript
+++ b/source3/selftest/wscript
@@ -85,8 +85,8 @@ def cmd_testonly(opt):
 
     env.TESTS  = Options.options.TESTS
 
-    env.SUBUNIT_FORMATTER = '${PYTHON} -u ../selftest/format-subunit --prefix=${SELFTEST_PREFIX} --immediate'
-    env.FILTER_XFAIL = '${PYTHON} -u ../selftest/filter-subunit --expected-failures=./selftest/knownfail'
+    env.SUBUNIT_FORMATTER = '${PYTHON} -u ${srcdir}/selftest/format-subunit --prefix=${SELFTEST_PREFIX} --immediate'
+    env.FILTER_XFAIL = '${PYTHON} -u ${srcdir}/selftest/filter-subunit --expected-failures=${srcdir}/source3/selftest/knownfail'
 
     if Options.options.FAIL_IMMEDIATELY:
         env.FILTER_XFAIL += ' --fail-immediately'
@@ -103,9 +103,9 @@ def cmd_testonly(opt):
 
     env.OPTIONS = ''
     if not Options.options.SLOWTEST:
-        env.OPTIONS += ' --exclude=./selftest/slow'
+        env.OPTIONS += ' --exclude=${srcdir}/source3/selftest/slow'
     if Options.options.QUICKTEST:
-        env.OPTIONS += ' --quick --include=./selftest/quick'
+        env.OPTIONS += ' --quick --include=${srcdir}/source3/selftest/quick'
     if Options.options.LOAD_LIST:
         env.OPTIONS += ' --load-list=%s' % Options.options.LOAD_LIST
     if Options.options.TESTENV:
@@ -129,18 +129,18 @@ def cmd_testonly(opt):
     server_wrapper=''
 
     if Options.options.VALGRIND_SERVER:
-        server_wrapper = '../selftest/valgrind_run _DUMMY=X'
+        server_wrapper = '${srcdir}/selftest/valgrind_run _DUMMY=X'
     elif Options.options.GDBTEST:
-        server_wrapper = '../selftest/gdb_run _DUMMY=X'
+        server_wrapper = '${srcdir}/selftest/gdb_run _DUMMY=X'
 
     if Options.options.SCREEN:
-        server_wrapper = '%s/../selftest/in_screen %s' % (os.getcwd(), server_wrapper)
-        os.environ['TERMINAL'] = '%s/../selftest/in_screen' % os.getcwd()
+        server_wrapper = '${srcdir}/selftest/in_screen %s' % server_wrapper
+        os.environ['TERMINAL'] = EXPAND_VARIABLES(opt, '${srcdir}/selftest/in_screen')
     elif server_wrapper != '':
         server_wrapper = 'xterm -n server -l -e %s' % server_wrapper
 
     if server_wrapper != '':
-        os.environ['SAMBA_VALGRIND'] = server_wrapper
+        os.environ['SAMBA_VALGRIND'] = EXPAND_VARIABLES(opt, server_wrapper)
 
     # this is needed for systems without rpath, or with rpath disabled
     ADD_LD_LIBRARY_PATH('bin/shared')
@@ -163,11 +163,11 @@ def cmd_testonly(opt):
         os.makedirs(env.SELFTEST_PREFIX, int('755', 8))
 
     # We use the full path rather than relative path because it cause problems on some plateforms (ie. solaris 8).
-    cmd = '(${PERL} %s/../selftest/selftest.pl --target=samba3 --prefix=${SELFTEST_PREFIX} --builddir=. --srcdir=. --exclude=./selftest/skip --testlist="./selftest/tests.sh|" ${OPTIONS} --socket-wrapper ${TESTS} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS} | tee ${SELFTEST_PREFIX}/subunit' % (os.getcwd())
+    cmd = '(${PERL} ${srcdir}/selftest/selftest.pl --target=samba3 --prefix=${SELFTEST_PREFIX} --builddir=. --srcdir=${srcdir} --exclude=${srcdir}/source3/selftest/skip --testlist="${srcdir}/source3/selftest/tests.sh|" ${OPTIONS} --socket-wrapper ${TESTS} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS} | tee ${SELFTEST_PREFIX}/subunit'
     if os.environ.get('RUN_FROM_BUILD_FARM') is None and not Options.options.FILTERED_SUBUNIT:
         cmd += ' | ${FORMAT_TEST_OUTPUT}'
     else:
-        cmd += ' | ${PYTHON} -u ../selftest/filter-subunit'
+        cmd += ' | ${PYTHON} -u ${srcdir}/selftest/filter-subunit'
     cmd = EXPAND_VARIABLES(opt, cmd)
 
     print("test: running %s" % cmd)
diff --git a/source3/wscript b/source3/wscript
index 9b1cb53..78aad61 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -525,6 +525,7 @@ msg.msg_acctrightslen = sizeof(fd);
             conf.DEFINE('HAVE_CUPS', '1')
         else:
             conf.undefine('HAVE_CUPS')
+            conf.SET_TARGET_TYPE('cups', 'EMPTY')
     else:
         # define an empty subsystem for cups, to allow it to be used as an empty dependency
         conf.SET_TARGET_TYPE('cups', 'EMPTY')


-- 
Samba Shared Repository


More information about the samba-cvs mailing list