Skip to content

Commit 114e812

Browse files
committed
stdlib: permit builtin Collections and Unicode tests everywhere
The pthread dependency has been lifted through the Windows port generalising the SwiftThreadExtras. Enable building these unit test binaries which are needed for the validation test suite.
1 parent c9bdd3a commit 114e812

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

stdlib/private/StdlibCollectionUnittest/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
set(swift_stdlib_unittest_compile_flags)
22

3-
# TODO: support this on non-POSIX platforms. It cannot be currently as it
4-
# depends on pthreads.
53
add_swift_target_library(swiftStdlibCollectionUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
64
# This file should be listed the first. Module name is inferred from the
75
# filename.
@@ -24,8 +22,8 @@ add_swift_target_library(swiftStdlibCollectionUnittest ${SWIFT_STDLIB_LIBRARY_BU
2422
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
2523
SWIFT_MODULE_DEPENDS_CYGWIN Glibc
2624
SWIFT_MODULE_DEPENDS_HAIKU Glibc
25+
SWIFT_MODULE_DEPENDS_WINDOWS MSVCRT
2726
SWIFT_COMPILE_FLAGS ${swift_stdlib_unittest_compile_flags}
28-
TARGET_SDKS ALL_POSIX_PLATFORMS
2927
INSTALL_IN_COMPONENT stdlib-experimental
3028
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}")
3129

stdlib/private/StdlibUnicodeUnittest/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
set(swift_stdlib_unittest_compile_flags)
22

3-
# TODO: support this on non-POSIX platforms. It cannot be currently as it
4-
# depends on pthreads.
53
add_swift_target_library(swiftStdlibUnicodeUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
64
# This file should be listed the first. Module name is inferred from the
75
# filename.
@@ -13,8 +11,8 @@ add_swift_target_library(swiftStdlibUnicodeUnittest ${SWIFT_STDLIB_LIBRARY_BUILD
1311
SWIFT_MODULE_DEPENDS_FREEBSD Glibc
1412
SWIFT_MODULE_DEPENDS_CYGWIN Glibc
1513
SWIFT_MODULE_DEPENDS_HAIKU Glibc
14+
SWIFT_MODULE_DEPENDS_WINDOWS MSVCRT
1615
SWIFT_COMPILE_FLAGS ${swift_stdlib_unittest_compile_flags}
17-
TARGET_SDKS ALL_POSIX_PLATFORMS
1816
INSTALL_IN_COMPONENT stdlib-experimental
1917
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}")
2018

0 commit comments

Comments
 (0)