https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d424a0e08818b28e81c8bf12a330804c663d199c
commit d424a0e08818b28e81c8bf12a330804c663d199c Author: Victor Perevertkin <[email protected]> AuthorDate: Mon Jun 8 03:43:43 2020 +0300 Commit: Victor Perevertkin <[email protected]> CommitDate: Mon Jun 8 03:43:43 2020 +0300 [WININET_WINETEST][URLMON_WINETEST][SHELL32_APITEST] Skip some tests Due to hangs on test machines ROSTESTS-357 ROSTESTS-358 CORE-17057 --- modules/rostests/apitests/shell32/DragDrop.cpp | 6 ++++++ modules/rostests/apitests/shell32/testlist.c | 2 +- modules/rostests/winetests/urlmon/url.c | 6 ++++++ modules/rostests/winetests/wininet/http.c | 7 +++++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/shell32/DragDrop.cpp b/modules/rostests/apitests/shell32/DragDrop.cpp index 46ab8bb1c72..3d5d3d82ce1 100644 --- a/modules/rostests/apitests/shell32/DragDrop.cpp +++ b/modules/rostests/apitests/shell32/DragDrop.cpp @@ -383,6 +383,12 @@ static void DoTestEntry(const TEST_ENTRY *pEntry) START_TEST(DragDrop) { + if (!winetest_interactive) + { + skip("Skipping the test due to crash. CORE-17057\n"); + return; + } + HRESULT hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); ok_int(SUCCEEDED(hr), TRUE); diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index 74c90e013c6..4818673e1eb 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -40,7 +40,7 @@ const struct test winetest_testlist[] = { "CShellDesktop", func_CShellDesktop }, { "CShellLink", func_CShellLink }, { "CUserNotification", func_CUserNotification }, - // { "DragDrop", func_DragDrop }, disabled due to CORE-17057 + { "DragDrop", func_DragDrop }, { "ExtractIconEx", func_ExtractIconEx }, { "IShellFolderViewCB", func_IShellFolderViewCB }, { "menu", func_menu }, diff --git a/modules/rostests/winetests/urlmon/url.c b/modules/rostests/winetests/urlmon/url.c index 1aef981b830..de8f04bef3d 100644 --- a/modules/rostests/winetests/urlmon/url.c +++ b/modules/rostests/winetests/urlmon/url.c @@ -3924,6 +3924,12 @@ START_TEST(url) { HMODULE hurlmon; + if (!winetest_interactive) + { + win_skip("Skipping urlmon:url due to hang ROSTESTS-358\n"); + return; + } + hurlmon = GetModuleHandleA("urlmon.dll"); pCreateAsyncBindCtxEx = (void*) GetProcAddress(hurlmon, "CreateAsyncBindCtxEx"); diff --git a/modules/rostests/winetests/wininet/http.c b/modules/rostests/winetests/wininet/http.c index 7b7ccd265ad..09646b18996 100644 --- a/modules/rostests/winetests/wininet/http.c +++ b/modules/rostests/winetests/wininet/http.c @@ -7801,6 +7801,13 @@ static void test_concurrent_header_access(void) START_TEST(http) { HMODULE hdll; + + if (!winetest_interactive) + { + win_skip("Skipping wininet:http due to hang ROSTESTS-357\n"); + return; + } + hdll = GetModuleHandleA("wininet.dll"); if(!GetProcAddress(hdll, "InternetGetCookieExW")) {
