Skip to content

Typos: test/Interop #75032

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 1 commit into from
Aug 28, 2024
Merged

Typos: test/Interop #75032

merged 1 commit into from
Aug 28, 2024

Conversation

Sajjon
Copy link
Contributor

@Sajjon Sajjon commented Jul 7, 2024

Fix typos in test/Interop

This is one batch of many PRs fixing typos, see the tracking issue.

@Sajjon Sajjon mentioned this pull request Jul 7, 2024
@egorzhdan
Copy link
Contributor

@swift-ci please test

@egorzhdan
Copy link
Contributor

@swift-ci please test

@Sajjon
Copy link
Contributor Author

Sajjon commented Aug 8, 2024

@egorzhdan @AnthonyLatsis Sorry for downtime, I was on vacation, but back now.

I've squashed and applied changes on top of main ( commit: 906efcb )

Anything I need to do to get this merged?

@egorzhdan
Copy link
Contributor

@swift-ci please test

@AnthonyLatsis
Copy link
Collaborator

Anything I need to do to get this merged?

See #75032 (comment).

@AnthonyLatsis
Copy link
Collaborator

@swift-ci please smoke test

@AnthonyLatsis AnthonyLatsis enabled auto-merge (squash) August 9, 2024 11:05
@AnthonyLatsis AnthonyLatsis self-assigned this Aug 9, 2024
@AnthonyLatsis
Copy link
Collaborator

See the logs. It appears the change in the symbol name also changed the relative order of its lowered definition in the checked output. s9Functions17passThroughCFloatyS2fF now comes after s9Functions18passThroughCDoubleyS2dF and should be checked accordingly in the failed tests.

auto-merge was automatically disabled August 18, 2024 07:39

Head branch was pushed to by a user without write access

@Sajjon
Copy link
Contributor Author

Sajjon commented Aug 18, 2024

@AnthonyLatsis I've put s9Functions17passThroughCFloatyS2fF directly after s9Functions18passThroughCDoubleyS2dF in these three files, hope what was correct?

(Git diffs vs initial commit, added to the single commit)

Screenshot 2024-08-18 at 09 38 56 Screenshot 2024-08-18 at 09 39 02 Screenshot 2024-08-18 at 09 39 07

@AnthonyLatsis
Copy link
Collaborator

Looks good, thank you. Except, did test/Interop/SwiftToC/functions/swift-primitive-functions-execution.c fail as well? I’m pretty sure it was just the other two.

@AnthonyLatsis
Copy link
Collaborator

@swift-ci please smoke test Linux

@AnthonyLatsis
Copy link
Collaborator

OK, we’re green. If you could kindly exclude just that last change from the middle screenshot, I will wrap this up for you.

@Sajjon
Copy link
Contributor Author

Sajjon commented Aug 19, 2024

OK, we’re green. If you could kindly exclude just that last change from the middle screenshot, I will wrap this up for you.

Got it, fixing within the hour.

The CI logs were deleted I think, so I could not see which files needed fixing. Or I just looked in the wrong place.

@Sajjon
Copy link
Contributor Author

Sajjon commented Aug 19, 2024

@AnthonyLatsis I've reverted the changes to test/Interop/SwiftToC/functions/swift-primitive-functions-execution.c now :)

@AnthonyLatsis
Copy link
Collaborator

I meant just the last change, not a full reversion. The mangled name must be updated, but the permutation was unnecessary. Perhaps I was not clear enough, sorry.

@Sajjon
Copy link
Contributor Author

Sajjon commented Aug 19, 2024

I meant just the last change, not a full reversion. The mangled name must be updated, but the permutation was unnecessary. Perhaps I was not clear enough, sorry.

Ofc... silly me. The mangled name change should now be included in test/Interop/SwiftToC/functions/swift-primitive-functions-execution.c, without any permutation of order of lines.

@AnthonyLatsis
Copy link
Collaborator

@swift-ci please smoke test

@AnthonyLatsis
Copy link
Collaborator

@egorzhdan @zoecarver Is this good to go?

@AnthonyLatsis
Copy link
Collaborator

@swift-ci please smoke test

@AnthonyLatsis AnthonyLatsis enabled auto-merge (squash) August 28, 2024 12:13
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