Skip to content

[lldb] Hoist --swift-compiler argument out of LLDB_TEST_COMMON_ARGS #1904

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
Oct 6, 2020
Merged

[lldb] Hoist --swift-compiler argument out of LLDB_TEST_COMMON_ARGS #1904

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
6 changes: 2 additions & 4 deletions lldb/test/API/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,11 @@ option(LLDB_TEST_SWIFT "Use in-tree swift when testing lldb" On)
if(LLDB_TEST_SWIFT)
set(LLDB_SWIFTC ${SWIFT_BINARY_DIR}/bin/swiftc CACHE STRING "Path to swift compiler")
set(LLDB_SWIFT_LIBS ${SWIFT_LIBRARY_DIR}/swift CACHE STRING "Path to swift libraries")
# Prefer the just-built stdlib over the system one.
set(SWIFT_TEST_ARGS
--swift-compiler ${LLDB_SWIFTC}
# Prefer the just-built stdlib over the system one.
--inferior-env "DYLD_LIBRARY_PATH=\\\"${LLDB_SWIFT_LIBS}/macosx\\\""
--inferior-env "LD_LIBRARY_PATH=\\\"${LLDB_SWIFT_LIBS}/${CMAKE_SYSTEM_PROCESSOR}\\\""
--inferior-env "SIMCTL_CHILD_DYLD_LIBRARY_PATH=\\\"${LLDB_SWIFT_LIBS}/macosx\\\""
)
--inferior-env "SIMCTL_CHILD_DYLD_LIBRARY_PATH=\\\"${LLDB_SWIFT_LIBS}/macosx\\\"")
endif()
# END - Swift Mods

Expand Down
3 changes: 3 additions & 0 deletions lldb/test/API/lit.cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,9 @@ def delete_module_cache(path):
if is_configured('test_compiler'):
dotest_cmd += ['--compiler', config.test_compiler]

if is_configured('test_swift_compiler'):
dotest_cmd += ['--swift-compiler', config.test_swift_compiler]

if is_configured('dsymutil'):
dotest_cmd += ['--dsymutil', config.dsymutil]

Expand Down
1 change: 1 addition & 0 deletions lldb/test/API/lit.site.cfg.py.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ config.enabled_plugins = []
config.lldb_executable = '@LLDB_TEST_EXECUTABLE@'
config.test_arch = '@LLDB_TEST_ARCH@'
config.test_compiler = '@LLDB_TEST_COMPILER@'
config.test_swift_compiler = '@LLDB_SWIFTC@'
config.dsymutil = '@LLDB_TEST_DSYMUTIL@'
config.filecheck = '@LLDB_TEST_FILECHECK@'
config.yaml2obj = '@LLDB_TEST_YAML2OBJ@'
Expand Down