[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Thu Apr 15 03:34:32 MDT 2010
The branch, master has been updated
via 2fd0137... s4:selftest/wscript: --enable-selftest and --with-selftest-prefix are configure options
from 0bda3ba... build: throw a fatal error for duplicate target declarations
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2fd0137a87cdefb5626f5537201af8f93eb0be8b
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 15 08:28:20 2010 +0200
s4:selftest/wscript: --enable-selftest and --with-selftest-prefix are configure options
metze
-----------------------------------------------------------------------
Summary of changes:
source4/selftest/wscript | 18 ++++++++++--------
source4/wscript | 1 +
2 files changed, 11 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/selftest/wscript b/source4/selftest/wscript
index f273e69..50c0f52 100644
--- a/source4/selftest/wscript
+++ b/source4/selftest/wscript
@@ -7,20 +7,22 @@ from samba_utils import *
from samba_autoconf import *
def set_options(opt):
+
+ opt.add_option('--enable-selftest',
+ help=("enable options necessary for selftest (default=no)"),
+ action="store_true", dest='enable_selftest', default=False)
+ opt.add_option('--with-selftest-prefix',
+ help=("specify location of selftest directory (default=./st)"),
+ action="store", dest='SELFTEST_PREFIX', default='./st')
+
opt.ADD_COMMAND('test', cmd_test)
opt.ADD_COMMAND('testonly', cmd_testonly)
gr = opt.add_option_group('test options')
- gr.add_option('--enable-selftest',
- help=("enable options necessary for selftest"),
- action="store_true", dest='enable_selftest', default=False)
gr.add_option('--load-list',
help=("Load a test id list from a text file"),
action="store", dest='LOAD_LIST', default=None)
- gr.add_option('--with-selftest-prefix',
- help=("specify location of selftest directory"),
- action="store", dest='SELFTEST_PREFIX', default='./st')
gr.add_option('--tests',
help=("wildcard pattern of tests to run"),
action="store", dest='TESTS', default='')
@@ -49,6 +51,8 @@ def set_options(opt):
help=("run the testsuite within a gdb xterm window"),
action="store_true", dest='GDBTEST', default=False)
+def configure(conf):
+ conf.env.SELFTEST_PREFIX = Options.options.SELFTEST_PREFIX
def cmd_testonly(opt):
'''run tests without doing a build first'''
@@ -95,8 +99,6 @@ def cmd_testonly(opt):
if Options.options.GDBTEST:
os.environ['SAMBA_VALGRIND'] = 'xterm -n server -e ../selftest/gdb_run DUMMY=X'
- env.SELFTEST_PREFIX = Options.options.SELFTEST_PREFIX
-
# this is needed for systems without rpath, or with rpath disabled
ADD_LD_LIBRARY_PATH('bin/shared')
diff --git a/source4/wscript b/source4/wscript
index d40d434..13682a1 100644
--- a/source4/wscript
+++ b/source4/wscript
@@ -77,6 +77,7 @@ def configure(conf):
conf.RECURSE('../lib/popt')
conf.RECURSE('lib/smbreadline')
conf.RECURSE('../pidl')
+ conf.RECURSE('selftest')
# we don't want PYTHONDIR in config.h, as otherwise changing
# --prefix causes a complete rebuild
--
Samba Shared Repository
More information about the samba-cvs
mailing list