Skip to content

Commit d424a0e

Browse files
committed
[WININET_WINETEST][URLMON_WINETEST][SHELL32_APITEST] Skip some tests
Due to hangs on test machines ROSTESTS-357 ROSTESTS-358 CORE-17057
1 parent 1761bed commit d424a0e

File tree

4 files changed

+20
-1
lines changed

4 files changed

+20
-1
lines changed

modules/rostests/apitests/shell32/DragDrop.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,12 @@ static void DoTestEntry(const TEST_ENTRY *pEntry)
383383

384384
START_TEST(DragDrop)
385385
{
386+
if (!winetest_interactive)
387+
{
388+
skip("Skipping the test due to crash. CORE-17057\n");
389+
return;
390+
}
391+
386392
HRESULT hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
387393
ok_int(SUCCEEDED(hr), TRUE);
388394

modules/rostests/apitests/shell32/testlist.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const struct test winetest_testlist[] =
4040
{ "CShellDesktop", func_CShellDesktop },
4141
{ "CShellLink", func_CShellLink },
4242
{ "CUserNotification", func_CUserNotification },
43-
// { "DragDrop", func_DragDrop }, disabled due to CORE-17057
43+
{ "DragDrop", func_DragDrop },
4444
{ "ExtractIconEx", func_ExtractIconEx },
4545
{ "IShellFolderViewCB", func_IShellFolderViewCB },
4646
{ "menu", func_menu },

modules/rostests/winetests/urlmon/url.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3924,6 +3924,12 @@ START_TEST(url)
39243924
{
39253925
HMODULE hurlmon;
39263926

3927+
if (!winetest_interactive)
3928+
{
3929+
win_skip("Skipping urlmon:url due to hang ROSTESTS-358\n");
3930+
return;
3931+
}
3932+
39273933
hurlmon = GetModuleHandleA("urlmon.dll");
39283934
pCreateAsyncBindCtxEx = (void*) GetProcAddress(hurlmon, "CreateAsyncBindCtxEx");
39293935

modules/rostests/winetests/wininet/http.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7801,6 +7801,13 @@ static void test_concurrent_header_access(void)
78017801
START_TEST(http)
78027802
{
78037803
HMODULE hdll;
7804+
7805+
if (!winetest_interactive)
7806+
{
7807+
win_skip("Skipping wininet:http due to hang ROSTESTS-357\n");
7808+
return;
7809+
}
7810+
78047811
hdll = GetModuleHandleA("wininet.dll");
78057812

78067813
if(!GetProcAddress(hdll, "InternetGetCookieExW")) {

0 commit comments

Comments
 (0)