Skip to content

Fix Mac Catalyst test dependency failures #34932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 3, 2020
Merged

Fix Mac Catalyst test dependency failures #34932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stdlib/private/BlocksRuntimeStubs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ foreach(SDK ${SWIFT_SDKS})
foreach(ARCH ${SWIFT_SDK_${SDK}_ARCHITECTURES})
get_swift_test_build_flavors(build_flavors "${SDK}")

foreach(BUILD_FLAVOR build_flavors)
foreach(BUILD_FLAVOR ${build_flavors})
get_swift_test_variant_suffix(VARIANT_SUFFIX "${SDK}" "${ARCH}" "${BUILD_FLAVOR}")

set(test_bin_dir "${SWIFT_BINARY_DIR}/test${VARIANT_SUFFIX}")
Expand Down
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@ foreach(SDK ${SWIFT_SDKS})
# Configure variables for this subdirectory.
set(VARIANT_SDK "${SWIFT_SDK_${SDK}_ARCH_${ARCH}_PATH}")
get_swift_test_variant_suffix(VARIANT_SUFFIX "${SDK}" "${ARCH}" "${BUILD_FLAVOR}")
get_swift_test_variant_suffix(DEFAULT_OSX_VARIANT_SUFFIX "${SDK}" "${ARCH}" "default")
get_swift_test_versioned_target_triple(VARIANT_TRIPLE "${SDK}" "${ARCH}" "${SWIFT_SDK_${SDK}_DEPLOYMENT_VERSION}" "${BUILD_FLAVOR}")
get_swift_test_default_osx_variant_suffix(DEFAULT_OSX_VARIANT_SUFFIX "${VARIANT_SUFFIX}" "${BUILD_FLAVOR}")

# A directory where to put the xUnit-style XML test results.
set(SWIFT_TEST_RESULTS_DIR
Expand Down
11 changes: 0 additions & 11 deletions test/cmake/modules/SwiftTestUtils.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,3 @@ function(get_swift_test_versioned_target_triple variant_triple_out_var sdk arch

set(${variant_triple_out_var} "${variant_triple}" PARENT_SCOPE)
endfunction()

# Get the default OSX variant suffix for test targets
function(get_swift_test_default_osx_variant_suffix suffix_out_var original_variant_suffix build_flavor)
set(suffix "")
if(build_flavor STREQUAL "ios-like")
set(suffix "${variant_suffix}")
endif()

set(${suffix_out_var} "${suffix}" PARENT_SCOPE)
endfunction()