[ModuleInterface] Use 2-arg form of basename(1) in overlay validation tests. #19942
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… tests. A bunch of .swiftinterface files fail to build into their respective .swiftmodules if you pass -module-name <foo> for some foo that is not the correct module name. The two tests in this change were using a shell expansion that incorrectly picked the first path component with a period in the name as the module name; this caused the failures. Rather than using a shell expansion, this change uses the 2-argument form of basename(1) (which is POSIX) that also removes a suffix from the basename.
harlanhaskins
approved these changes
Oct 18, 2018
|
@swift-ci please test and merge |
|
@swift-ci please test linux platform |
|
Build failed |
|
@swift-ci please test linux platform |
|
@swift-ci please test |
|
Build failed |
|
Linux builds are failing for unrelated cmake-reasons; this patch passed linux integration on master and I see no way it could be risky, so merging now. |
|
Oh, this is so much better. I didn't know about two-argument (I assume you also committed this to master?) |
|
@jrose-apple yes in #19943 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A bunch of .swiftinterface files fail to build into their respective .swiftmodules
if you pass -module-name for some foo that is not the correct module name.
The two tests in this change were using a shell expansion that incorrectly picked
the first path component with a period in the name as the module name; this caused
the failures.
Rather than using a shell expansion, this change uses the 2-argument form of
basename(1) (which is POSIX) that also removes a suffix from the basename.
rdar://45347391