Merge pull request #4725 from moiseev/string-comparison-ccc

String comparison ccc

Author: tkremenek

cmake/modules/AddSwift.cmake

@@ -1513,7 +1513,8 @@ function(add_swift_library name)
               add_dependencies("swift-stdlib${VARIANT_SUFFIX}"
                   ${lipo_target}
                   ${lipo_target_static})
-              if(NOT "${name}" STREQUAL "swiftStdlibCollectionUnittest")
+              if((NOT "${name}" STREQUAL "swiftStdlibCollectionUnittest") AND
+                 (NOT "${name}" STREQUAL "swiftStdlibUnicodeUnittest"))
                 add_dependencies("swift-test-stdlib${VARIANT_SUFFIX}"
                     ${lipo_target}
                     ${lipo_target_static})

stdlib/private/CMakeLists.txt

@@ -6,6 +6,7 @@ if(SWIFT_BUILD_SDK_OVERLAY)
   # SwiftPrivatePthreadExtras makes use of Darwin/Glibc, which is part of the
   # SDK overlay. It can't be built separately from the SDK overlay.
   add_subdirectory(StdlibUnittest)
+  add_subdirectory(StdlibUnicodeUnittest)
   add_subdirectory(StdlibCollectionUnittest)
   add_subdirectory(SwiftPrivateLibcExtras)
   add_subdirectory(SwiftPrivatePthreadExtras)

stdlib/private/StdlibUnicodeUnittest/CMakeLists.txt

@@ -0,0 +1,18 @@
+set(swift_stdlib_unittest_compile_flags)
+if(SWIFT_SERIALIZE_STDLIB_UNITTEST)
+  list(APPEND swift_stdlib_unittest_compile_flags "-Xfrontend" "-sil-serialize-all")
+endif()
+
+# TODO: support this on non-POSIX platforms.  It cannot be currently as it
+# depends on pthreads.
+add_swift_library(swiftStdlibUnicodeUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
+  # This file should be listed the first.  Module name is inferred from the
+  # filename.
+  StdlibUnicodeUnittest.swift
+  Collation.swift
+
+  SWIFT_MODULE_DEPENDS StdlibUnittest
+  SWIFT_COMPILE_FLAGS ${swift_stdlib_unittest_compile_flags}
+  TARGET_SDKS ALL_POSIX_PLATFORMS
+  INSTALL_IN_COMPONENT stdlib-experimental)
+