diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-04-18 18:59:00 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-04-19 14:26:59 +1000 |
| commit | 1ac46518a7b2009bb6ee21a84d20ee991e7a35ee (patch) | |
| tree | 958f5cc7a04ca0ce737648cbc7f6d85415acaf20 | |
| parent | 790ceec78bc4f1b5234d8f90eb4bfaa11c2f7d4b (diff) | |
| download | samba-1ac46518a7b2009bb6ee21a84d20ee991e7a35ee.tar.gz samba-1ac46518a7b2009bb6ee21a84d20ee991e7a35ee.tar.bz2 samba-1ac46518a7b2009bb6ee21a84d20ee991e7a35ee.zip | |
selftest: Add hooks to enable a combined selftest run.
Andrew Bartlett
| -rw-r--r-- | selftest/wscript | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/selftest/wscript b/selftest/wscript index ecf650274a..25ea823ff7 100644 --- a/selftest/wscript +++ b/selftest/wscript @@ -182,8 +182,19 @@ def cmd_testonly(opt): 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' + 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' + if os.environ.get('RUN_FROM_BUILD_FARM') is None and not Options.options.FILTERED_SUBUNIT: cmd += ' | ${FORMAT_TEST_OUTPUT}' else: |