diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2013-12-18 15:08:56 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2013-12-18 15:08:56 +0000 |
| commit | 462ba80fda5df05cc6b7bd1d77a4469c690708d1 (patch) | |
| tree | 0c18f775ea2e6ff69104b1720386d45851eafa46 | |
| parent | 96357e6af73c3483da568665ecd357b63c397cdc (diff) | |
| download | bcm5719-llvm-462ba80fda5df05cc6b7bd1d77a4469c690708d1.tar.gz bcm5719-llvm-462ba80fda5df05cc6b7bd1d77a4469c690708d1.zip | |
check-clang: Introduce clang_tools_dir in lit.site.cfg, for clang separated from llvm.
llvm-svn: 197576
| -rw-r--r-- | clang/test/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | clang/test/Makefile | 1 | ||||
| -rw-r--r-- | clang/test/lit.cfg | 6 | ||||
| -rw-r--r-- | clang/test/lit.site.cfg.in | 1 |
4 files changed, 8 insertions, 1 deletions
diff --git a/clang/test/CMakeLists.txt b/clang/test/CMakeLists.txt index b76a6ace5bb..c3818be339e 100644 --- a/clang/test/CMakeLists.txt +++ b/clang/test/CMakeLists.txt @@ -10,6 +10,7 @@ else () set(LLVM_BUILD_MODE "%(build_mode)s") endif () +string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} CLANG_TOOLS_DIR ${CLANG_RUNTIME_OUTPUT_INTDIR}) string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLVM_TOOLS_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLVM_LIBS_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) diff --git a/clang/test/Makefile b/clang/test/Makefile index dbfa52177b7..988d6019414 100644 --- a/clang/test/Makefile +++ b/clang/test/Makefile @@ -44,6 +44,7 @@ lit.site.cfg: FORCE @$(ECHOPATH) s=@LLVM_LIBS_DIR@=$(LibDir)=g >> lit.tmp @$(ECHOPATH) s=@CLANG_SOURCE_DIR@=$(PROJ_SRC_DIR)/..=g >> lit.tmp @$(ECHOPATH) s=@CLANG_BINARY_DIR@=$(PROJ_OBJ_DIR)/..=g >> lit.tmp + @$(ECHOPATH) s=@CLANG_TOOLS_DIR@=$(ToolDir)=g >> lit.tmp @$(ECHOPATH) s=@TARGET_TRIPLE@=$(TARGET_TRIPLE)=g >> lit.tmp @$(ECHOPATH) s=@ENABLE_CLANG_ARCMT@=$(ENABLE_CLANG_ARCMT)=g >> lit.tmp @$(ECHOPATH) s=@ENABLE_CLANG_REWRITER@=$(ENABLE_CLANG_REWRITER)=g >> lit.tmp diff --git a/clang/test/lit.cfg b/clang/test/lit.cfg index 7082d1e5185..eea7f89b9ff 100644 --- a/clang/test/lit.cfg +++ b/clang/test/lit.cfg @@ -94,10 +94,14 @@ for name in possibly_dangerous_env_vars: # Tweak the PATH to include the tools dir and the scripts dir. if clang_obj_root is not None: + clang_tools_dir = getattr(config, 'clang_tools_dir', None) + if not clang_tools_dir: + lit_config.fatal('No Clang tools dir set!') llvm_tools_dir = getattr(config, 'llvm_tools_dir', None) if not llvm_tools_dir: lit_config.fatal('No LLVM tools dir set!') - path = os.path.pathsep.join((llvm_tools_dir, config.environment['PATH'])) + path = os.path.pathsep.join(( + clang_tools_dir, llvm_tools_dir, config.environment['PATH'])) config.environment['PATH'] = path llvm_libs_dir = getattr(config, 'llvm_libs_dir', None) if not llvm_libs_dir: diff --git a/clang/test/lit.site.cfg.in b/clang/test/lit.site.cfg.in index 9a4fa33cdc1..65e52c77d0d 100644 --- a/clang/test/lit.site.cfg.in +++ b/clang/test/lit.site.cfg.in @@ -8,6 +8,7 @@ config.llvm_tools_dir = "@LLVM_TOOLS_DIR@" config.llvm_libs_dir = "@LLVM_LIBS_DIR@" config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@" config.clang_obj_root = "@CLANG_BINARY_DIR@" +config.clang_tools_dir = "@CLANG_TOOLS_DIR@" config.target_triple = "@TARGET_TRIPLE@" config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@" config.clang_arcmt = @ENABLE_CLANG_ARCMT@ |
