OSDN Git Service

Setup testing target dependencies for default runtimes
authorChris Bieneman <chris.bieneman@me.com>
Tue, 11 Jun 2019 00:25:57 +0000 (00:25 +0000)
committerChris Bieneman <chris.bieneman@me.com>
Tue, 11 Jun 2019 00:25:57 +0000 (00:25 +0000)
Summary: The default runtimes targets aren't getting their dependencies configured correctly which results in check-runtimes failing when built from a clean build.

Reviewers: phosek, compnerd

Reviewed By: phosek

Subscribers: mgorny, llvm-commits

Tags: #llvm

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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@363015 91177308-0d34-0410-b5e6-96231b3b80d8

runtimes/CMakeLists.txt

index 218c5a8..552ab7b 100644 (file)
@@ -352,6 +352,7 @@ else() # if this is included from LLVM's CMake
     cmake_parse_arguments(ARG "" "" "DEPENDS;PREFIXES" ${ARGN})
 
     include(${LLVM_BINARY_DIR}/runtimes/Components.cmake OPTIONAL)
+    set(SUB_CHECK_TARGETS ${SUB_CHECK_TARGETS} PARENT_SCOPE)
     set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${LLVM_BINARY_DIR}/runtimes/Components.cmake)
 
     foreach(runtime_name ${runtime_names})
@@ -497,6 +498,7 @@ else() # if this is included from LLVM's CMake
       runtime_default_target(
         DEPENDS ${deps}
         PREFIXES ${prefixes})
+      set(test_targets check-runtimes)
     else()
       if("default" IN_LIST LLVM_RUNTIME_TARGETS)
         runtime_default_target(