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
diff --git a/utils/test/TestRunner.py b/utils/test/TestRunner.py
index c767103..246a22b 100755
--- a/utils/test/TestRunner.py
+++ b/utils/test/TestRunner.py
@@ -23,10 +23,8 @@
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 @@
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)