Merge pull request #775 from ueno/wip/dueno/pythonpath

scripts_retention.py: don't override PYTHONPATH if already set
tlsfuzzer · Sep 7, 2021 · 27b48ab · 27b48ab
2 parents 85f9c1e + a97eca8
commit 27b48ab
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/tests/scripts_retention.py b/tests/scripts_retention.py
@@ -155,7 +155,8 @@ def run_clients(tests, common_args, srv, expected_size):
                      arg in arguments]
         proc_args.extend(common_args + arguments)
         my_env = os.environ.copy()
-        my_env["PYTHONPATH"]="."
+        path = my_env.get("PYTHONPATH")
+        my_env["PYTHONPATH"] = ".:{0}".format(path) if path else "."
         proc = Popen(proc_args, env=my_env,
                      stdout=PIPE, stderr=PIPE, bufsize=1)
         thr_stdout = Thread(target=process_stdout, args=(script, proc))