Add paths from compiler arguments spelled with = to the diagnose bundle
#1365
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
|
@swift-ci Please test |
hamishknight
approved these changes
May 29, 2024
Comment on lines
61
to
68
| if compilerArg.hasPrefix("/") { | ||
| copyPathToBundleIfNecessary(compilerArg, bundlePath: bundlePath) | ||
| } else if let firstEqual = compilerArg.firstIndex(of: "=") { | ||
| // Copy files from eg. `-fmodule-map-file=/path/to/module.modulemap` | ||
| let possiblePath = String(compilerArg[compilerArg.index(after: firstEqual)...]) | ||
| if possiblePath.hasPrefix("/") { | ||
| copyPathToBundleIfNecessary(possiblePath, bundlePath: bundlePath) | ||
| } |
There was a problem hiding this comment.
Do we care about cases like -I/foo/bar?
There was a problem hiding this comment.
Let’s just look for the first / to start the path. Eventually I’ll need to think about how this should work on Windows as well but right now the entire diagnose bundle pretty heavily relies on oslog scraping, which is only applicable for macOS anyway.
ahoppen
force-pushed
the
modulemap-in-diagnose-bundle
branch
from
9967641 to
fccf1eb
Compare
…ndle Eg. if the crash contained `-fmodule-map-file=/path/to/module.modulemap`, we weren’t including `/path/to/module.modulemap` in the diagnose bundle.
ahoppen
force-pushed
the
modulemap-in-diagnose-bundle
branch
from
fccf1eb to
9677a00
Compare
|
@swift-ci Please test |
hamishknight
approved these changes
May 29, 2024
|
@swift-ci Please test Windows |
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.
Eg. if the crash contained
-fmodule-map-file=/path/to/module.modulemap, we weren’t including/path/to/module.modulemapin the diagnose bundle.