Skip to content

[IRGen testing] Reapply: Fix bogus FileCheck check-prefix "-SAME" usage #31857

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 2 commits into from
May 18, 2020

Conversation

davezarzycki
Copy link
Contributor

The correct usage of "-SAME" is after the check-prefix, not in the middle. I've updated the constants to what is emitted today.

Now with verified 32-bit fixes.

The correct usage of "-SAME" is after the check-prefix, not in the
middle. I've updated the constants to what is emitted today.

Now with verified 32-bit fixes.
@davezarzycki
Copy link
Contributor Author

@swift-ci please test

@compnerd
Copy link
Member

@davezarzycki please grab the changes in #31845 if you are re-applying the changes

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.

#31845 contains the fixes for Windows, though it fails on macOS which is fixed here. The two should be merged.

Adjust the test to care for environments which cannot handle direct
references across modules.  This field needs to be filled in at runtime.
@davezarzycki
Copy link
Contributor Author

Cherry-pick of #31845. No other changes:

@swift-ci please smoke test

@davezarzycki davezarzycki requested a review from compnerd May 18, 2020 19:36
@davezarzycki
Copy link
Contributor Author

@swift-ci please smoke test
@swift-ci please test windows

@davezarzycki davezarzycki merged commit 51be974 into swiftlang:master May 18, 2020
@davezarzycki
Copy link
Contributor Author

This was originally approved in #31839, so I'm going to merge now that I've had a chance to run the 32-bit iOS tests on my Mac and now that @compnerd provided a fix for Windows.

@davezarzycki davezarzycki deleted the pr31857 branch May 18, 2020 22:00
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.

2 participants