From 562a33d98b8faf2c19b8e3a22118e50604e9c385 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Thu, 9 Oct 2014 01:36:08 -0700 Subject: [PATCH] Inherit LD_LIBRARY_PATH in subprocess --- tools/perf.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/perf.py b/tools/perf.py index a5c11f260..8301201d7 100755 --- a/tools/perf.py +++ b/tools/perf.py @@ -29,7 +29,11 @@ class PerfTest(object): if self.renderer != 'software': args.append('-N') args.append(self.rom) - proc = subprocess.Popen(args, stdout=subprocess.PIPE, cwd=cwd, universal_newlines=True) + env = {} + if 'LD_LIBRARY_PATH' in os.environ: + env['LD_LIBRARY_PATH'] = os.environ['LD_LIBRARY_PATH'] + env['DYLD_LIBRARY_PATH'] = os.environ['LD_LIBRARY_PATH'] # Fake it on OS X + proc = subprocess.Popen(args, stdout=subprocess.PIPE, cwd=cwd, universal_newlines=True, env=env) try: self.wait(proc) proc.wait()