Skip to content

Commit

Permalink
CMake/lit: Add llvm_{unit_,}site_config parameters, and always pass t…
Browse files Browse the repository at this point in the history
…hem when running tests from the project files.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@90869 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
ddunbar committed Dec 8, 2009
1 parent e8b0915 commit aefd63d
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 0 deletions.
2 changes: 2 additions & 0 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ if(PYTHONINTERP_FOUND)
${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg
COMMAND ${PYTHON_EXECUTABLE}
${LLVM_SOURCE_DIR}/utils/lit/lit.py
--param llvm_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
--param llvm_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg
-sv
${CMAKE_CURRENT_BINARY_DIR}
DEPENDS
Expand Down
6 changes: 6 additions & 0 deletions test/Unit/lit.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ if config.test_exec_root is None:
# configuration hasn't been created by the build system, or we are in an
# out-of-tree build situation).

# Check for 'llvm_unit_site_config' user parameter, and use that if available.
site_cfg = lit.params.get('llvm_unit_site_config', None)
if site_cfg and os.path.exists(site_cfg):
lit.load_config(config, site_cfg)
raise SystemExit

# Try to detect the situation where we are using an out-of-tree build by
# looking for 'llvm-config'.
#
Expand Down
6 changes: 6 additions & 0 deletions test/lit.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ if config.test_exec_root is None:
# configuration hasn't been created by the build system, or we are in an
# out-of-tree build situation).

# Check for 'llvm_site_config' user parameter, and use that if available.
site_cfg = lit.params.get('llvm_site_config', None)
if site_cfg and os.path.exists(site_cfg):
lit.load_config(config, site_cfg)
raise SystemExit

# Try to detect the situation where we are using an out-of-tree build by
# looking for 'llvm-config'.
#
Expand Down

0 comments on commit aefd63d

Please sign in to comment.