Skip to content

[test] Generalize runtime library searching #75207

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

Conversation

hamishknight
Copy link
Contributor

@hamishknight hamishknight commented Jul 12, 2024

Allow detecting the compiler runtime libraries for non-Darwin platforms, allowing us to test that programs relying on these libraries link and run successfully.

@hamishknight hamishknight force-pushed the generalize-compiler-rt-checking branch 6 times, most recently from 2e04d65 to 03b2bed Compare July 15, 2024 09:22
@hamishknight hamishknight marked this pull request as ready for review July 15, 2024 09:23
@hamishknight hamishknight requested a review from compnerd July 15, 2024 09:26
@hamishknight hamishknight force-pushed the generalize-compiler-rt-checking branch from 03b2bed to ac670e3 Compare July 15, 2024 12:01
Allow detecting the compiler runtime libraries for
non-Darwin platforms, allowing us to test that
programs relying on these libraries link successfully.
@hamishknight hamishknight force-pushed the generalize-compiler-rt-checking branch from ac670e3 to 251182c Compare July 15, 2024 14:22
@hamishknight
Copy link
Contributor Author

@swift-ci please test

Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like a nice cleanup. It would be nice to ensure that we also print the swift resource directory in addition to the clang one that you've cleaned up.

@bnbarham bnbarham requested a review from etcwilde July 15, 2024 16:19
@hamishknight
Copy link
Contributor Author

It would be nice to ensure that we also print the swift resource directory in addition to the clang one that you've cleaned up.

I might be misunderstanding, but we should already be doing that:

lit_config.note('Using resource dir: ' + test_resource_dir)

@compnerd
Copy link
Member

Ah, is just shuffled, so all good!

@@ -21,6 +21,9 @@
// REQUIRES: profile_runtime
// REQUIRES: executable_test

// FIXME: Currently fails on non-Darwin (https://github.com/swiftlang/swift/issues/75240)
// REQUIRES: OS=macosx
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this affected by the changes in this patch? It looks unrelated to me?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is because we're now running this test on non-Darwin platforms, previously we wouldn't have picked up the profile_runtime feature

@hamishknight hamishknight merged commit c15164c into swiftlang:main Jul 16, 2024
5 checks passed
@hamishknight hamishknight deleted the generalize-compiler-rt-checking branch July 16, 2024 16:32
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.

3 participants