[windows] Use extended length paths for os.walk invocation. #34265
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
In the Windows VS 2017 CI machines, the path for certain tests end up being very long. rewrite-module-triples.py was aware and was using extended length paths for the copy and remove operations in Windows but it was not using it for the os.walk invocation, so when a folder that was longer than MAX_PATH was encountered, the walk stopped drilling into it, missing some module-triple-here substitutions and making some test fail. The changes remove the special treatment of the copy and remove operations and move it into os.walk, which carries the prefix to every path. This should fix the problems seen in the SourceKit test in the Windows VS 2017 machine: - SourceKit/InterfaceGen/gen_swift_module_cross_import_common.swift - SourceKit/DocSupport/doc_cross_import_common.swift - SourceKit/CursorInfo/cursor_info_cross_import_common_case.swift PD: Misc/stats_dir_profiler.swift is something else. It seems as if an glob was not being expanded by lit for some reason.
|
@swift-ci please test |
|
@swift-ci please smoke 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.
In the Windows VS 2017 CI machines, the path for certain tests end up
being very long. rewrite-module-triples.py was aware and was using
extended length paths for the copy and remove operations in Windows
but it was not using it for the os.walk invocation, so when a folder
that was longer than MAX_PATH was encountered, the walk stopped
drilling into it, missing some module-triple-here substitutions and
making some test fail.
The changes remove the special treatment of the copy and remove
operations and move it into os.walk, which carries the prefix to
every path.
This should fix the problems seen in the SourceKit test in the
Windows VS 2017 machine:
PD: Misc/stats_dir_profiler.swift is something else. It seems as if
an glob was not being expanded by lit for some reason.