[test] Fix tests that use Swift include directory in unified builds #78586
+20
−17
Conversation
This file contains 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
In LLVM unified builds, Swift normally lives in `tools/swift` and the paths from the CMake build directory are not always the same as in a standalone build. Fix some tests using `%clang-include-dir` (which effectively points to `$CMAKE_BUILD_ROOT/include`) to use the new `%swift-include-dir`, which should point to the right `include/` directory in both unified and standalone builds. Additionally, change the calculation of `%clang-include-dir` to not be relative to the `swift` binary, but to the CMake build root instead.
|
@swift-ci please test |
coffmark
pushed a commit
to coffmark/swift
that referenced
this pull request
Jan 13, 2025
…wiftlang#78586) In LLVM unified builds, Swift normally lives in `tools/swift` and the paths from the CMake build directory are not always the same as in a standalone build. Fix some tests using `%clang-include-dir` (which effectively points to `$CMAKE_BUILD_ROOT/include`) to use the new `%swift-include-dir`, which should point to the right `include/` directory in both unified and standalone builds. Additionally, change the calculation of `%clang-include-dir` to not be relative to the `swift` binary, but to the CMake build root instead.
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.
In LLVM unified builds, Swift normally lives in
tools/swiftand the paths from the CMake build directory are not always the same as in a standalone build.Fix some tests using
%clang-include-dir(which effectively points to$CMAKE_BUILD_ROOT/include) to use the new%swift-include-dir, which should point to the rightinclude/directory in both unified and standalone builds.Additionally, change the calculation of
%clang-include-dirto not be relative to theswiftbinary, but to the CMake build root instead.