diff options
| author | Tim Beale <timbeale@catalyst.net.nz> | 2019-03-11 16:28:16 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-03-12 01:53:26 +0000 |
| commit | 345c33d1d0b7a33109ab2cf82774be21ffce7857 (patch) | |
| tree | 93928a7fc8aa9029af3181a8dd0e4da511b06f2d /selftest/wscript | |
| parent | a64c2e3bde7cd0ca62390de191983e520f8ee7da (diff) | |
| download | samba-345c33d1d0b7a33109ab2cf82774be21ffce7857.tar.gz | |
selftest: Remove RUN_FROM_BUILD_FARM env variable
The build farm is no longer used, so we can remove checks for this
environment variable in the selftest code.
Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'selftest/wscript')
| -rw-r--r-- | selftest/wscript | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/selftest/wscript b/selftest/wscript index 727adcf3126..7d8300f055a 100644 --- a/selftest/wscript +++ b/selftest/wscript @@ -185,8 +185,6 @@ def cmd_testonly(opt): if Options.options.PERF_TEST: env.FILTER_OPTIONS = ('${PYTHON} -u ${srcdir}/selftest/filter-subunit ' '--perf-test-output') - elif os.environ.get('RUN_FROM_BUILD_FARM') is not None: - env.FILTER_OPTIONS = '${FILTER_XFAIL} --strip-passed-output' else: env.FILTER_OPTIONS = '${FILTER_XFAIL}' @@ -314,8 +312,7 @@ def cmd_testonly(opt): # Skip subunit filtering (i.e. because python is disabled). # Use --one to bail out upon any failure cmd = '(${CORE_COMMAND} --one && touch ${SELFTEST_PREFIX}/st_done)' - elif (os.environ.get('RUN_FROM_BUILD_FARM') is None and - not Options.options.FILTERED_SUBUNIT): + elif not Options.options.FILTERED_SUBUNIT: subunit_cache = os.path.join(env.SELFTEST_PREFIX, "subunit") cmd += ' | tee %s | ${FORMAT_TEST_OUTPUT}' % subunit_cache else: |