[utils] Fix PathSanitizingFileCheck to support paths with "weird" characters #26024
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
broadwaylamb
changed the title
broadwaylamb
changed the title
|
Yes, it seems that I introduced a bug by not escaping the resulting pattern. @swift-ci please test Windows platform |
|
(the Windows build has failing tests, but I will check the differences against the base branch) |
drodriguez
reviewed
Jul 9, 2019
broadwaylamb
force-pushed
the
path-sanitizing-file-check-substitution
branch
from
7fc1755 to
fb52743
Compare
When absolute paths that need to be substituted by PathSanitizingFileCheck contained characters that could be part of regexp syntax, substitution didn't actually take place. For example, substitution like BUILD_DIR='/Users/johnsmith/swift-source/Ninja-RelWithDebInfoAssert+swift-DebugAssert' didn't result in anything because of the '+' in the path. This is an attempt to fix it. This commit also adds the --dry-run flag to PathSanitizingFileCheck which was used to detect and debug this issue, but why not let it stay.
broadwaylamb
force-pushed
the
path-sanitizing-file-check-substitution
branch
from
fb52743 to
9fbdfde
Compare
|
@swift-ci please smoke test |
|
@swift-ci please test Windows platform |
|
The Windows errors were present in Thanks a lot! |
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 absolute paths that needed to be substituted by PathSanitizingFileCheck contained characters that could be part of regexp syntax, substitution didn't actually take place.
For example, substitution like
BUILD_DIR='/Users/johnsmith/swift-source/Ninja-RelWithDebInfoAssert+swift-DebugAssert'didn't result in anything because of the '+' in the path, which caused the test suite to fail.This is an attempt to fix it.
This commit also adds the
--dry-runflag to PathSanitizingFileCheck which was used to detect and debug this issue, but why not let it stay.cc @drodriguez @compnerd