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!

diff --git a/lib/nss_wrapper/wscript b/lib/nss_wrapper/wscript
index c6e8e0d3063a79812fffa59f079cf2b19e6b6c66..44da63339fdbc993b6f75ae93df1836c76a1d1a4 100644 (file)
--- a/lib/nss_wrapper/wscript
+++ b/lib/nss_wrapper/wscript
@@ -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)
 

diff --git a/lib/socket_wrapper/wscript b/lib/socket_wrapper/wscript
index f4fdff2ab96b574a24019dcd57a9bd9300b8bfea..6d9a95795d42d7814a331d28ec1e1109fe8f241d 100644 (file)
--- a/lib/socket_wrapper/wscript
+++ b/lib/socket_wrapper/wscript
@@ -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')
 

diff --git a/lib/uid_wrapper/wscript b/lib/uid_wrapper/wscript
index 0937176c1f0286843ee7e0b3cbb724a7c9f4bcfb..9eb828866f1573a15b1efc08128de8236cadad42 100644 (file)
--- a/lib/uid_wrapper/wscript
+++ b/lib/uid_wrapper/wscript
@@ -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)
 

diff --git a/source4/selftest/wscript b/source4/selftest/wscript
index 8969d4694d216da3f3aeaec1978e62a6d53e761c..d7bc04fdf95ff43128546095bb9c09b62c4b0478 100644 (file)
--- 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'