Changeset View
Changeset View
Standalone View
Standalone View
files/patch-ctdb_wscript
Property | Old Value | New Value |
---|---|---|
fbsd:nokeywords | null | yes \ No newline at end of property |
svn:eol-style | null | native \ No newline at end of property |
svn:mime-type | null | text/plain \ No newline at end of property |
--- ctdb/wscript.orig 2019-05-22 10:16:26 UTC | |||||
+++ ctdb/wscript | |||||
@@ -104,6 +104,9 @@ def options(opt): | |||||
opt.add_option('--enable-ceph-reclock', | |||||
help=("Enable Ceph CTDB recovery lock helper (default=no)"), | |||||
action="store_true", dest='ctdb_ceph_reclock', default=False) | |||||
+ opt.add_option('--disable-ctdb-tests', | |||||
+ help=("Disable CTDB tests (default=no)"), | |||||
+ action="store_true", dest='ctdb_no_tests', default=False) | |||||
opt.add_option('--with-logdir', | |||||
help=("Path to log directory"), | |||||
@@ -303,8 +306,14 @@ def configure(conf): | |||||
conf.env.CTDB_VARDIR, | |||||
conf.env.CTDB_RUNDIR)) | |||||
- conf.env.CTDB_TEST_DATADIR = os.path.join(conf.env.CTDB_DATADIR, 'tests') | |||||
- conf.env.CTDB_TEST_LIBEXECDIR = os.path.join(conf.env.LIBEXECDIR, 'ctdb/tests') | |||||
+ if Options.options.ctdb_no_tests: | |||||
+ conf.env.ctdb_tests = False | |||||
+ else: | |||||
+ conf.env.ctdb_tests = True | |||||
+ | |||||
+ if conf.env.ctdb_tests: | |||||
+ conf.env.CTDB_TEST_DATADIR = os.path.join(conf.env.CTDB_DATADIR, 'tests') | |||||
+ conf.env.CTDB_TEST_LIBEXECDIR = os.path.join(conf.env.LIBEXECDIR, 'ctdb/tests') | |||||
# Allow unified compilation and separate compilation of utilities | |||||
# to find includes | |||||
@@ -864,6 +873,9 @@ def build(bld): | |||||
for d in ['volatile', 'persistent', 'state']: | |||||
bld.INSTALL_DIR(os.path.join(bld.env.CTDB_VARDIR, d)) | |||||
+ if not bld.env.ctdb_tests: | |||||
+ return | |||||
+ | |||||
bld.SAMBA_BINARY('errcode', | |||||
source='tests/src/errcode.c', | |||||
deps='replace', |