Skip to content

Commit

Permalink
Merge pull request #35 from hyp/fix_lit
Browse files Browse the repository at this point in the history
[lit] Drop the user-site packages directory from search paths when ru…
  • Loading branch information
hyp authored Oct 27, 2019
2 parents 4d31871 + 617aae3 commit 7493642
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions llvm/utils/lit/tests/lit.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ else:

# Required because some tests import the lit module
llvm_config.with_environment('PYTHONPATH', lit_path, append_path=True)
# Do not add user-site packages directory to the python search path. This avoids test failures if there's an
# incompatible lit module installed inside the user-site packages directory, as it gets prioritized over the lit
# from the PYTHONPATH.
config.environment['PYTHONNOUSERSITE'] = '1'

# Add llvm and lit tools directories if this config is being loaded indirectly.
for attribute in ('llvm_tools_dir', 'lit_tools_dir'):
Expand Down

0 comments on commit 7493642

Please sign in to comment.