diff options
| -rw-r--r-- | llvm/utils/lit/tests/Inputs/shtest-timeout/lit.cfg | 10 | ||||
| -rw-r--r-- | llvm/utils/lit/tests/lit.cfg | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/llvm/utils/lit/tests/Inputs/shtest-timeout/lit.cfg b/llvm/utils/lit/tests/Inputs/shtest-timeout/lit.cfg index 96bf18170a8..6256f5a9911 100644 --- a/llvm/utils/lit/tests/Inputs/shtest-timeout/lit.cfg +++ b/llvm/utils/lit/tests/Inputs/shtest-timeout/lit.cfg @@ -28,5 +28,13 @@ config.test_source_root = os.path.dirname(__file__) config.test_exec_root = config.test_source_root config.target_triple = '(unused)' src_root = os.path.join(config.test_source_root, '..') -config.environment['PYTHONPATH'] = src_root + +pythonpath_list = [src_root] +# Ensure the user's PYTHONPATH is included. +if 'PYTHONPATH' in os.environ: + pythonpath_list.append(os.environ['PYTHONPATH']) +if 'PYTHONPATH' in config.environment: + pythonpath_list.append(config.environment['PYTHONPATH']) +config.environment['PYTHONPATH'] = os.pathsep.join(pythonpath_list) + config.substitutions.append(('%{python}', '"%s"' % (sys.executable))) diff --git a/llvm/utils/lit/tests/lit.cfg b/llvm/utils/lit/tests/lit.cfg index 01a3431b435..2af93d6314a 100644 --- a/llvm/utils/lit/tests/lit.cfg +++ b/llvm/utils/lit/tests/lit.cfg @@ -34,7 +34,15 @@ if llvm_src_root != None: else: lit_path = src_root -config.environment['PYTHONPATH'] = lit_path # Required because some tests import the lit module +pythonpath_list = [lit_path] # Required because some tests import the lit module + +# Ensure the user's PYTHONPATH is included. +if 'PYTHONPATH' in os.environ: + pythonpath_list.append(os.environ['PYTHONPATH']) +if 'PYTHONPATH' in config.environment: + pythonpath_list.append(config.environment['PYTHONPATH']) +config.environment['PYTHONPATH'] = os.pathsep.join(pythonpath_list) + config.substitutions.append(('%{src_root}', src_root)) config.substitutions.append(('%{inputs}', os.path.join( src_root, 'tests', 'Inputs'))) |
