diff options
author | Zachary Turner <zturner@google.com> | 2017-11-21 01:20:28 +0000 |
---|---|---|
committer | Zachary Turner <zturner@google.com> | 2017-11-21 01:20:28 +0000 |
commit | 7480dbd812d251e1a4bbc52ccde153098b5fb5de (patch) | |
tree | f2787ed050b510556a2d690316a885447efcb3a5 /CMakeLists.txt | |
parent | ed677fa0892ab5730a1bb7d67e46bdb7e8d54e20 (diff) |
Re-revert "Refactor debuginfo-tests."
This is still breaking greendragon.
At this point I give up until someone can fix the greendragon
bots, and I will probably abandon this effort in favor of using
a private github repository.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@318722 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f5b138b53b..8cd9d053c63 100644 --- a/CMakeLists.txt +++ b/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) |