Remove now-unused s3-selftest.sh wrapper

[obnox/samba/samba-obnox.git] / selftest / wscript

diff --git a/selftest/wscript b/selftest/wscript
index a5b2e5358f6460380dfdc3c2c6b60225c439363e..c7637a19ac5837ab6acdc1537316b571f478691d 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,14 +115,18 @@ 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,' +
                       'smbclient3:smbclient,' +
                       'smbclient4:smbclient4,' +
                       'smbtorture4:smbtorture,' + 
-                      'ntlm_auth3:ntlm_auth3')
+                      'ntlm_auth3:ntlm_auth')
 
     env.OPTIONS = '--binary-mapping=%s' % binary_mapping 
     if not Options.options.SLOWTEST: