[MSHTML_WINETEST]

- Use winetest_interactive to disable tests

svn path=/trunk/; revision=59479
This commit is contained in:
Thomas Faber 2013-07-14 10:11:45 +00:00
parent 25bc546159
commit d16e22b423
2 changed files with 30 additions and 22 deletions

View file

@ -2435,14 +2435,18 @@ static void test_flash_ax(void)
/* Set in DoVerb */ /* Set in DoVerb */
CHECK_CALLED(InPlaceObject_GetWindow); CHECK_CALLED(InPlaceObject_GetWindow);
CHECK_CALLED(SetObjectRects); CHECK_CALLED(SetObjectRects);
#if ROSTESTS_114_IS_FIXED if (winetest_interactive)
test_ui_activate(); {
test_container(notif_doc); test_ui_activate();
test_object_elem(notif_doc); test_container(notif_doc);
#endif test_object_elem(notif_doc);
win_skip("Skipping test_ui_activate(). ROSTESTS-114.\n"); }
win_skip("Skipping test_container(notif_doc). ROSTESTS-114.\n"); else
win_skip("Skipping test_object_elem(notif_doc). ROSTESTS-114.\n"); {
skip("Skipping test_ui_activate(). ROSTESTS-114.\n");
skip("Skipping test_container(notif_doc). ROSTESTS-114.\n");
skip("Skipping test_object_elem(notif_doc). ROSTESTS-114.\n");
}
SET_EXPECT(UIDeactivate); SET_EXPECT(UIDeactivate);
SET_EXPECT(Invoke_ENABLED); SET_EXPECT(Invoke_ENABLED);
@ -2557,10 +2561,10 @@ static void test_event_binding(void)
CHECK_CALLED(FindConnectionPoint); CHECK_CALLED(FindConnectionPoint);
CHECK_CALLED(Advise); CHECK_CALLED(Advise);
#if ROSTESTS_114_IS_FIXED if (winetest_interactive)
test_event_call(); test_event_call();
#endif else
win_skip("Skipping test_event_call(). ROSTESTS-114.\n"); skip("Skipping test_event_call(). ROSTESTS-114.\n");
SET_EXPECT(InPlaceDeactivate); SET_EXPECT(InPlaceDeactivate);
SET_EXPECT(Close); SET_EXPECT(Close);

View file

@ -7574,17 +7574,21 @@ START_TEST(htmldoc)
test_HTMLDocument(TRUE, TRUE); test_HTMLDocument(TRUE, TRUE);
test_HTMLDocument_StreamLoad(); test_HTMLDocument_StreamLoad();
test_HTMLDocument_StreamInitNew(); test_HTMLDocument_StreamInitNew();
#if ROSTESTS_113_IS_FIXED if (winetest_interactive)
test_editing_mode(FALSE); test_editing_mode(FALSE);
#endif else
win_skip("Skipping test_editing_mode(FALSE). ROSTESTS-113.\n"); skip("Skipping test_editing_mode(FALSE). ROSTESTS-113.\n");
test_editing_mode(TRUE); test_editing_mode(TRUE);
#if ROSTESTS_113_IS_FIXED if (winetest_interactive)
test_HTMLDocument_http(FALSE); {
test_HTMLDocument_http(TRUE); test_HTMLDocument_http(FALSE);
#endif test_HTMLDocument_http(TRUE);
win_skip("Skipping test_HTMLDocument_http(FALSE). ROSTESTS-113.\n"); }
win_skip("Skipping test_HTMLDocument_http(TRUE). ROSTESTS-113.\n"); else
{
skip("Skipping test_HTMLDocument_http(FALSE). ROSTESTS-113.\n");
skip("Skipping test_HTMLDocument_http(TRUE). ROSTESTS-113.\n");
}
test_UIActivate(FALSE, FALSE, FALSE); test_UIActivate(FALSE, FALSE, FALSE);
test_UIActivate(FALSE, TRUE, FALSE); test_UIActivate(FALSE, TRUE, FALSE);