r280394 - [CMake] Properly connecting Compiler-RT check and test-depends

Chris Bieneman via cfe-commits cfe-commits at lists.llvm.org
Thu Sep 1 11:28:49 PDT 2016


Author: cbieneman
Date: Thu Sep  1 13:28:49 2016
New Revision: 280394

URL: http://llvm.org/viewvc/llvm-project?rev=280394&view=rev
Log:
[CMake] Properly connecting Compiler-RT check and test-depends

This correctly connects compiler-rt-test-depends to test-depends and
check-compiler-rt to check-all.

Based on LLVM r280392, and Compiler-RT r280393.

Modified:
    cfe/trunk/runtime/CMakeLists.txt

Modified: cfe/trunk/runtime/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/runtime/CMakeLists.txt?rev=280394&r1=280393&r2=280394&view=diff
==============================================================================
--- cfe/trunk/runtime/CMakeLists.txt (original)
+++ cfe/trunk/runtime/CMakeLists.txt Thu Sep  1 13:28:49 2016
@@ -143,6 +143,15 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND E
       DEPENDS compiler-rt-build ${COMPILER_RT_TEST_DEPENDENCIES}
       WORKING_DIRECTORY ${BINARY_DIR}
       VERBATIM USES_TERMINAL)
-    set_property(GLOBAL APPEND PROPERTY LLVM_LIT_DEPENDS check-compiler-rt)
+
+    # Add special target to run all compiler-rt test suites.
+    get_ext_project_build_command(run_check_compiler_rt compiler-rt-test-depends)
+    add_custom_target(compiler-rt-test-depends
+      COMMAND ${run_check_compiler_rt}
+      DEPENDS compiler-rt-build ${COMPILER_RT_TEST_DEPENDENCIES}
+      WORKING_DIRECTORY ${BINARY_DIR}
+      VERBATIM USES_TERMINAL)
+    set_property(GLOBAL APPEND PROPERTY LLVM_ADDITIONAL_TEST_DEPENDS compiler-rt-test-depends)
+    set_property(GLOBAL APPEND PROPERTY LLVM_ADDITIONAL_TEST_TARGETS check-compiler-rt)
   endif()
 endif()




More information about the cfe-commits mailing list