Fix SourceKit/CursorInfo Tests on Windows #24171
Conversation
| FILE_SHARE_READ | FILE_SHARE_WRITE, | ||
| nullptr, | ||
| OPEN_EXISTING, | ||
| FILE_FLAG_BACKUP_SEMANTICS, |
There was a problem hiding this comment.
It's required to obtain a directory to a handle.
|
|
||
| if (fileHandle == INVALID_HANDLE_VALUE) | ||
| return InputPath; | ||
|
|
||
| DWORD success = GetFinalPathNameByHandleA( | ||
| fileHandle, full_path, sizeof(full_path), FILE_NAME_NORMALIZED); | ||
| DWORD getPathSuccess = GetFinalPathNameByHandleW( |
There was a problem hiding this comment.
I added a convertSuccess check and it seemed weird to have a success and convertSuccess.
There was a problem hiding this comment.
You could just do success &= ... ;-)
|
CC: @akyrtzi @benlangmuir |
|
@swift-ci please test |
|
Instead of updating the tests by optionally checking for the filename (which I think is unlikely that we will be able to remember to do every time we add new tests), why not updating |
|
Build failed |
gmittert
force-pushed
the
SourceKitTests
branch
6 times, most recently
from
8f32c19 to
a9c83f1
Compare
|
Looking at the realpath implementation on Windows, it was using GetFullPathName rather than GetFinalPathName which explains why the paths were getting normalized differently. I've fixed it to call GetFinalPathByHandle which removes the need for changing the tests themselves. |
gmittert
force-pushed
the
SourceKitTests
branch
from
a9c83f1 to
7da91d5
Compare
|
Checking again if I can trigger ci yet @swift-ci please test |
|
@swift-ci Please test |
|
@gmittert try with |
|
Build failed |
|
Build failed |
sourcekitd-test only prints the file path if it's different than the one it's passed. Since on Windows, paths get normalized to start with
\\?\all paths fail this check and get printed.Also fixed the symlink resolving to follow symlinks and to support unicode.