From 44ed3743af5ac879a53b16d58f05d97fe66a3ea4 Mon Sep 17 00:00:00 2001 From: Jan Niklas Hasse Date: Wed, 7 Nov 2018 18:18:57 +0100 Subject: Make output_test.py independent of the environment --- misc/output_test.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/misc/output_test.py b/misc/output_test.py index d19cebc..6a5b635 100755 --- a/misc/output_test.py +++ b/misc/output_test.py @@ -5,21 +5,27 @@ In order to simulate a smart terminal it uses the 'script' command. """ +import os import subprocess import sys import tempfile import unittest def run(build_ninja, flags='', pipe=False): + env = dict(os.environ) + if 'NINJA_STATUS' in env: + del env['NINJA_STATUS'] + env['TERM'] = '' with tempfile.NamedTemporaryFile('w') as f: f.write(build_ninja) f.flush() ninja_cmd = './ninja {} -f {}'.format(flags, f.name) try: if pipe: - output = subprocess.check_output([ninja_cmd], shell=True) + output = subprocess.check_output([ninja_cmd], shell=True, env=env) else: - output = subprocess.check_output(['script', '-qfec', ninja_cmd, '/dev/null']) + output = subprocess.check_output(['script', '-qfec', ninja_cmd, '/dev/null'], + env=env) except subprocess.CalledProcessError as err: sys.stdout.buffer.write(err.output) raise err -- cgit v0.12