Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-30 22:47:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove all Skip hacks from the Wine tests as we resume from crashes now

Browse source 
svn path=/trunk/; revision=40229
This commit is contained in:
Colin Finck 2009-03-25 14:37:01 +00:00
parent 58f2230b68
commit 8cb8fb4761
15 changed files with 0 additions and 175 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
rostests/winetests/advapi32/roshack.diff
View file

@ -1,48 +0,0 @@
Index: security.c
===================================================================
--- security.c (revision 37998)
+++ security.c (working copy)
@@ -2665,13 +2665,17 @@
return;
}
+ /* ReactOS Hack: ros' Security Descriptor string parsing sucks */
+ skip("ROS-HACK: Skipping 'test_PrivateObjectSecurity' -- ros' SID string parsing sucks\n");
+ return;
+
ok(pConvertStringSecurityDescriptorToSecurityDescriptorA(
"O:SY"
"G:S-1-5-21-93476-23408-4576"
"D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)"
"(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)"
"S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)",
- SDDL_REVISION_1, &sec, &dwDescSize), "Creating descriptor failed\n");
+ SDDL_REVISION_1, &sec, &dwDescSize), "Creating descriptor failed\n"); // FIXME: ConvertStringSecurityDescriptorToSecurityDescriptor fails and 'sec' isn't set
test_SetSecurityDescriptorControl(sec);
===================================================================
--- security.c (revision 38229)
+++ security.c (working copy)
@@ -2840,6 +2840,7 @@
/* If we don't ask for the security descriptor, Windows will still give us
the other stuff, leaving us no way to free it. */
+ dacl = NULL;
ret = pGetSecurityInfo(obj, SE_FILE_OBJECT,
OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION,
&owner, &group, &dacl, NULL, NULL);
@@ -2847,8 +2848,12 @@
ok(owner != NULL, "GetSecurityInfo\n");
ok(group != NULL, "GetSecurityInfo\n");
ok(dacl != NULL, "GetSecurityInfo\n");
- ok(IsValidAcl(dacl), "GetSecurityInfo\n");
+ if (dacl != NULL)
+ {
+ ok(IsValidAcl(dacl), "GetSecurityInfo\n");
+ }
+
CloseHandle(obj);
}

4
rostests/winetests/advapi32/security.c
View file

@ -2804,10 +2804,6 @@ static void test_PrivateObjectSecurity(void)
return;
}
/* ReactOS Hack: ros' Security Descriptor string parsing sucks */
skip("ROS-HACK: Skipping 'test_PrivateObjectSecurity' -- ros' SID string parsing sucks\n");
return;
ok(pConvertStringSecurityDescriptorToSecurityDescriptorA(
"O:SY"
"G:S-1-5-21-93476-23408-4576"

15
rostests/winetests/comctl32/roshack.diff
View file

@ -1,15 +0,0 @@
Index: mru.c
===================================================================
--- mru.c (revision 38062)
+++ mru.c (working copy)
@@ -418,6 +418,10 @@
{
hComctl32 = GetModuleHandleA("comctl32.dll");
+ /* The registry usage here crashes the system because of broken Cm -- remove this when Cm gets fixed */
+ skip("ROS-HACK: Skipping mru tests -- Cm is broken\n");
+ return;
+
delete_reg_entries();
if (!create_reg_entries())
return;

3
rostests/winetests/gdi32/font.c
View file

@ -285,9 +285,6 @@ static void test_bitmap_font(void)
SIZE size_orig;
INT ret, i, width_orig, height_orig, scale, lfWidth;
skip("ROS-HACK: Skipping bitmap font tests!\n");
return;
hdc = GetDC(0);
/* "System" has only 1 pixel size defined, otherwise the test breaks */

2
rostests/winetests/gdi32/mapping.c
View file

@ -297,8 +297,6 @@ static void test_isotropic_mapping(void)
START_TEST(mapping)
{
skip("ROS-HACK: Skipping mapping tests!\n");
return;
test_modify_world_transform();
test_world_transform();
test_isotropic_mapping();

3
rostests/winetests/kernel32/process.c
View file

@ -1202,9 +1202,6 @@ static void test_Console(void)
const char* msg = "This is a std-handle inheritance test.";
unsigned msg_len;
BOOL run_tests = TRUE;
skip("ROS-HACK: Skipping process console tests\n");
return;
memset(&startup, 0, sizeof(startup));
startup.cb = sizeof(startup);

28
rostests/winetests/kernel32/roshack.diff
View file

@ -1,28 +0,0 @@
Index: pipe.c
===================================================================
--- pipe.c (revision 38314)
+++ pipe.c (working copy)
@@ -1327,6 +1327,9 @@
{
HMODULE hmod;
+ skip("ROS-HACK: Skipping pipe tests -- ros' npfs is in a sorry state\n");
+ return;
+
hmod = GetModuleHandle("advapi32.dll");
pDuplicateTokenEx = (void *) GetProcAddress(hmod, "DuplicateTokenEx");
Index: process.c
===================================================================
--- process.c (revision 38314)
+++ process.c (working copy)
@@ -1202,6 +1202,9 @@
const char* msg = "This is a std-handle inheritance test.";
unsigned msg_len;
BOOL run_tests = TRUE;
+
+ skip("ROS-HACK: Skipping process console tests\n");
+ return;
memset(&startup, 0, sizeof(startup));
startup.cb = sizeof(startup);

3
rostests/winetests/kernel32/thread.c
View file

@ -979,9 +979,6 @@ static void test_RegisterWaitForSingleObject(void)
return;
}
skip("ROS-HACK: Skipping RegisterWaitForSingleObject tests\n");
return;
/* test signaled case */
handle = CreateEvent(NULL, TRUE, TRUE, NULL);

6
rostests/winetests/kernel32/virtual.c
View file

@ -304,9 +304,6 @@ static void test_MapViewOfFile(void)
MEMORY_BASIC_INFORMATION info;
BOOL ret;
skip("ROS-HACK: Skipping MapViewOfFile tests\n");
return;
SetLastError(0xdeadbeef);
file = CreateFileA( testfile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 );
ok( file != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError() );
@ -781,9 +778,6 @@ static void test_write_watch(void)
return;
}
skip("ROS-HACK: Skipping WriteWatch tests\n");
return;
size = 0x10000;
base = VirtualAlloc( 0, size, MEM_RESERVE | MEM_COMMIT | MEM_WRITE_WATCH, PAGE_READWRITE );
if (!base &&

3
rostests/winetests/ntdll/port.c
View file

@ -310,9 +310,6 @@ START_TEST(port)
{
HANDLE thread;
DWORD id;
skip("ROS-HACK: Skipping port tests -- missing NtReplyPort and NtRequestPort\n");
return;
if (!init_function_ptrs())
return;

14
rostests/winetests/ntdll/roshack.diff
View file

@ -1,14 +0,0 @@
Index: port.c
===================================================================
--- port.c (revision 38229)
+++ port.c (working copy)
@@ -310,6 +310,9 @@
{
HANDLE thread;
DWORD id;
+
+ skip("ROS-HACK: Skipping port tests -- missing NtReplyPort and NtRequestPort\n");
+ return;
if (!init_function_ptrs())
return;

14
rostests/winetests/ole32/roshack.diff
View file

@ -1,14 +0,0 @@
Index: compobj.c
===================================================================
--- compobj.c (revision 38229)
+++ compobj.c (working copy)
@@ -1024,6 +1024,9 @@
START_TEST(compobj)
{
+ skip("ROS-HACK: Skipping compobj tests\n");
+ return;
+
HMODULE hOle32 = GetModuleHandle("ole32");
pCoGetObjectContext = (void*)GetProcAddress(hOle32, "CoGetObjectContext");
if (!(pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx")))

27
rostests/winetests/shell32/roshack.diff
View file

@ -1,27 +0,0 @@
Index: shlexec.c
===================================================================
--- shlexec.c (revision 38229)
+++ shlexec.c (working copy)
@@ -1577,6 +1577,8 @@
START_TEST(shlexec)
{
+ skip("ROS-HACK: Skipping shell execute tests\n");
+ return;
myARGC = winetest_get_mainargs(&myARGV);
if (myARGC >= 3)
Index: systray.c
===================================================================
--- systray.c (revision 38229)
+++ systray.c (working copy)
@@ -138,6 +138,9 @@
RECT rc;
HMODULE huser32, hshell32;
+ skip("ROS-HACK: Skipping systray tests\n");
+ return;
+
hshell32 = GetModuleHandleA("shell32.dll");
pShell_NotifyIconW = (void*)GetProcAddress(hshell32, "Shell_NotifyIconW");

2
rostests/winetests/shell32/shlexec.c
View file

@ -1577,8 +1577,6 @@ static void cleanup_test(void)
START_TEST(shlexec)
{
skip("ROS-HACK: Skipping shell execute tests\n");
return;
myARGC = winetest_get_mainargs(&myARGV);
if (myARGC >= 3)

3
rostests/winetests/shell32/systray.c
View file

@ -138,9 +138,6 @@ START_TEST(systray)
RECT rc;
HMODULE huser32, hshell32;
skip("ROS-HACK: Skipping systray tests\n");
return;
hshell32 = GetModuleHandleA("shell32.dll");
pShell_NotifyIconW = (void*)GetProcAddress(hshell32, "Shell_NotifyIconW");