[test] Fix incorrect usage of swift_obj_root in unified builds #77330
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 |
drodriguez
force-pushed
the
swift-obj-root-strikes-back
branch
from
718ec79 to
6ff8c24
Compare
|
@swift-ci please test |
When doing an unified build (Swift being an external project of LLVM), the Swift build is at `<llvm build dir>/tools/swift`, and that is the value of `swift_obj_root`. However many products are actually placed in `<llvm build dir>`, like `bin/`, `include/` and things like `lib/swift/...` and others. A couple of macros tests check the error messages printed by the compiler against `swift_obj_root` (by the replacement done in `PathSanitizingFileCheck` of `BUILD_DIR`) when it should have been checking them against the top-level build directory, which will work in both unified and non-unified builds (like `build-script` builds).
drodriguez
force-pushed
the
swift-obj-root-strikes-back
branch
from
6ff8c24 to
1e59037
Compare
|
@swift-ci please test |
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.
When doing an unified build (Swift being an external project of LLVM), the Swift build is at
<llvm build dir>/tools/swift, and that is the value ofswift_obj_root. However many products are actually placed in<llvm build dir>, likebin/,include/and things likelib/swift/...and others.A couple of macros tests check the error messages printed by the compiler against
swift_obj_root(by the replacement done inPathSanitizingFileCheckofBUILD_DIR) when it should have been checking them against the top-level build directory, which will work in both unified and non-unified builds (likebuild-scriptbuilds).