From adffced3df2368a20a6f122f301886be4430a538 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Tue, 9 Nov 2010 22:04:44 +0000 Subject: [PATCH] Preserve the original environment (e.g. LD_LIBRARY_PATH) --- Lib/test/script_helper.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Lib/test/script_helper.py b/Lib/test/script_helper.py index 095895ee50d..14e113bd397 100644 --- a/Lib/test/script_helper.py +++ b/Lib/test/script_helper.py @@ -17,12 +17,13 @@ from test.support import make_legacy_pyc # Executing the interpreter in a subprocess def _assert_python(expected_success, *args, **env_vars): cmd_line = [sys.executable] - if env_vars: - env = env_vars - else: - env = os.environ + if not env_vars: cmd_line.append('-E') cmd_line.extend(args) + # Need to preserve the original environment, for in-place testing of + # shared library builds. + env = os.environ.copy() + env.update(env_vars) p = subprocess.Popen(cmd_line, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)