[Integration Tests] Calculate the swiftRootDir more accurately #518
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
Previously the swiftRootDir would be calculated by taking swiftBuildDir/../../.., which is accurate on most developer machines, but it is not accurate for some CI bots that use one fewer layer of directories. We already know the swiftRootDir more accurately, we're using it for calculating relative paths, just use that one.
|
@swift-ci please test |
|
This should hopefully fix the failure we saw in swiftlang/swift#36222 |
porglezomp
deleted the
swift-driver-integration-tests-you-know-the-root-already
branch
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.
Previously the swiftRootDir would be calculated by taking
swiftBuildDir/../../.., which is accurate on most developer machines, but it is not accurate for some CI bots that use one fewer layer of directories. We already know theswiftRootDirmore accurately, we're using it for calculating relative paths, just use that one.