[compiler-rt] follow-up to 166837, rename COMPILER_RT_TEST_BUILTINS_DIR to COMPILER_RT_FORCE_TEST_BUILTINS_DIR

---------

Co-authored-by: David Tenty <daltenty@ibm.com>

Author: Wael Yehia

compiler-rt/test/CMakeLists.txt

@@ -73,10 +73,10 @@ endfunction()
 # Run sanitizer tests only if we're sure that clang would produce
 # working binaries.
 if(COMPILER_RT_CAN_EXECUTE_TESTS)
-  # COMPILER_RT_TEST_BUILTINS_DIR allows running tests against builtins built
+  # COMPILER_RT_FORCE_TEST_BUILTINS_DIR allows running tests against builtins built
   # in an independent build. This option is only indended to be used by
   # LLVM_ENABLE_RUNTIMES-based builds.
-  if(COMPILER_RT_BUILD_BUILTINS OR COMPILER_RT_TEST_BUILTINS_DIR)
+  if(COMPILER_RT_BUILD_BUILTINS OR COMPILER_RT_FORCE_TEST_BUILTINS_DIR)
     add_subdirectory(builtins)
   endif()
   if(COMPILER_RT_BUILD_SANITIZERS)

compiler-rt/test/builtins/CMakeLists.txt

@@ -1,11 +1,11 @@
 set(BUILTINS_LIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
-# If COMPILER_RT_TEST_BUILTINS_DIR is set, the builtins
+# If COMPILER_RT_FORCE_TEST_BUILTINS_DIR is set, the builtins
 # were already built and we are just going to test them.
 # NOTE: This is currently an LLVM-internal option which should
 # only be used by the LLVM_ENABLE_RUNTIMES build configured
 # in llvm/runtimes/CMakeLists.txt
-if(COMPILER_RT_TEST_BUILTINS_DIR)
+if(COMPILER_RT_FORCE_TEST_BUILTINS_DIR)
   set(BUILTINS_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})
 else()
   set(BUILTINS_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS} builtins)
@@ -96,16 +96,16 @@ foreach(arch ${BUILTIN_TEST_ARCH})
   endif()
   # Normally, we can just inspect the target directly to get the sources, but if
   # we are testing an externally-built builtins library, we expect
-  # COMPILER_RT_TEST_BUILTINS_DIR to be set and contain a file named
+  # COMPILER_RT_FORCE_TEST_BUILTINS_DIR to be set and contain a file named
   # ${BUILTIN_LIB_TARGET_NAME}.sources.txt from the builtins build. This file
   # is created by compiler-rt/lib/builtins/CMakeLists.txt
-  if(NOT COMPILER_RT_TEST_BUILTINS_DIR)
+  if(NOT COMPILER_RT_FORCE_TEST_BUILTINS_DIR)
     if (NOT TARGET "${BUILTIN_LIB_TARGET_NAME}")
       message(FATAL_ERROR "Target ${BUILTIN_LIB_TARGET_NAME} does not exist")
     endif()
     get_target_property(BUILTIN_LIB_SOURCES "${BUILTIN_LIB_TARGET_NAME}" SOURCES)
   else()
-    file(READ "${COMPILER_RT_TEST_BUILTINS_DIR}/${BUILTIN_LIB_TARGET_NAME}.sources.txt" BUILTIN_LIB_SOURCES)
+    file(READ "${COMPILER_RT_FORCE_TEST_BUILTINS_DIR}/${BUILTIN_LIB_TARGET_NAME}.sources.txt" BUILTIN_LIB_SOURCES)
   endif()
   list(LENGTH BUILTIN_LIB_SOURCES BUILTIN_LIB_SOURCES_LENGTH)
   if (BUILTIN_LIB_SOURCES_LENGTH EQUAL 0)