tools: fix test runner in presence of NODE_REPL_EXTERNAL_MODULE

devsnek · targos · commit 8d030131a4cf · 2019-11-10T14:50:09.000+01:00
PR-URL: #29956 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
diff --git a/tools/test.py b/tools/test.py
@@ -700,6 +700,10 @@ def Execute(args, context, timeout=None, env=None, disable_core_files=False, std
 if "NODE_PATH" in env_copy:
 del env_copy["NODE_PATH"]
 
+ # Remove NODE_REPL_EXTERNAL_MODULE
+ if "NODE_REPL_EXTERNAL_MODULE" in env_copy:
+ del env_copy["NODE_REPL_EXTERNAL_MODULE"]
+
 # Extend environment
 for key, value in env.items():
 env_copy[key] = value

-Original file line number
+Diff line change
 if"NODE_PATH"inenv_copy:
 delenv_copy["NODE_PATH"]
 +# Remove NODE_REPL_EXTERNAL_MODULE
 +if"NODE_REPL_EXTERNAL_MODULE"inenv_copy:
 +delenv_copy["NODE_REPL_EXTERNAL_MODULE"]
++
 # Extend environment
 forkey, valueinenv.items():
 env_copy[key] =value