Skip to content

Commit

Permalink
[lit] Drop the user-site packages directory from search paths when ru…
Browse files Browse the repository at this point in the history
…nning tests

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.
  • Loading branch information
hyp committed Oct 27, 2019
1 parent 06d3fce commit 32837a6
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 @@ -40,6 +40,10 @@ if llvm_config:
llvm_config.with_environment('PYTHONPATH', lit_path, append_path=True)
else:
config.environment['PYTHONPATH'] = os.pathsep.join([lit_path])
# 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.
# In this case, we can also expect llvm_config to have been imported correctly.
Expand Down

0 comments on commit 32837a6

Please sign in to comment.