From 0fcd8261f2ee747c3b6eeb557b386cb9b873d5e7 Mon Sep 17 00:00:00 2001 From: Sylvain Petreolle Date: Fri, 25 Feb 2011 16:21:04 +0000 Subject: [PATCH] [ROSTESTS] Bug 5957 Disable test_shell_window() in user32:win test. Allow to run previously disabled tests in WINE_INTERACTIVE mode. svn path=/trunk/; revision=50901 --- rostests/winetests/user32/msg.c | 12 ++++++++---- rostests/winetests/user32/win.c | 11 ++++++++--- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/rostests/winetests/user32/msg.c b/rostests/winetests/user32/msg.c index 1a595c77c5f..aef282018f1 100755 --- a/rostests/winetests/user32/msg.c +++ b/rostests/winetests/user32/msg.c @@ -12572,8 +12572,10 @@ START_TEST(msg) test_paint_messages(); test_interthread_messages(); test_message_conversion(); - skip("skipping test_accelerators, that hangs on reactos\n"); - //test_accelerators(); + if(!winetest_interactive) + skip("skipping test_accelerators, that hangs on reactos\n"); + else + test_accelerators(); test_timers(); test_timers_no_wnd(); if (hCBT_hook) test_set_hook(); @@ -12594,8 +12596,10 @@ START_TEST(msg) test_dialog_messages(); test_nullCallback(); test_dbcs_wm_char(); - skip("skipping test_menu_messages, that hangs on reactos\n"); - //test_menu_messages(); + if(!winetest_interactive) + skip("skipping test_menu_messages, that hangs on reactos\n"); + else + test_menu_messages(); test_paintingloop(); test_defwinproc(); test_clipboard_viewers(); diff --git a/rostests/winetests/user32/win.c b/rostests/winetests/user32/win.c index af048515ef9..668399caeef 100644 --- a/rostests/winetests/user32/win.c +++ b/rostests/winetests/user32/win.c @@ -6059,8 +6059,10 @@ START_TEST(win) test_capture_2(); test_capture_3(hwndMain, hwndMain2); - skip("skipping test_capture_4, that hangs on reactos\n"); - //test_capture_4(); + if(!winetest_interactive) + skip("skipping test_capture_4, that hangs on reactos\n"); + else + test_capture_4(); test_CreateWindow(); test_parent_owner(); @@ -6101,7 +6103,10 @@ START_TEST(win) test_layered_window(); test_SetForegroundWindow(hwndMain); - test_shell_window(); + if(!winetest_interactive) + skip("bug 5957: skipping test_shell_window, it crashes ros/win7 explorer\n"); + else + test_shell_window(); test_handles( hwndMain ); test_winregion();