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_auth')
-
- env.OPTIONS = '--binary-mapping=%s' % binary_mapping
+ env.OPTIONS = ''
if not Options.options.SLOWTEST:
env.OPTIONS += ' --exclude=${srcdir}/selftest/slow'
if Options.options.QUICKTEST:
env.SELFTEST_TARGET = "samba3"
env.OPTIONS += " --nss_wrapper_so_path=" + CONFIG_GET(opt, 'LIBNSS_WRAPPER_SO_PATH')
+ env.OPTIONS += " --resolv_wrapper_so_path=" + CONFIG_GET(opt, 'LIBRESOLV_WRAPPER_SO_PATH')
env.OPTIONS += " --socket_wrapper_so_path=" + CONFIG_GET(opt, 'LIBSOCKET_WRAPPER_SO_PATH')
env.OPTIONS += " --uid_wrapper_so_path=" + CONFIG_GET(opt, 'LIBUID_WRAPPER_SO_PATH')
+ #if unversioned_sys_platform in ('freebsd', 'netbsd', 'openbsd', 'sunos'):
+ # env.OPTIONS += " --use-dns-faking"
+
+ # FIXME REMOVE ME!
+ env.OPTIONS += " --use-dns-faking"
+
+
+ subunit_cache = None
# We use the full path rather than relative path to avoid problems on some platforms (ie. solaris 8).
env.CORE_COMMAND = '${PERL} ${srcdir}/selftest/selftest.pl --target=${SELFTEST_TARGET} --prefix=${SELFTEST_PREFIX} --srcdir=${srcdir} --exclude=${srcdir}/selftest/skip ${TESTLISTS} ${OPTIONS} ${TESTS}'
if Options.options.LIST:
cmd = '(${CORE_COMMAND} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS}'
if (os.environ.get('RUN_FROM_BUILD_FARM') is None and
not Options.options.FILTERED_SUBUNIT):
- cmd += ' | tee ${SELFTEST_PREFIX}/subunit | ${FORMAT_TEST_OUTPUT}'
+ subunit_cache = os.path.join(env.SELFTEST_PREFIX, "subunit")
+ cmd += ' | tee %s | ${FORMAT_TEST_OUTPUT}' % subunit_cache
else:
cmd += ' | ${FILTER_OPTIONS}'
runcmd = EXPAND_VARIABLES(opt, cmd)
if (os.path.exists(".testrepository") and
not Options.options.LIST and
- not Options.options.LOAD_LIST):
- testrcmd = 'testr load -q < ${SELFTEST_PREFIX}/subunit > /dev/null'
+ not Options.options.LOAD_LIST and
+ subunit_cache is not None):
+ testrcmd = 'testr load -q < %s > /dev/null' % subunit_cache
runcmd = EXPAND_VARIABLES(opt, testrcmd)
RUN_COMMAND(runcmd, env=env)
- subunit_file = "%s/subunit" % env.SELFTEST_PREFIX
- if os.path.exists(subunit_file):
+ if subunit_cache is not None:
nb = Options.options.NB_SLOWEST
- cmd = "./script/show_testsuite_time %s %d" % (subunit_file, nb)
+ cmd = "./script/show_testsuite_time %s %d" % (subunit_cache, nb)
runcmd = EXPAND_VARIABLES(opt, cmd)
RUN_COMMAND(runcmd, env=env)