Skip to content
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

Update tests to allow multiple -F options #742

Merged
merged 3 commits into from
May 3, 2023

Conversation

rauhul
Copy link
Member

@rauhul rauhul commented May 2, 2023

Updates tests to allow compile arguments with multiple -F options such as -F <foo> -Xcc -F -Xcc <foo>. This change is required to support SwiftPM changes which forward C compiler flags to the swift compiler in more cases.

- Updates tests to allow compile arguments with multiple -F options such
  as -F <foo> -Xcc -F -Xcc <foo>. This change is required to support spm
  changes which forward c compiler flags to the swift compiler in more
  cases.
@rauhul rauhul requested review from MaxDesiatov and artemcm May 2, 2023 21:47
@rauhul rauhul requested review from benlangmuir and ahoppen as code owners May 2, 2023 21:47
@rauhul
Copy link
Member Author

rauhul commented May 2, 2023

@swift-ci please test

@@ -609,6 +609,7 @@ private func checkNot(
private func check(
_ pattern: String...,
arguments: [String],
once: Bool = true,
Copy link
Member

Choose a reason for hiding this comment

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

I would call this allowMultiple. Seems clearer to me.

Copy link
Member Author

@rauhul rauhul May 2, 2023

Choose a reason for hiding this comment

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

Sure, easy change!

@rauhul
Copy link
Member Author

rauhul commented May 2, 2023

@swift-ci please test

@rauhul
Copy link
Member Author

rauhul commented May 2, 2023

@swift-ci please test

@ahoppen
Copy link
Member

ahoppen commented May 2, 2023

@swift-ci Please test Windows

3 similar comments
@rauhul
Copy link
Member Author

rauhul commented May 2, 2023

@swift-ci Please test Windows

@rauhul
Copy link
Member Author

rauhul commented May 2, 2023

@swift-ci Please test Windows

@rauhul
Copy link
Member Author

rauhul commented May 2, 2023

@swift-ci Please test Windows

@rauhul rauhul merged commit e84b7b2 into main May 3, 2023
@rauhul rauhul deleted the allow-mutliple-framework-search-path-flags branch May 3, 2023 00:57
MaxDesiatov pushed a commit that referenced this pull request Jul 19, 2023
- Updates tests to allow compile arguments with multiple -F options such
  as -F <foo> -Xcc -F -Xcc <foo>. This change is required to support spm
  changes which forward c compiler flags to the swift compiler in more
  cases.
MaxDesiatov added a commit that referenced this pull request Jul 19, 2023
Cherry-pick of #742 required to unblock swiftlang/swift-package-manager#6709.

Updates tests to allow compile arguments with multiple `-F` options such as `-F <foo> -Xcc -F -Xcc <foo>`. This change is required to support SwiftPM changes which forward C compiler flags to the Swift compiler in more cases.

Co-authored-by: Rauhul Varma <rauhul@users.noreply.github.com>
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.

4 participants