From 78a88e7233aece64a57741de617d6b80b6082be1 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Sat, 25 Jul 2009 10:14:19 +0000 Subject: [PATCH] MultiTestRunner: Explicitly define child environment, the only variable we need to import is the PATH. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@77061 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/test/TestRunner.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/utils/test/TestRunner.py b/utils/test/TestRunner.py index c767103377..246a22b438 100755 --- a/utils/test/TestRunner.py +++ b/utils/test/TestRunner.py @@ -23,10 +23,8 @@ import signal import subprocess import sys -# Increase determinism for things that use the terminal width. -# -# FIXME: Find a better place for this hack. -os.environ['COLUMNS'] = '0' +# Increase determinism by explicitly choosing the environment. +kChildEnv = { 'PATH' : os.environ.get('PATH','') } kSystemName = platform.system() @@ -163,7 +161,8 @@ def runOneTest(FILENAME, SUBST, OUTPUT, TESTNAME, CLANG, CLANGCC, cwd=os.path.dirname(FILENAME), stdin=subprocess.PIPE, stdout=subprocess.PIPE, - stderr=subprocess.PIPE) + stderr=subprocess.PIPE, + env=kChildEnv) out,err = p.communicate() outputFile.write(out) outputFile.write(err) -- 2.50.1