gr.add_option('--tests',
help=("wildcard pattern of tests to run"),
action="store", dest='TESTS', default='')
- gr.add_option('--target',
- help=("target of samba3 or samba4"),
- action="store", dest='TARGET', default=None)
gr.add_option('--filtered-subunit',
help=("output (xfail) filtered subunit"),
action="store_true", dest='FILTERED_SUBUNIT', default=False)
env.SUBUNIT_FORMATTER = os.getenv('SUBUNIT_FORMATTER')
if not env.SUBUNIT_FORMATTER:
env.SUBUNIT_FORMATTER = '${PYTHON} -u ${srcdir}/selftest/format-subunit --prefix=${SELFTEST_PREFIX} --immediate'
- env.FILTER_XFAIL = '${PYTHON} -u ${srcdir}/selftest/filter-subunit --expected-failures=${SELFTEST_DIR}/knownfail'
+ env.FILTER_XFAIL = '${PYTHON} -u ${srcdir}/selftest/filter-subunit --expected-failures=${srcdir}/selftest/knownfail --flapping=${srcdir}/selftest/flapping'
if Options.options.FAIL_IMMEDIATELY:
env.FILTER_XFAIL += ' --fail-immediately'
os.environ['TESTENV_%s' % o.upper()] = str(getattr(Options.options, o, ''))
binary_mapping = ('nmblookup3:nmblookup3,' +
- 'smbclient3:smbclient3,' +
+ 'smbclient:smbclient,' +
'smbtorture4:smbtorture,' +
'ntlm_auth3:ntlm_auth3')
env.OPTIONS = '--binary-mapping=%s' % binary_mapping
if not Options.options.SLOWTEST:
- env.OPTIONS += ' --exclude=${SELFTEST_DIR}/slow'
+ env.OPTIONS += ' --exclude=${srcdir}/selftest/slow'
if Options.options.QUICKTEST:
- env.OPTIONS += ' --quick --include=${SELFTEST_DIR}/quick'
+ env.OPTIONS += ' --quick --include=${srcdir}/selftest/quick'
if Options.options.LOAD_LIST:
env.OPTIONS += ' --load-list=%s' % Options.options.LOAD_LIST
if Options.options.TESTENV:
env.OPTIONS += ' --socket-wrapper-pcap'
if Options.options.SOCKET_WRAPPER_KEEP_PCAP:
env.OPTIONS += ' --socket-wrapper-keep-pcap'
- if Options.options.LIST:
- env.OPTIONS += ' --list'
if os.environ.get('RUN_FROM_BUILD_FARM') is not None:
env.FILTER_OPTIONS = '${FILTER_XFAIL} --strip-passed-output'
else:
if env.USING_SYSTEM_LDB:
os.environ['LDB_MODULES_PATH'] = 'bin/modules/ldb'
+ if env.BUILD_TDB2:
+ os.environ['BUILD_TDB2'] = '1'
+
# 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'
if not os.path.isdir(env.SELFTEST_PREFIX):
os.makedirs(env.SELFTEST_PREFIX, int('755', 8))
- if Options.options.TARGET:
- env.SELFTEST_TARGET = Options.options.TARGET
- else:
- env.SELFTEST_TARGET = "samba4"
-
- if env.SELFTEST_TARGET == "samba4":
- env.SELFTEST_DIR = "${srcdir}/source4/selftest"
- elif env.SELFTEST_TARGET == "samba3":
- env.SELFTEST_DIR = "${srcdir}/source3/selftest"
-
- if env.SELFTEST_TARGET == "samba":
- env.SELFTEST_DIR = "${srcdir}/source3/selftest"
- xfail = ""
- xfail += EXPAND_VARIABLES(opt, env.FILTER_XFAIL)
- xfail += " | "
- env.SELFTEST_DIR = "${srcdir}/source4/selftest"
- xfail += EXPAND_VARIABLES(opt, env.FILTER_XFAIL)
- env.FILTER_XFAIL = xfail;
- cmd = '(${PERL} ${srcdir}/selftest/selftest.pl --target=${SELFTEST_TARGET} --prefix=${SELFTEST_PREFIX} --srcdir=${srcdir} --exclude="${srcdir}/source4/selftest/skip" --exclude="${srcdir}/source3/selftest/skip" --testlist="${PYTHON} ${srcdir}/source3/selftest/tests.py|" --testlist="${PYTHON} ${srcdir}/source4/selftest/tests.py|" ${OPTIONS} --socket-wrapper ${TESTS} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS} | tee ${SELFTEST_PREFIX}/subunit'
- else:
- # We use the full path rather than relative path because it cause problems on some plateforms (ie. solaris 8).
- cmd = '(${PERL} ${srcdir}/selftest/selftest.pl --target=${SELFTEST_TARGET} --prefix=${SELFTEST_PREFIX} --srcdir=${srcdir} --exclude=${SELFTEST_DIR}/skip --testlist="${PYTHON} ${SELFTEST_DIR}/tests.py|" ${OPTIONS} --socket-wrapper ${TESTS} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS} | tee ${SELFTEST_PREFIX}/subunit'
+ env.TESTLISTS = ('--testlist="${PYTHON} ${srcdir}/source3/selftest/tests.py|" ' +
+ '--testlist="${PYTHON} ${srcdir}/source4/selftest/tests.py|"')
- if os.environ.get('RUN_FROM_BUILD_FARM') is None and not Options.options.FILTERED_SUBUNIT:
- cmd += ' | ${FORMAT_TEST_OUTPUT}'
+ # We use the full path rather than relative path because it cause problems on some plateforms (ie. solaris 8).
+ env.CORE_COMMAND = '${PERL} ${srcdir}/selftest/selftest.pl --target=samba --prefix=${SELFTEST_PREFIX} --srcdir=${srcdir} --exclude=${srcdir}/selftest/skip ${TESTLISTS} ${OPTIONS} ${TESTS}'
+ if Options.options.LIST:
+ cmd = '${CORE_COMMAND} --list'
else:
- cmd += ' | ${PYTHON} -u ${srcdir}/selftest/filter-subunit'
+ env.OPTIONS += ' --socket-wrapper'
+ 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}'
runcmd = EXPAND_VARIABLES(opt, cmd)
print("test: running %s" % runcmd)
ret = RUN_COMMAND(cmd, env=env)
- if os.path.exists(".testrepository"):
- # "testr load -q" isn't
+
+ if os.path.exists(".testrepository") and not Options.options.LIST:
testrcmd = 'testr load -q < ${SELFTEST_PREFIX}/subunit > /dev/null'
runcmd = EXPAND_VARIABLES(opt, testrcmd)
RUN_COMMAND(runcmd, env=env)
print("ERROR: test failed with exit code %d" % ret)
sys.exit(ret)
- if not os.path.exists(st_done):
+ if not Options.options.LIST and not os.path.exists(st_done):
print("ERROR: test command failed to complete")
sys.exit(1)
# main test entry point
def cmd_test(opt):
'''Run the test suite (see test options below)'''
+
+ # if running all tests, then force a symbol check
+ env = LOAD_ENVIRONMENT()
+ CHECK_MAKEFLAGS(env)
+ if not Options.options.TESTS:
+ Options.options.DUP_SYMBOLCHECK = True
+
Scripting.commands.append('build')
Scripting.commands.append('testonly')
git.samba.org / kai / samba.git / blobdiff