From 77a4fe495ef8056d186d5b6d24f895ff64db77ee Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 30 Mar 2010 13:05:15 +1100 Subject: s4-waf: added a --enable-selftest option as a shortcut This is equiavalent to --enable-uid-wrapper --enable-nss-wrapper --enable-socket-wrapper but is easier to remember! --- source4/selftest/wscript | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'source4/selftest') diff --git a/source4/selftest/wscript b/source4/selftest/wscript index 8969d4694d..d7bc04fdf9 100644 --- a/source4/selftest/wscript +++ b/source4/selftest/wscript @@ -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' -- cgit