summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--buildstream/plugin.py4
-rw-r--r--setup.cfg2
-rwxr-xr-xsetup.py1
3 files changed, 1 insertions, 6 deletions
diff --git a/buildstream/plugin.py b/buildstream/plugin.py
index ae5f4018f..775215462 100644
--- a/buildstream/plugin.py
+++ b/buildstream/plugin.py
@@ -526,9 +526,7 @@ class Plugin():
#
@contextmanager
def _output_file(self):
- if 'BST_TEST_SUITE' in os.environ:
- yield sys.stdout
- elif not self.__log:
+ if not self.__log:
with open(os.devnull, "w") as output:
yield output
else:
diff --git a/setup.cfg b/setup.cfg
index 8950a0c1b..e5414a8b0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -12,5 +12,3 @@ pep8ignore =
tmp/* ALL
*/lib/python3* ALL
*/bin/* ALL
-env =
- D:BST_TEST_SUITE=True
diff --git a/setup.py b/setup.py
index a13a06472..f66f76cc3 100755
--- a/setup.py
+++ b/setup.py
@@ -145,6 +145,5 @@ setup(name='BuildStream',
'pytest-datafiles',
'pytest-pep8',
'pytest-cov',
- 'pytest-env',
'pytest'],
zip_safe=False)