[PATCH v2 0/1] MR7445: ntdll/tests: Skip FileFsFullSizeInformationEx test on older windows.
[Testbot shows failures](https://test.winehq.org/data/patterns-tb-win.html#ntdll:file) since a few days in ntdll:file on older windows versions. These failures seem to be related to 37c5fa3d and f15bd29c (CC: @cmccarthy). This patch just adds `STATUS_INVALID_INFO_CLASS` and moves the `ok` statement below the `win_skip`. -- v2: ntdll/tests: Skip FileFsFullSizeInformationEx test on older windows. https://gitlab.winehq.org/wine/wine/-/merge_requests/7445
From: Bernhard Übelacker <bernhardu(a)mailbox.org> --- dlls/ntdll/tests/file.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index cc0afdbdb64..1d1b4c48cc2 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1388,14 +1388,13 @@ static void test_file_full_size_information(void) /* FileFsFullSizeInformationEx is supported on Windows 10 build 1809 and later */ res = pNtQueryVolumeInformationFile(h, &io, &ffsie, sizeof ffsie, FileFsFullSizeInformationEx); - ok(res == STATUS_INVALID_PARAMETER || res == STATUS_SUCCESS, "cannot get attributes, res %lx\n", res); - - if (res == STATUS_NOT_IMPLEMENTED || res == STATUS_INVALID_PARAMETER) + if (res == STATUS_NOT_IMPLEMENTED || res == STATUS_INVALID_PARAMETER || res == STATUS_INVALID_INFO_CLASS) { win_skip( "FileFsFullSizeInformationEx not supported.\n" ); CloseHandle( h ); return; } + ok(res == STATUS_INVALID_PARAMETER || res == STATUS_SUCCESS, "cannot get attributes, res %lx\n", res); expected = ffsie.ActualAvailableAllocationUnits + ffsie.ActualPoolUnavailableAllocationUnits + ffsie.UsedAllocationUnits + ffsie.TotalReservedAllocationUnits; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7445
v2: - added back the `res == STATUS_INVALID_PARAMETER` to the ok statement. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7445#note_96241
participants (1)
-
Bernhard Übelacker