Skip to content

Commit affbaca

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 f8beec1 commit affbaca

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
@@ -1764,14 +1764,18 @@ function(add_swift_library name)
17641764
# Add Swift standard library targets as dependencies to the top-level
17651765
# convenience target.
17661766
if(SWIFTLIB_TARGET_LIBRARY)
1767+
set(FILTERED_UNITTESTS
1768+
swiftStdlibCollectionUnittest
1769+
swiftStdlibUnicodeUnittest)
1770+
17671771
foreach(arch ${SWIFT_SDK_${sdk}_ARCHITECTURES})
17681772
set(VARIANT_SUFFIX "-${SWIFT_SDK_${sdk}_LIB_SUBDIR}-${arch}")
1769-
if(TARGET "swift-stdlib${VARIANT_SUFFIX}" AND TARGET "swift-test-stdlib${VARIANT_SUFFIX}")
1773+
if(TARGET "swift-stdlib${VARIANT_SUFFIX}" AND
1774+
TARGET "swift-test-stdlib${VARIANT_SUFFIX}")
17701775
add_dependencies("swift-stdlib${VARIANT_SUFFIX}"
17711776
${lipo_target}
17721777
${lipo_target_static})
1773-
if((NOT "${name}" STREQUAL "swiftStdlibCollectionUnittest") AND
1774-
(NOT "${name}" STREQUAL "swiftStdlibUnicodeUnittest"))
1778+
if(NOT "${name}" IN_LIST FILTERED_UNITTESTS)
17751779
add_dependencies("swift-test-stdlib${VARIANT_SUFFIX}"
17761780
${lipo_target}
17771781
${lipo_target_static})

0 commit comments

Comments
 (0)