mgorny created this revision.
mgorny added a project: clang-tools-extra.
Use the LLVM_UTILS_PROVIDED variable to determine whether test tool
dependencies should be exposed for clang-tools-extra tests. If clang is
being built stand-alone and LLVM test tools (FileCheck, count and not)
are installed, the top-level CMakeLists.txt of clang sets this variable
to indicate that they will not be built as a part of this build,
and therefore no dependencies should be emitted for them. This fixes
the dependency errors when building clang stand-alone with tests
enabled.
Repository:
rL LLVM
https://reviews.llvm.org/D29851
Files:
test/CMakeLists.txt
Index: test/CMakeLists.txt
===================================================================
--- test/CMakeLists.txt
+++ test/CMakeLists.txt
@@ -31,9 +31,6 @@
endif()
set(CLANG_TOOLS_TEST_DEPS
- # Base line deps.
- FileCheck count not
-
# clang-tidy tests require it.
clang-headers
@@ -58,6 +55,13 @@
ExtraToolsUnitTests
)
+if(NOT LLVM_UTILS_PROVIDED)
+ list(APPEND CLANG_TOOLS_TEST_DEPS
+ # Base line deps.
+ FileCheck count not
+ )
+endif()
+
add_lit_testsuite(check-clang-tools "Running the Clang extra tools' regression
tests"
${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${CLANG_TOOLS_TEST_DEPS}
Index: test/CMakeLists.txt
===================================================================
--- test/CMakeLists.txt
+++ test/CMakeLists.txt
@@ -31,9 +31,6 @@
endif()
set(CLANG_TOOLS_TEST_DEPS
- # Base line deps.
- FileCheck count not
-
# clang-tidy tests require it.
clang-headers
@@ -58,6 +55,13 @@
ExtraToolsUnitTests
)
+if(NOT LLVM_UTILS_PROVIDED)
+ list(APPEND CLANG_TOOLS_TEST_DEPS
+ # Base line deps.
+ FileCheck count not
+ )
+endif()
+
add_lit_testsuite(check-clang-tools "Running the Clang extra tools' regression tests"
${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${CLANG_TOOLS_TEST_DEPS}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
