sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s4-waf: added a --enable-selftest option as a shortcut

Browse Source 
This is equiavalent to --enable-uid-wrapper --enable-nss-wrapper --enable-socket-wrapper
but is easier to remember!
This commit is contained in:
Andrew Tridgell 2010-03-30 13:05:15 +11:00
parent 7da57cc94b
commit 77a4fe495e
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/nss_wrapper/wscript
View File

@ -8,6 +8,8 @@ def set_options(opt):
action="store_true", dest='enable_nss_wrapper', default=False)
def configure(conf):
if Options.options.enable_nss_wrapper or Options.options.developer:
if (Options.options.enable_nss_wrapper or
Options.options.developer or
Options.options.enable_selftest):
conf.DEFINE('NSS_WRAPPER', 1)

4
lib/socket_wrapper/wscript
View File

@ -8,7 +8,9 @@ def set_options(opt):
action="store_true", dest='enable_socket_wrapper', default=False)
def configure(conf):
if Options.options.enable_socket_wrapper or Options.options.developer:
if (Options.options.enable_socket_wrapper or
Options.options.developer or
Options.options.enable_selftest):
conf.DEFINE('SOCKET_WRAPPER', 1)
conf.ADD_GLOBAL_DEPENDENCY('SOCKET_WRAPPER')

4
lib/uid_wrapper/wscript
View File

@ -8,6 +8,8 @@ def set_options(opt):
action="store_true", dest='enable_uid_wrapper', default=False)
def configure(conf):
if Options.options.enable_uid_wrapper or Options.options.developer:
if (Options.options.enable_uid_wrapper or
Options.options.developer or
Options.options.enable_selftest):
conf.DEFINE('UID_WRAPPER', 1)

10
source4/selftest/wscript
View File

@ -4,6 +4,7 @@
import Scripting, os, Options, Utils, Environment, optparse, sys
from samba_utils import *
from samba_autoconf import *
def set_options(opt):
opt.ADD_COMMAND('test', cmd_test)
@ -11,6 +12,9 @@ def set_options(opt):
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('--with-selftest-prefix',
help=("specify location of selftest directory"),
action="store", dest='SELFTEST_PREFIX', default='./st')
@ -42,6 +46,12 @@ def cmd_testonly(opt):
env = LOAD_ENVIRONMENT()
opt.env = env
if (not CONFIG_SET(opt, 'NSS_WRAPPER') or
not CONFIG_SET(opt, 'UID_WRAPPER') or
not CONFIG_SET(opt, 'SOCKET_WRAPPER')):
print "ERROR: You must use --enable-selftest to enable selftest"
sys.exit(1)
env.TESTS = Options.options.TESTS
env.SUBUNIT_FORMATTER = '${PERL} ../selftest/format-subunit --prefix=${SELFTEST_PREFIX} --immediate'