[ros-diffs] [spetreolle] 50901: [ROSTESTS] Bug 5957 Disable test_shell_window() in user32:win test. Allow to run previously disabled tests in WINE_INTERACTIVE mode.

[spetreolle at svn.reactos.org]

Author: spetreolle
Date: Fri Feb 25 16:21:04 2011
New Revision: 50901

URL: http://svn.reactos.org/svn/reactos?rev=50901&view=rev
Log:
[ROSTESTS]
Bug 5957
Disable test_shell_window() in user32:win test.

Allow to run previously disabled tests in WINE_INTERACTIVE mode.

Modified:
    trunk/rostests/winetests/user32/msg.c
    trunk/rostests/winetests/user32/win.c

Modified: trunk/rostests/winetests/user32/msg.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?rev=50901&r1=50900&r2=50901&view=diff
==============================================================================
--- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Fri Feb 25 16:21:04 2011
@@ -12572,8 +12572,10 @@
     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 @@
     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();

Modified: trunk/rostests/winetests/user32/win.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/win.c?rev=50901&r1=50900&r2=50901&view=diff
==============================================================================
--- trunk/rostests/winetests/user32/win.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/user32/win.c [iso-8859-1] Fri Feb 25 16:21:04 2011
@@ -6059,8 +6059,10 @@
     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 @@
     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();