[llvm] f054d29 - Revert "[runtimes] Create Tests.cmake if it does not exist"

[Petr Hosek via llvm-commits]

Author: Petr Hosek
Date: 2022-04-01T09:29:54-07:00
New Revision: f054d291f22a0108b24a4fee518aa207b93d5809

URL: https://github.com/llvm/llvm-project/commit/f054d291f22a0108b24a4fee518aa207b93d5809
DIFF: https://github.com/llvm/llvm-project/commit/f054d291f22a0108b24a4fee518aa207b93d5809.diff

LOG: Revert "[runtimes] Create Tests.cmake if it does not exist"

This reverts commit d6623d72461b5a1ed3bd3ac966d14329e5b0f851 since
it broke the build on Mac.

Added: 
    

Modified: 
    llvm/runtimes/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt
index f4c486924fb5b..9ee124a5616cc 100644
--- a/llvm/runtimes/CMakeLists.txt
+++ b/llvm/runtimes/CMakeLists.txt
@@ -220,11 +220,7 @@ function(runtime_default_target)
   endforeach()
 
   if(LLVM_INCLUDE_TESTS)
-    if (NOT EXISTS ${LLVM_BINARY_DIR}/runtimes/Tests.cmake)
-      # This file will be later replaced by the runtimes subbuild.
-      file(TOUCH ${LLVM_BINARY_DIR}/runtimes/Tests.cmake)
-    endif()
-    include(${LLVM_BINARY_DIR}/runtimes/Tests.cmake)
+    include(${LLVM_BINARY_DIR}/runtimes/Tests.cmake OPTIONAL)
     set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${LLVM_BINARY_DIR}/runtimes/Tests.cmake)
     set_property(GLOBAL APPEND PROPERTY LLVM_LIT_TESTSUITES ${SUB_LIT_TESTSUITES})
     set_property(GLOBAL APPEND PROPERTY LLVM_LIT_PARAMS ${SUB_LIT_PARAMS})
@@ -306,11 +302,7 @@ function(runtime_register_target name target)
   endforeach()
 
   if(LLVM_INCLUDE_TESTS)
-    if (NOT EXISTS ${LLVM_BINARY_DIR}/runtimes/Tests.cmake)
-      # This file will be later replaced by the runtimes subbuild.
-      file(TOUCH ${LLVM_BINARY_DIR}/runtimes/Tests.cmake)
-    endif()
-    include(${LLVM_BINARY_DIR}/runtimes/Tests.cmake)
+    include(${LLVM_BINARY_DIR}/runtimes/${name}/Tests.cmake OPTIONAL)
     set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${LLVM_BINARY_DIR}/runtimes/${name}/Tests.cmake)
     set_property(GLOBAL APPEND PROPERTY LLVM_LIT_TESTSUITES ${SUB_LIT_TESTSUITES})
     set_property(GLOBAL APPEND PROPERTY LLVM_LIT_PARAMS ${SUB_LIT_PARAMS})