[PATCH 1/2] psapi/tests: Increase the GetPerformanceInfo() margins again.
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/psapi/tests/psapi_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index d565053722..78aac2c044 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -259,7 +259,7 @@ static void test_GetPerformanceInfo(void) ok(ret, "GetPerformanceInfo failed with %d\n", GetLastError()); ok(info.cb == sizeof(PERFORMANCE_INFORMATION), "got %d\n", info.cb); - ok(check_with_margin(info.CommitTotal, sys_performance_info->TotalCommittedPages, 288), + ok(check_with_margin(info.CommitTotal, sys_performance_info->TotalCommittedPages, 2048), "expected approximately %ld but got %d\n", info.CommitTotal, sys_performance_info->TotalCommittedPages); ok(check_with_margin(info.CommitLimit, sys_performance_info->TotalCommitLimit, 32), @@ -268,7 +268,7 @@ static void test_GetPerformanceInfo(void) ok(check_with_margin(info.CommitPeak, sys_performance_info->PeakCommitment, 32), "expected approximately %ld but got %d\n", info.CommitPeak, sys_performance_info->PeakCommitment); - ok(check_with_margin(info.PhysicalAvailable, sys_performance_info->AvailablePages, 512), + ok(check_with_margin(info.PhysicalAvailable, sys_performance_info->AvailablePages, 2048), "expected approximately %ld but got %d\n", info.PhysicalAvailable, sys_performance_info->AvailablePages); /* TODO: info.SystemCache not checked yet - to which field(s) does this value correspond to? */ @@ -322,7 +322,7 @@ static void test_GetPerformanceInfo(void) } HeapFree(GetProcessHeap(), 0, sys_process_info); - ok(check_with_margin(info.HandleCount, handle_count, 256), + ok(check_with_margin(info.HandleCount, handle_count, 512), "expected approximately %d but got %d\n", info.HandleCount, handle_count); ok(check_with_margin(info.ProcessCount, process_count, 4), -- 2.20.1
This fails on Windows 10 version 1709 and later. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Evidently locked pages simply aren't reported by QueryWorkingSet(). Manual testing shows that the allocated page is reported if *not* locked, and also that it is reported by QueryWorkingSetEx() in either case. It's not clear if this is a regression in Windows or an intentional change in behaviour. dlls/psapi/tests/psapi_main.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 78aac2c044..b02ceed5ec 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -724,7 +724,6 @@ static void test_GetModuleBaseName(void) static void test_ws_functions(void) { PSAPI_WS_WATCH_INFORMATION wswi[4096]; - ULONG_PTR pages[4096]; HANDLE ws_handle; char *addr; unsigned int i; @@ -773,22 +772,6 @@ static void test_ws_functions(void) goto free_page; } - SetLastError(0xdeadbeef); - ret = QueryWorkingSet(hpQI, pages, 4096 * sizeof(ULONG_PTR)); - todo_wine ok(ret == 1, "failed with %d\n", GetLastError()); - if(ret == 1) - { - for(i = 0; i < pages[0]; i++) - if((pages[i+1] & ~0xfffL) == (ULONG_PTR)addr) - { - todo_wine ok(ret == 1, "QueryWorkingSet found our page\n"); - goto test_gwsc; - } - - todo_wine ok(0, "QueryWorkingSet didn't find our page\n"); - } - -test_gwsc: SetLastError(0xdeadbeef); ret = GetWsChanges(hpQI, wswi, sizeof(wswi)); todo_wine ok(ret == 1, "failed with %d\n", GetLastError()); -- 2.20.1
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=58052 Your paranoid android. === wvistau64_fr (32 bit report) === psapi: psapi_main.c:184: Test failed: wait timed out === w1064v1809_ar (32 bit report) === psapi: psapi_main.c:129: Test failed: wait timed out === w864 (64 bit report) === psapi: psapi_main.c:150: Test failed: wait timed out
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=58051 Your paranoid android. === wvistau64_fr (32 bit report) === psapi: psapi_main.c:129: Test failed: wait timed out psapi_main.c:184: Test failed: wait timed out === w8 (32 bit report) === psapi: psapi_main.c:129: Test failed: wait timed out === wvistau64 (64 bit report) === psapi: psapi_main.c:129: Test failed: wait timed out === w864 (64 bit report) === psapi: psapi_main.c:129: Test failed: wait timed out psapi_main.c:150: Test failed: wait timed out
participants (2)
-
Marvin -
Zebediah Figura