Skip to content

Commit dcdd23f

Browse files
committed
build: filter out a filtering list, 80-col (NFC)
Rather than check the two names individually use a `IN_LIST` to make it simpler to reason about. Wrap another conditional to 80-columns. NFC.
1 parent dbd4547 commit dcdd23f

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

cmake/modules/AddSwift.cmake

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1753,14 +1753,18 @@ function(add_swift_library name)
17531753
# Add Swift standard library targets as dependencies to the top-level
17541754
# convenience target.
17551755
if(SWIFTLIB_TARGET_LIBRARY)
1756+
set(FILTERED_UNITTESTS
1757+
swiftStdlibCollectionUnittest
1758+
swiftStdlibUnicodeUnittest)
1759+
17561760
foreach(arch ${SWIFT_SDK_${sdk}_ARCHITECTURES})
17571761
set(VARIANT_SUFFIX "-${SWIFT_SDK_${sdk}_LIB_SUBDIR}-${arch}")
1758-
if(TARGET "swift-stdlib${VARIANT_SUFFIX}" AND TARGET "swift-test-stdlib${VARIANT_SUFFIX}")
1762+
if(TARGET "swift-stdlib${VARIANT_SUFFIX}" AND
1763+
TARGET "swift-test-stdlib${VARIANT_SUFFIX}")
17591764
add_dependencies("swift-stdlib${VARIANT_SUFFIX}"
17601765
${lipo_target}
17611766
${lipo_target_static})
1762-
if((NOT "${name}" STREQUAL "swiftStdlibCollectionUnittest") AND
1763-
(NOT "${name}" STREQUAL "swiftStdlibUnicodeUnittest"))
1767+
if(NOT "${name}" IN_LIST FILTERED_UNITTESTS)
17641768
add_dependencies("swift-test-stdlib${VARIANT_SUFFIX}"
17651769
${lipo_target}
17661770
${lipo_target_static})

0 commit comments

Comments
 (0)