maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix check-lit compatibility with multi-config CMake generators 

Multi-configuration CMake generators such as those for Visual Studio or Xcode do not
specify a build config at configure time, but let the user choose at build
time.  In these cases binaries go into build/${Configuration}/bin rather than
build/bin.  Prior to this commit, check-lit would fail when using multi-configuration
generators as it did not know how to resolve ${Configuration} in order
to find tools such as FileCheck.  This commit teaches it to resolve
llvm_tools_dir within lit using the value specified with --param
build_mode.

Differential Revision: https://reviews.llvm.org/D36263

llvm-svn: 309967
This commit is contained in:
Greg Bedwell 2017-08-03 17:55:54 +00:00
parent 9a18a6f08b
commit fd2c379568
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/utils/lit/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# The configured file is not placed in the correct location # The configured file is not placed in the correct location
# until the tests are run as we need to copy it into # until the tests are run as we need to copy it into
# a copy of the tests folder # a copy of the tests folder
configure_file("tests/lit.site.cfg.in" "lit.site.cfg" @ONLY) configure_lit_site_cfg("tests/lit.site.cfg.in" "lit.site.cfg")
# Lit's test suite creates output files next to the sources which makes the # Lit's test suite creates output files next to the sources which makes the
# source tree dirty. This is undesirable because we do out of source builds. # source tree dirty. This is undesirable because we do out of source builds.

17
llvm/utils/lit/tests/lit.site.cfg.in
View File

@ -1,8 +1,19 @@
## Autogenerated by LLVM/Clang configuration. @LIT_SITE_CFG_IN_HEADER@
# Do not edit!
import sys
config.llvm_src_root = "@LLVM_SOURCE_DIR@" config.llvm_src_root = "@LLVM_SOURCE_DIR@"
config.llvm_obj_root = "@LLVM_BINARY_DIR@" config.llvm_obj_root = "@LLVM_BINARY_DIR@"
config.llvm_tools_dir = "@LLVM_TOOLS_BINARY_DIR@" config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
# Support substitution of the tools_dir with user parameters.
# This is used when we can't determine the tool dir at configuration time.
try:
config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
except KeyError:
e = sys.exc_info()[1]
key, = e.args
lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))
# Let the main config do the real work. # Let the main config do the real work.
lit_config.load_config(config, "@LLVM_BINARY_DIR@/utils/lit/tests/lit.cfg") lit_config.load_config(config, "@LLVM_BINARY_DIR@/utils/lit/tests/lit.cfg")