From 5d04588d7a657acea484044a3b7d534355976e17 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sun, 28 Apr 2024 00:17:09 +0300 Subject: [PATCH] [ROSTESTS/x64] Disable some tests on x64, because they are too slow x64 tends to end up being canceled due to a global timeout and these tests are the main culprits together with crashes and hangs. This is tracked in ROSTESTS-392. --- modules/rostests/apitests/advapi32/testlist.c | 2 ++ modules/rostests/apitests/ntdll/testlist.c | 4 ++++ modules/rostests/apitests/ws2_32/testlist.c | 2 ++ modules/rostests/winetests/msi/testlist.c | 2 ++ modules/rostests/winetests/shell32/testlist.c | 2 ++ 5 files changed, 12 insertions(+) diff --git a/modules/rostests/apitests/advapi32/testlist.c b/modules/rostests/apitests/advapi32/testlist.c index a48b3b9d496..00fd6073ee5 100644 --- a/modules/rostests/apitests/advapi32/testlist.c +++ b/modules/rostests/apitests/advapi32/testlist.c @@ -31,7 +31,9 @@ const struct test winetest_testlist[] = { "Hash", func_Hash }, { "HKEY_CLASSES_ROOT", func_HKEY_CLASSES_ROOT }, { "IsTextUnicode" , func_IsTextUnicode }, +#ifndef _M_AMD64 // FIXME: Too slow and doesn't provide much value, see ROSTESTS-392 { "LockServiceDatabase" , func_LockServiceDatabase }, +#endif { "QueryServiceConfig2", func_QueryServiceConfig2 }, { "RegCreateKeyEx", func_RegCreateKeyEx }, { "RegEnumKey", func_RegEnumKey }, diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index 10cc0d987da..0e7f5a1f82d 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -145,7 +145,9 @@ const struct test winetest_testlist[] = { "NtQuerySystemInformation", func_NtQuerySystemInformation }, { "NtQueryValueKey", func_NtQueryValueKey }, { "NtQueryVolumeInformationFile", func_NtQueryVolumeInformationFile }, +#ifndef _M_AMD64 // FIXME: Slow and can cause timeouts on x64, see ROSTESTS-392 { "NtReadFile", func_NtReadFile }, +#endif { "NtSaveKey", func_NtSaveKey}, { "NtSetDefaultLocale", func_NtSetDefaultLocale }, { "NtSetInformationFile", func_NtSetInformationFile }, @@ -156,7 +158,9 @@ const struct test winetest_testlist[] = { "NtSetVolumeInformationFile", func_NtSetVolumeInformationFile }, { "NtSystemInformation", func_NtSystemInformation }, { "NtUnloadDriver", func_NtUnloadDriver }, +#ifndef _M_AMD64 // FIXME: Slow and can cause timeouts on x64, see ROSTESTS-392 { "NtWriteFile", func_NtWriteFile }, +#endif { "RtlAllocateHeap", func_RtlAllocateHeap }, { "RtlBitmapApi", func_RtlBitmap }, { "RtlComputePrivatizedDllName_U", func_RtlComputePrivatizedDllName_U }, diff --git a/modules/rostests/apitests/ws2_32/testlist.c b/modules/rostests/apitests/ws2_32/testlist.c index acf4feaf592..dbfea5ad905 100644 --- a/modules/rostests/apitests/ws2_32/testlist.c +++ b/modules/rostests/apitests/ws2_32/testlist.c @@ -25,7 +25,9 @@ const struct test winetest_testlist[] = { { "bind", func_bind }, { "close", func_close }, +#ifndef _M_AMD64 // FIXME: Too slow and times out often, see ROSTESTS-392 { "getaddrinfo", func_getaddrinfo }, +#endif { "gethostname", func_gethostname }, { "getnameinfo", func_getnameinfo }, { "getservbyname", func_getservbyname }, diff --git a/modules/rostests/winetests/msi/testlist.c b/modules/rostests/winetests/msi/testlist.c index 9b721965dcb..8c9dde8809d 100644 --- a/modules/rostests/winetests/msi/testlist.c +++ b/modules/rostests/winetests/msi/testlist.c @@ -17,7 +17,9 @@ extern void func_suminfo(void); const struct test winetest_testlist[] = { +#ifndef _M_AMD64 // FIXME: Too slow and times out often, see ROSTESTS-392 { "action", func_action }, +#endif { "automation", func_automation }, { "db", func_db }, { "format", func_format }, diff --git a/modules/rostests/winetests/shell32/testlist.c b/modules/rostests/winetests/shell32/testlist.c index 13e3a3eeb4a..e44bb953f85 100644 --- a/modules/rostests/winetests/shell32/testlist.c +++ b/modules/rostests/winetests/shell32/testlist.c @@ -31,7 +31,9 @@ const struct test winetest_testlist[] = { "brsfolder", func_brsfolder }, { "ebrowser", func_ebrowser }, { "generated", func_generated }, +#ifndef _M_AMD64 // FIXME: Slow and crashes, see ROSTESTS-392 { "progman_dde", func_progman_dde }, +#endif { "recyclebin", func_recyclebin }, { "shelldispatch", func_shelldispatch }, { "shelllink", func_shelllink },