From 345c33d1d0b7a33109ab2cf82774be21ffce7857 Mon Sep 17 00:00:00 2001 From: Tim Beale Date: Mon, 11 Mar 2019 16:28:16 +1300 Subject: [PATCH] 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 Reviewed-by: Andrew Bartlett --- selftest/wscript | 5 +---- 1 file changed, 1 insertion(+), 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: -- 2.34.1