Skip to content

[test] Small lit cleanups #41741

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.

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
Mar 9, 2022
Merged

[test] Small lit cleanups #41741

merged 3 commits into from
Mar 9, 2022

Conversation

lorentey
Copy link
Member

@lorentey lorentey commented Mar 9, 2022

This PR slightly refactors how we set DYLD_LIBRARY_PATH/LD_LIBRARY_PATH in the %target-run pattern, so that we only set a single variable that is correct for the target platform and has the appropriate prefix (SIMCTL_CHILD_, IOS_CHILD_, REMOTE_RUN_CHILD_ or nothing at all, depending on Various Things).

More importantly, this also improves what gets logged to build output, hopefully helping me to track down a potential configuration issue in some CI bots.

rdar://89786892

lorentey added 2 commits March 8, 2022 21:02
Also, integrate its configuration into the preexisting target if ladders, where it belongs.
…ect spelling of DYLD_LIBRARY_PATH

Instead of setting a random subset of `DYLD_LIBRARY_PATH`, `LD_LIBRARY_PATH`, `SIMCTL_CHILD_DYLD_LIBRARY_PATH`, `REMOTE_RUN_CHILD_DYLD_LIBRARY_PATH`, and `REMOTE_RUN_CHILD_LD_LIBRARY_PATH` in each `target_run` configuration, simply arrange for the single correct variable name to be in `config.target_library_path_var`, and set it only once.

This should remove irrelevant environment variables from test logs, making them a little less confusing.
@lorentey
Copy link
Member Author

lorentey commented Mar 9, 2022

@swift-ci test

This will be very helpful while debugging CI issues.
@lorentey
Copy link
Member Author

lorentey commented Mar 9, 2022

@swift-ci test

@lorentey lorentey merged commit bfac01f into swiftlang:main Mar 9, 2022
@lorentey lorentey deleted the lit-cleanups branch March 9, 2022 09:22
swift-ci pushed a commit that referenced this pull request May 31, 2022
… natively on Android

This broke in #41741, putting it back the way it was.
amritpan pushed a commit to amritpan/swift that referenced this pull request Jun 10, 2022
… natively on Android

This broke in swiftlang#41741, putting it back the way it was.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant