diff options
author | Zachary Turner <zturner@google.com> | 2017-11-17 00:41:18 +0000 |
---|---|---|
committer | Zachary Turner <zturner@google.com> | 2017-11-17 00:41:18 +0000 |
commit | b5c237ec3d5f708e7118913923f3d50359dff40a (patch) | |
tree | b438760cb6dcd11f4a68498b270b55af373a95b4 /llvm/CMakeLists.txt | |
parent | 2f2ace985de421f9a4ff793ae2520ae91ecd4f0a (diff) | |
download | bcm5719-llvm-b5c237ec3d5f708e7118913923f3d50359dff40a.tar.gz bcm5719-llvm-b5c237ec3d5f708e7118913923f3d50359dff40a.zip |
Re-revert "Refactor debuginfo-tests"
This is still broken because it causes certain tests to be
run twice with slightly different configurations, which is
wrong in some cases.
You can observe this by running:
ninja -nv check-all | grep debuginfo-tests
And seeing that it passes clang/test and clang/test/debuginfo-tests
to lit, which causes it to run debuginfo-tests twice. The fix is
going to involve either:
a) figuring out that we're running in this "deprecated" configuration,
and then deleting the clang/test/debuginfo-tests path, which should
cause it to behave identically to before, or:
b) make lit smart enough that it doesn't descend into a sub-suite if
that sub-suite already has a lit.cfg file.
llvm-svn: 318486
Diffstat (limited to 'llvm/CMakeLists.txt')
-rw-r--r-- | llvm/CMakeLists.txt | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index 5f5b138b53b..8cd9d053c63 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -110,7 +110,7 @@ endif() # LLVM_EXTERNAL_${project}_SOURCE_DIR using LLVM_ALL_PROJECTS # This allows an easy way of setting up a build directory for llvm and another # one for llvm+clang+... using the same sources. -set(LLVM_ALL_PROJECTS "clang;libcxx;libcxxabi;lldb;compiler-rt;debuginfo-tests;lld;polly") +set(LLVM_ALL_PROJECTS "clang;libcxx;libcxxabi;lldb;compiler-rt;lld;polly") set(LLVM_ENABLE_PROJECTS "" CACHE STRING "Semicolon-separated list of projects to build (${LLVM_ALL_PROJECTS}), or \"all\".") if( LLVM_ENABLE_PROJECTS STREQUAL "all" ) @@ -885,18 +885,13 @@ if( LLVM_INCLUDE_EXAMPLES ) endif() if( LLVM_INCLUDE_TESTS ) - if(TARGET clang) + if(EXISTS ${LLVM_MAIN_SRC_DIR}/projects/test-suite AND TARGET clang) include(LLVMExternalProjectUtils) - if (EXISTS ${LLVM_MAIN_SRC_DIR}/projects/test-suite) - llvm_ExternalProject_Add(test-suite ${LLVM_MAIN_SRC_DIR}/projects/test-suite - USE_TOOLCHAIN - TOOLCHAIN_TOOLS clang lld clang-cl - EXCLUDE_FROM_ALL - NO_INSTALL - ALWAYS_CLEAN) - endif() - - add_llvm_external_project(debuginfo-tests projects/debuginfo-tests) + llvm_ExternalProject_Add(test-suite ${LLVM_MAIN_SRC_DIR}/projects/test-suite + USE_TOOLCHAIN + EXCLUDE_FROM_ALL + NO_INSTALL + ALWAYS_CLEAN) endif() add_subdirectory(utils/lit) add_subdirectory(test) |