Skip to content

Swift reflection test deps #2327

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 3 commits into from
Apr 28, 2016
Merged

Swift reflection test deps #2327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
450a3d8
AddSwift: Fix typo in static library dependency append
bitjammer Apr 27, 2016
ce8905a
test/lit.cfg: swift-reflection-test is a target executable
bitjammer Apr 27, 2016
0c83fce
Link swift-reflection-test* with swiftRemoteMirror
bitjammer Apr 27, 2016
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 cmake/modules/AddSwift.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,7 +1129,7 @@ function(_add_swift_library_single target name)
set(SWIFTLIB_SINGLE_LINK_LIBRARIES_WITHOUT_ICU)
foreach(item ${SWIFTLIB_SINGLE_LINK_LIBRARIES})
if(NOT "${item}" STREQUAL "icucore")
list(APPEND SWIFTLIB_SINGLE_LINK_LIBRARIES_WITHOUT_ICU "{$item}")
list(APPEND SWIFTLIB_SINGLE_LINK_LIBRARIES_WITHOUT_ICU "${item}")
endif()
endforeach()

Expand Down
9 changes: 9 additions & 0 deletions stdlib/private/SwiftReflectionTest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,12 @@ add_swift_library(swiftSwiftReflectionTest SHARED IS_STDLIB
SWIFT_MODULE_DEPENDS Darwin
SWIFT_COMPILE_FLAGS ${swift_reflection_test_compile_flags}
INSTALL_IN_COMPONENT stdlib-experimental)

foreach(SDK ${SWIFT_SDKS})
foreach(ARCH ${SWIFT_SDK_${SDK}_ARCHITECTURES})
set(VARIANT_SUFFIX "-${SWIFT_SDK_${SDK}_LIB_SUBDIR}-${ARCH}")
add_dependencies(
"swiftSwiftReflectionTest${VARIANT_SUFFIX}"
"swift-reflection-test${VARIANT_SUFFIX}")
endforeach()
endforeach()
3 changes: 1 addition & 2 deletions test/lit.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@ config.sil_opt = inferSwiftBinary('sil-opt')
config.sil_extract = inferSwiftBinary('sil-extract')
config.lldb_moduleimport_test = inferSwiftBinary('lldb-moduleimport-test')
config.swift_ide_test = inferSwiftBinary('swift-ide-test')
config.swift_reflection_test = inferSwiftBinary('swift-reflection-test')
config.swift_reflection_dump = inferSwiftBinary('swift-reflection-dump')
config.swift_remoteast_test = inferSwiftBinary('swift-remoteast-test')
config.clang = inferSwiftBinary('clang')
Expand Down Expand Up @@ -862,7 +861,7 @@ config.substitutions.append(
(subst_target_swift_ide_test_mock_sdk,
subst_target_swift_ide_test_mock_sdk_after)))
config.substitutions.append(('%target-swift-ide-test', config.target_swift_ide_test))
config.substitutions.append(('%target-swift-reflection-test', '{test_runner}{variant_suffix} {arch}'.format(test_runner=config.swift_reflection_test, variant_suffix=config.variant_suffix, arch=run_cpu)))
config.substitutions.append(('%target-swift-reflection-test', 'swift-reflection-test{variant_suffix} {arch}'.format(variant_suffix=config.variant_suffix, arch=run_cpu)))
config.substitutions.append(('%target-swift-reflection-dump', '{} {} {}'.format(config.swift_reflection_dump, '-arch', run_cpu)))
config.substitutions.append(('%target-swiftc_driver', config.target_swiftc_driver))
config.substitutions.append(('%target-swift-remoteast-test-with-sdk',
Expand Down
3 changes: 2 additions & 1 deletion tools/swift-reflection-test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ add_swift_target_executable(swift-reflection-test BUILD_WITH_STDLIB
swift-reflection-test.cpp
overrides.cpp
LINK_FAT_LIBRARIES
swiftReflection)
swiftReflection
swiftRemoteMirror)