[stable/2023025][clang][deps][cas] Fix include-tree contents with -working-directory #8379
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
…4525) Stop overriding -working-directory to CWD during argument parsing, which should no longer necessary after we set the VFS working directory, and set FSOpts correctly after parsing arguments so that working-directory behaves correctly. (cherry picked from commit 083da46) (cherry picked from commit 925cc8d)
After the -working-directory fix, this test needs to use a relative path for "ReadFiles". Note: This test already used a relative path upstream, but was modified downstream. (cherry picked from commit 64a0b07)
When using -working-directory we were inconsistent about using relative or absolute paths, which was causing failures to find files in the include-tree ft logilesystem. Now we should be consistently using the absolute path. Note: this changes behaviour of things like __FILE__, which would normally have a relative path even with -working-directory. In the future we may want to find a way to preserve the relative paths, but that has been much harder and the current change at fixes the compilation failures. rdar://116135029 (cherry picked from commit 78e64df)
|
@swift-ci please test |
|
@swift-ci please test llvm |
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.
Cherry-pick #8367 to stable/2023025
When using -working-directory we were inconsistent about using relativeor absolute paths, which was causing failures to find files in the include-tree filesystem. Now we should be consistently using theabsolute path.
Note: this changes behaviour of things like FILE, which would normally have a relative path even with -working-directory. In the future we may want to find a way to preserve the relative paths, but that has been much harder and the current change at fixes the compilation failures.
rdar://116135029