s4-auth: Add authsam_zero_bad_pwd_count to zero out badPwdCount and lockoutTime on...

[samba.git] / selftest / wscript

diff --git a/selftest/wscript b/selftest/wscript
index 4733dc17cd1d4ddd257b4cdcbe914e8baa4365b7..ad77e9105b997ddeb4f287634d08c891ab06a9da 100644 (file)
--- a/selftest/wscript
+++ b/selftest/wscript
@@ -6,6 +6,7 @@
 import Scripting, os, Options, Utils, Environment, optparse, sys
 from samba_utils import *
 from samba_autoconf import *
+import types
 
 def set_options(opt):
 
@@ -114,7 +115,11 @@ def cmd_testonly(opt):
     # put all command line options in the environment as TESTENV_*=*
     for o in dir(Options.options):
         if o[0:1] != '_':
-            os.environ['TESTENV_%s' % o.upper()] = str(getattr(Options.options, o, ''))
+            val = getattr(Options.options, o, '')
+            if not issubclass(type(val), types.FunctionType) \
+                    and not issubclass(type(val), types.MethodType):
+                os.environ['TESTENV_%s' % o.upper()] = str(getattr(Options.options, o, ''))
+
 
     binary_mapping = ('nmblookup3:nmblookup,' +
                       'nmblookup4:nmblookup4,' +
@@ -163,6 +168,9 @@ def cmd_testonly(opt):
 
     if server_wrapper != '':
         os.environ['SAMBA_VALGRIND'] = EXPAND_VARIABLES(opt, server_wrapper)
+        os.environ['NMBD_VALGRIND'] = EXPAND_VARIABLES(opt, server_wrapper)
+        os.environ['WINBINDD_VALGRIND'] = EXPAND_VARIABLES(opt, server_wrapper)
+        os.environ['SMBD_VALGRIND'] = EXPAND_VARIABLES(opt, server_wrapper)
 
     # this is needed for systems without rpath, or with rpath disabled
     ADD_LD_LIBRARY_PATH('bin/shared')
@@ -171,10 +179,9 @@ def cmd_testonly(opt):
     # if we are using a system version of ldb then we need to tell it to
     # load modules from our modules path
     if env.USING_SYSTEM_LDB:
-        os.environ['LDB_MODULES_PATH'] = 'bin/modules/ldb'
+        os.environ['LDB_MODULES_PATH'] = os.path.abspath(os.path.join(env.cwd, 'bin/modules/ldb'))
 
     # tell build system where to find config.h
-    os.environ['VFSLIBDIR'] = os.path.abspath('bin/modules/vfs')
     os.environ['CONFIG_H'] = 'bin/default/include/config.h'
 
     st_done = os.path.join(env.SELFTEST_PREFIX, 'st_done')