Move collection testing code from StdlibUnittest to a new library

This brings down StdlibUnittest build time to 90 seconds with either
a DebugAssert or a ReleaseAssert compiler.

The new library, StdlibCollectionTests, is only built when running
validation tests.

Author: gribozavr

cmake/modules/AddSwift.cmake

@@ -1545,6 +1545,11 @@ function(add_swift_library name)
           add_dependencies("swift-stdlib${VARIANT_SUFFIX}"
               ${lipo_target}
               ${lipo_target_static})
+          if(NOT "${name}" STREQUAL "swiftStdlibCollectionUnittest")
+            add_dependencies("swift-test-stdlib${VARIANT_SUFFIX}"
+                ${lipo_target}
+                ${lipo_target_static})
+          endif()
         endforeach()
       endif()
     endforeach()

stdlib/CMakeLists.txt

@@ -2,16 +2,22 @@
 add_custom_target(swift-stdlib-all)
 foreach(SDK ${SWIFT_SDKS})
   add_custom_target("swift-stdlib-${SWIFT_SDK_${SDK}_LIB_SUBDIR}")
+  add_custom_target("swift-test-stdlib-${SWIFT_SDK_${SDK}_LIB_SUBDIR}")
   foreach(ARCH ${SWIFT_SDK_${SDK}_ARCHITECTURES})
     set(VARIANT_SUFFIX "-${SWIFT_SDK_${SDK}_LIB_SUBDIR}-${ARCH}")
     add_custom_target("swift-stdlib${VARIANT_SUFFIX}")
+    add_custom_target("swift-test-stdlib${VARIANT_SUFFIX}")
     add_dependencies(swift-stdlib-all "swift-stdlib${VARIANT_SUFFIX}")
     add_dependencies("swift-stdlib-${SWIFT_SDK_${SDK}_LIB_SUBDIR}"
         "swift-stdlib${VARIANT_SUFFIX}")
+    add_dependencies("swift-test-stdlib-${SWIFT_SDK_${SDK}_LIB_SUBDIR}"
+        "swift-test-stdlib${VARIANT_SUFFIX}")
   endforeach()
 endforeach()
-add_custom_target(swift-stdlib ALL
+add_custom_target(swift-stdlib
     DEPENDS "swift-stdlib${SWIFT_PRIMARY_VARIANT_SUFFIX}")
+add_custom_target(swift-test-stdlib ALL
+    DEPENDS "swift-test-stdlib${SWIFT_PRIMARY_VARIANT_SUFFIX}")
 
 if(SWIFT_HOST_VARIANT STREQUAL "linux")
   find_package(BSD REQUIRED)

stdlib/private/CMakeLists.txt

@@ -8,6 +8,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     # POSIX APIs it imports the Darwin module on Apple platforms, so it can't
     # be built separately from the SDK overlay.
     add_subdirectory(StdlibUnittest)
+    add_subdirectory(StdlibCollectionUnittest)
     add_subdirectory(StdlibUnittestFoundationExtras)
     add_subdirectory(SwiftPrivateDarwinExtras)
     add_subdirectory(SwiftPrivatePthreadExtras)

stdlib/private/StdlibCollectionUnittest/CMakeLists.txt

@@ -0,0 +1,28 @@
+set(swift_stdlib_unittest_compile_flags)
+if(SWIFT_SERIALIZE_STDLIB_UNITTEST)
+  list(APPEND swift_stdlib_unittest_compile_flags "-Xfrontend" "-sil-serialize-all")
+endif()
+
+set(swift_stdlib_unittest_framework_depends)
+if(SWIFT_HOST_VARIANT MATCHES "${SWIFT_DARWIN_VARIANTS}")
+  list(APPEND swift_stdlib_unittest_framework_depends
+    Foundation)
+endif()
+
+add_swift_library(swiftStdlibCollectionUnittest SHARED IS_STDLIB
+  # This file should be listed the first.  Module name is inferred from the
+  # filename.
+  StdlibCollectionUnittest.swift
+
+  CheckCollectionType.swift
+  CheckMutableCollectionType.swift.gyb
+  CheckRangeReplaceableCollectionType.swift
+  CheckRangeReplaceableSliceType.swift
+  CheckSequenceType.swift
+
+  PRIVATE_LINK_LIBRARIES ${swift_stdlib_unittest_private_link_libraries}
+  SWIFT_MODULE_DEPENDS StdlibUnittest
+  SWIFT_COMPILE_FLAGS ${swift_stdlib_unittest_compile_flags}
+  FRAMEWORK_DEPENDS ${swift_stdlib_unittest_framework_depends}
+  INSTALL_IN_COMPONENT stdlib-experimental)
+

stdlib/private/StdlibUnittest/CheckCollectionType.swift stdlib/private/StdlibCollectionUnittest/CheckCollectionType.swift

@@ -10,6 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+import StdlibUnittest
+
 public struct SubscriptRangeTest {
   public let expected: [OpaqueValue<Int>]
   public let collection: [OpaqueValue<Int>]

stdlib/private/StdlibUnittest/CheckMutableCollectionType.swift.gyb stdlib/private/StdlibCollectionUnittest/CheckMutableCollectionType.swift.gyb

@@ -10,6 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+import StdlibUnittest
+
 // These tests are shared between partition() and sort().
 public struct PartitionExhaustiveTest {
   public let sequence: [Int]

stdlib/private/StdlibUnittest/CheckRangeReplaceableCollectionType.swift stdlib/private/StdlibCollectionUnittest/CheckRangeReplaceableCollectionType.swift

@@ -10,6 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+import StdlibUnittest
+
 internal enum RangeSelection {
   case EmptyRange
   case LeftEdge

stdlib/private/StdlibUnittest/CheckRangeReplaceableSliceType.swift stdlib/private/StdlibCollectionUnittest/CheckRangeReplaceableSliceType.swift

@@ -10,6 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+import StdlibUnittest
+
 extension TestSuite {
   /// Adds a set of tests for `RangeReplaceableCollectionType` that is also a
   /// slice type.

stdlib/private/StdlibUnittest/CheckSequenceType.swift stdlib/private/StdlibCollectionUnittest/CheckSequenceType.swift

@@ -10,6 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+import StdlibUnittest
+
 public struct DropFirstTest {
   public var sequence: [Int]
   public let dropElements: Int

stdlib/private/StdlibCollectionUnittest/StdlibCollectionUnittest.swift

@@ -0,0 +1,22 @@
+//===--- LifetimeTracked.swift --------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See http://swift.org/LICENSE.txt for license information
+// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+import StdlibUnittest
+
+// Also import modules which are used by StdlibUnittest internally. This
+// workaround is needed to link all required libraries in case we compile
+// StdlibUnittest with -sil-serialize-all.
+import SwiftPrivate
+#if _runtime(_ObjC)
+import ObjectiveC
+#endif
+

stdlib/private/StdlibUnittest/CMakeLists.txt

@@ -27,11 +27,6 @@ add_swift_library(swiftStdlibUnittest SHARED IS_STDLIB
   # filename.
   StdlibUnittest.swift.gyb
 
-  CheckCollectionType.swift
-  CheckMutableCollectionType.swift.gyb
-  CheckRangeReplaceableCollectionType.swift
-  CheckRangeReplaceableSliceType.swift
-  CheckSequenceType.swift
   InterceptTraps.cpp
   LoggingWrappers.swift.gyb
   OpaqueIdentityFunctions.cpp

test/CMakeLists.txt

@@ -173,7 +173,10 @@ if(PYTHONINTERP_FOUND)
         set(test_dependencies)
         get_test_dependencies("${SDK}" test_dependencies)
         list(APPEND test_dependencies
-            "swift-stdlib-${SWIFT_SDK_${SDK}_LIB_SUBDIR}")
+            "swift-test-stdlib-${SWIFT_SDK_${SDK}_LIB_SUBDIR}")
+
+        set(validation_test_dependencies
+            "swiftStdlibCollectionUnittest-${SWIFT_SDK_${SDK}_LIB_SUBDIR}")
 
         set(test_bin_dir "${CMAKE_CURRENT_BINARY_DIR}${VARIANT_SUFFIX}")
         set(validation_test_bin_dir
@@ -206,15 +209,15 @@ if(PYTHONINTERP_FOUND)
             ${command_upload_stdlib}
             ${command_clean_test_results_dir}
             COMMAND ${lit_command} "${validation_test_bin_dir}"
-            DEPENDS ${test_dependencies}
+            DEPENDS ${test_dependencies} ${validation_test_dependencies}
             COMMENT "Running Swift validation tests for ${VARIANT_TRIPLE}"
             ${cmake_3_2_USES_TERMINAL})
 
         add_custom_target("check-swift-all${test_mode_target_suffix}${VARIANT_SUFFIX}"
             ${command_upload_stdlib}
             ${command_clean_test_results_dir}
             COMMAND ${lit_command} "${validation_test_bin_dir}" "${test_bin_dir}"
-            DEPENDS ${test_dependencies}
+            DEPENDS ${test_dependencies} ${validation_test_dependencies}
             COMMENT "Running all Swift tests for ${VARIANT_TRIPLE}"
             ${cmake_3_2_USES_TERMINAL})
       endforeach()

utils/build-presets.ini

@@ -37,6 +37,7 @@ swift-sdks=OSX;IOS;IOS_SIMULATOR;TVOS;TVOS_SIMULATOR;WATCHOS;WATCHOS_SIMULATOR
 # Build static standard library because it is used
 # to build external projects.
 build-swift-static-stdlib=1
+build-swift-stdlib-unittest-extra=1
 
 compiler-vendor=apple
 
@@ -169,6 +170,8 @@ build-ninja
 # Don't build static standard library to speed up the build.
 build-swift-static-stdlib=0
 
+build-swift-stdlib-unittest-extra=1
+
 compiler-vendor=apple
 
 
@@ -319,6 +322,7 @@ build-ninja
 
 # Don't build static standard library to speed up the build.
 build-swift-static-stdlib=0
+build-swift-stdlib-unittest-extra=1
 
 skip-build-ios
 skip-test-ios
@@ -366,6 +370,7 @@ verbose-build=1
 build-ninja
 # Don't build static standard library to speed up the build.
 build-swift-static-stdlib=0
+build-swift-stdlib-unittest-extra=1
 compiler-vendor=apple
 
 [preset: buildbot_incremental_special_dtrace,tools=RA,stdlib=RD]
@@ -419,6 +424,7 @@ install-xctest
 install-prefix=/usr
 swift-install-components=compiler;clang-builtin-headers;stdlib;sdk-overlay;license
 build-swift-static-stdlib=1
+build-swift-stdlib-unittest-extra=1
 skip-test-lldb=1
 
 # Executes the lit tests for the installable package that is created
@@ -476,6 +482,7 @@ lldb-build-type=Release
 verbose-build=1
 build-ninja
 build-swift-static-stdlib=1
+build-swift-stdlib-unittest-extra=1
 compiler-vendor=apple
 swift-sdks=OSX;IOS;IOS_SIMULATOR;TVOS;TVOS_SIMULATOR;WATCHOS;WATCHOS_SIMULATOR
 

utils/build-script-impl

@@ -144,6 +144,7 @@ KNOWN_SETTINGS=(
     build-llvm                  "1"              "set to 1 to build LLVM and Clang"
     build-swift-tools           "1"              "set to 1 to build Swift host tools"
     build-swift-stdlib          "1"              "set to 1 to build the Swift standard library"
+    build-swift-stdlib-unittest-extra "0"        "set to 1 to build optional StdlibUnittest components"
     build-swift-sdk-overlay     "1"              "set to 1 to build the Swift SDK overlay"
     build-swift-static-stdlib   "0"              "set to 1 to build static versions of the Swift standard library and SDK overlay"
     build-swift-examples        "1"              "set to 1 to build examples"
@@ -976,8 +977,18 @@ for deployment_target in "${STDLIB_DEPLOYMENT_TARGETS[@]}"; do
             ;;
     esac
     if [[ "${build_for_this_target}" ]] ; then
-        SWIFT_STDLIB_TARGETS=(
-            "${SWIFT_STDLIB_TARGETS[@]}" "swift-stdlib-${deployment_target}")
+        if [[ "${BUILD_SWIFT_STDLIB_UNITTEST_EXTRA}" == "1" ]] ; then
+            SWIFT_STDLIB_TARGETS=(
+                "${SWIFT_STDLIB_TARGETS[@]}" "swift-stdlib-${deployment_target}")
+        else
+            if [[ "${SKIP_TEST_VALIDATION}" ]] ; then
+                SWIFT_STDLIB_TARGETS=(
+                    "${SWIFT_STDLIB_TARGETS[@]}" "swift-test-stdlib-${deployment_target}")
+            else
+                SWIFT_STDLIB_TARGETS=(
+                    "${SWIFT_STDLIB_TARGETS[@]}" "swift-stdlib-${deployment_target}")
+            fi
+        fi
     fi
     if [[ "${perftest_this_target}" ]] ; then
         SWIFT_PERFTEST_TARGETS=(

validation-test/stdlib/Algorithm.swift

@@ -3,6 +3,7 @@
 // REQUIRES: executable_test
 
 import StdlibUnittest
+import StdlibCollectionUnittest
 import SwiftPrivate
 
 // Also import modules which are used by StdlibUnittest internally. This

validation-test/stdlib/CollectionType.swift.gyb

@@ -6,6 +6,7 @@
 // REQUIRES: executable_test
 
 import StdlibUnittest
+import StdlibCollectionUnittest
 import SwiftPrivate
 
 // Also import modules which are used by StdlibUnittest internally. This

test/1_stdlib/RangeReplaceable.swift.gyb validation-test/stdlib/RangeReplaceable.swift.gyb

@@ -10,6 +10,7 @@
 // REQUIRES: swift_test_mode_optimize_none
 
 import StdlibUnittest
+import StdlibCollectionUnittest
 
 // Also import modules which are used by StdlibUnittest internally. This
 // workaround is needed to link all required libraries in case we compile

validation-test/stdlib/SequenceType.swift.gyb

@@ -8,6 +8,7 @@
 % import gyb
 
 import StdlibUnittest
+import StdlibCollectionUnittest
 import SwiftPrivate
 
 // Also import modules which are used by StdlibUnittest internally. This

validation-test/stdlib/Slice.swift.gyb

@@ -6,6 +6,7 @@
 // REQUIRES: executable_test
 
 import StdlibUnittest
+import StdlibCollectionUnittest
 import SwiftPrivate
 
 // Also import modules which are used by StdlibUnittest internally. This

validation-test/stdlib/Slice/Inputs/GenerateSliceTests.py

@@ -35,6 +35,7 @@
 // REQUIRES: optimized_stdlib
 
 import StdlibUnittest
+import StdlibCollectionUnittest
 
 // Also import modules which are used by StdlibUnittest internally. This
 // workaround is needed to link all required libraries in case we compile

validation-test/stdlib/Slice/MutableSlice_Of_DefaultedBidirectionalMutableCollection_FullWidth.swift.gyb

@@ -12,6 +12,7 @@
 // REQUIRES: optimized_stdlib
 
 import StdlibUnittest
+import StdlibCollectionUnittest
 
 // Also import modules which are used by StdlibUnittest internally. This
 // workaround is needed to link all required libraries in case we compile

validation-test/stdlib/Slice/MutableSlice_Of_DefaultedBidirectionalMutableCollection_WithPrefix.swift.gyb

@@ -12,6 +12,7 @@
 // REQUIRES: optimized_stdlib
 
 import StdlibUnittest
+import StdlibCollectionUnittest
 
 // Also import modules which are used by StdlibUnittest internally. This
 // workaround is needed to link all required libraries in case we compile

validation-test/stdlib/Slice/MutableSlice_Of_DefaultedBidirectionalMutableCollection_WithPrefixAndSuffix.swift.gyb

@@ -12,6 +12,7 @@
 // REQUIRES: optimized_stdlib
 
 import StdlibUnittest
+import StdlibCollectionUnittest
 
 // Also import modules which are used by StdlibUnittest internally. This
 // workaround is needed to link all required libraries in case we compile

validation-test/stdlib/Slice/MutableSlice_Of_DefaultedBidirectionalMutableCollection_WithSuffix.swift.gyb

@@ -12,6 +12,7 @@
 // REQUIRES: optimized_stdlib
 
 import StdlibUnittest
+import StdlibCollectionUnittest
 
 // Also import modules which are used by StdlibUnittest internally. This
 // workaround is needed to link all required libraries in case we compile

validation-test/stdlib/Slice/MutableSlice_Of_DefaultedForwardMutableCollection_FullWidth.swift.gyb

@@ -12,6 +12,7 @@
 // REQUIRES: optimized_stdlib
 
 import StdlibUnittest
+import StdlibCollectionUnittest
 
 // Also import modules which are used by StdlibUnittest internally. This
 // workaround is needed to link all required libraries in case we compile

validation-test/stdlib/Slice/MutableSlice_Of_DefaultedForwardMutableCollection_WithPrefix.swift.gyb

@@ -12,6 +12,7 @@
 // REQUIRES: optimized_stdlib
 
 import StdlibUnittest
+import StdlibCollectionUnittest
 
 // Also import modules which are used by StdlibUnittest internally. This
 // workaround is needed to link all required libraries in case we compile

validation-test/stdlib/Slice/MutableSlice_Of_DefaultedForwardMutableCollection_WithPrefixAndSuffix.swift.gyb

@@ -12,6 +12,7 @@
 // REQUIRES: optimized_stdlib
 
 import StdlibUnittest
+import StdlibCollectionUnittest
 
 // Also import modules which are used by StdlibUnittest internally. This
 // workaround is needed to link all required libraries in case we compile

validation-test/stdlib/Slice/MutableSlice_Of_DefaultedForwardMutableCollection_WithSuffix.swift.gyb

@@ -12,6 +12,7 @@
 // REQUIRES: optimized_stdlib
 
 import StdlibUnittest
+import StdlibCollectionUnittest
 
 // Also import modules which are used by StdlibUnittest internally. This
 // workaround is needed to link all required libraries in case we compile

validation-test/stdlib/Slice/MutableSlice_Of_DefaultedRandomAccessMutableCollection_FullWidth.swift.gyb

@@ -12,6 +12,7 @@
 // REQUIRES: optimized_stdlib
 
 import StdlibUnittest
+import StdlibCollectionUnittest
 
 // Also import modules which are used by StdlibUnittest internally. This
 // workaround is needed to link all required libraries in case we compile

validation-test/stdlib/Slice/MutableSlice_Of_DefaultedRandomAccessMutableCollection_WithPrefix.swift.gyb

@@ -12,6 +12,7 @@
 // REQUIRES: optimized_stdlib
 
 import StdlibUnittest
+import StdlibCollectionUnittest
 
 // Also import modules which are used by StdlibUnittest internally. This
 // workaround is needed to link all required libraries in case we compile

validation-test/stdlib/Slice/MutableSlice_Of_DefaultedRandomAccessMutableCollection_WithPrefixAndSuffix.swift.gyb

@@ -12,6 +12,7 @@
 // REQUIRES: optimized_stdlib
 
 import StdlibUnittest
+import StdlibCollectionUnittest
 
 // Also import modules which are used by StdlibUnittest internally. This
 // workaround is needed to link all required libraries in case we compile