[test] Move utility functions into reusable CMake file.

Some pieces of the main CMakeLists.txt file are useful to future
CMakeLists.txt. In order to avoid duplication, move those pieces into a
new SwiftTestsUtils.cmake to be able to include the functions from other
files.

This should not modify anything in the behaviour of the build.

Author: drodriguez

test/CMakeLists.txt

@@ -1,3 +1,7 @@
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
+
+include(SwiftTestUtils)
+
 function(swift_configure_lit_site_cfg source_path destination_path installed_name)
   if (CMAKE_CFG_INTDIR STREQUAL ".")
     set(SWIFT_BUILD_MODE ".")
@@ -197,24 +201,14 @@ foreach(SDK ${SWIFT_SDKS})
     # and one with the the macCatalyst ios-macabi triple.  The build_flavors list will
     # have have only the "default" flavor for all SDKs and architectures except
     # OSX when macCatalyst support is enabled.
-    set(build_flavors "default")
-    if(SWIFT_ENABLE_MACCATALYST AND "${SDK}" STREQUAL "OSX")
-      list(APPEND build_flavors "ios-like" )
-    endif()
+    get_swift_test_build_flavors(build_flavors "${SDK}")
 
     foreach(BUILD_FLAVOR ${build_flavors})
     # Configure variables for this subdirectory.
-    set(VARIANT_SUFFIX "-${SWIFT_SDK_${SDK}_LIB_SUBDIR}-${ARCH}")
-    get_versioned_target_triple(VARIANT_TRIPLE ${SDK} ${ARCH} "${SWIFT_SDK_${SDK}_DEPLOYMENT_VERSION}")
     set(VARIANT_SDK "${SWIFT_SDK_${SDK}_ARCH_${ARCH}_PATH}")
-    set(DEFAULT_OSX_VARIANT_SUFFIX "")
-
-    if(BUILD_FLAVOR STREQUAL "ios-like")
-      set(DEFAULT_OSX_VARIANT_SUFFIX "${VARIANT_SUFFIX}")
-      # Use the macCatalyst target triple and compiler resources for the iOS-like build flavor.
-      set(VARIANT_SUFFIX "-${SWIFT_SDK_${SDK}_LIB_SUBDIR}-maccatalyst-${ARCH}")
-      set(VARIANT_TRIPLE "${ARCH}-apple-ios13.0-macabi")
-    endif()
+    get_swift_test_variant_suffix(VARIANT_SUFFIX "${SDK}" "${ARCH}" "${BUILD_FLAVOR}")
+    get_swift_test_versioned_target_triple(VARIANT_TRIPLE "${SDK}" "${ARCH}" "${SWIFT_SDK_${SDK}_DEPLOYMENT_VERSION}" "${BUILD_FLAVOR}")
+    get_swift_test_default_osx_variant_suffix(DEFAULT_OSX_VARIANT_SUFFIX "${VARIANT_SUFFIX}" "${BUILD_FLAVOR}")
 
     # A directory where to put the xUnit-style XML test results.
     set(SWIFT_TEST_RESULTS_DIR

test/cmake/modules/SwiftTestUtils.cmake

@@ -0,0 +1,48 @@
+# SwiftTestUtils.cmake
+#
+# Utility functions for Swift testing targets
+
+# Get the possible build flavors for testing
+function(get_swift_test_build_flavors build_flavors_out_var sdk)
+  set(build_flavors "default")
+  if(SWIFT_ENABLE_MACCATALYST AND "${sdk}" STREQUAL "OSX")
+    list(APPEND build_flavors "ios-like")
+  endif()
+
+  set(${build_flavors_out_var} ${build_flavors} PARENT_SCOPE)
+endfunction()
+
+# Get the variant suffix for test targets and folders
+function(get_swift_test_variant_suffix variant_suffix_out_var sdk arch build_flavor)
+  if(build_flavor STREQUAL "ios-like")
+    set(variant_suffix "-${SWIFT_SDK_${sdk}_LIB_SUBDIR}-maccatalyst-${arch}")
+  else()
+    set(variant_suffix "-${SWIFT_SDK_${sdk}_LIB_SUBDIR}-${arch}")
+  endif()
+
+  set(${variant_suffix_out_var} "${variant_suffix}" PARENT_SCOPE)
+endfunction()
+
+
+# Get the variant triple for test targets
+function(get_swift_test_versioned_target_triple variant_triple_out_var sdk arch build_flavor)
+  if(build_flavor STREQUAL "ios-like")
+    # Use the macCatalyst target triple and compiler resources for the iOS-like build flavor.
+    set(variant_triple "${arch}-apple-ios13.0-macabi")
+  else()
+    get_versioned_target_triple(variant_triple ${sdk} ${arch} "${SWIFT_SDK_${sdk}_DEPLOYMENT_VERSION}")
+  endif()
+
+  set(${variant_triple_out_var} "${variant_triple}" PARENT_SCOPE)
+endfunction()
+
+# Get the default OSX variant suffix for test targets
+function(get_swift_test_default_osx_variant_suffix suffix_out_var original_variant_suffix build_flavor)
+  set(suffix "")
+  if(build_flavor STREQUAL "ios-like")
+    set(suffix "${variant_suffix}")
+  endif()
+
+  set(${suffix_out_var} "${suffix}" PARENT_SCOPE)
+endfunction()
+