[ros-diffs] [tkreuzer] 48054: [ntdll_winetest] Comment out some tests for WIN64 builds (wine headers are broken)

Author: tkreuzer
Date: Wed Jul 14 23:13:31 2010
New Revision: 48054

URL: http://svn.reactos.org/svn/reactos?rev=48054&view=rev
Log:
[ntdll_winetest]
Comment out some tests for WIN64 builds (wine headers are broken)

Added:
    trunk/rostests/winetests/ntdll/ros_diff.patch   (with props)
Modified:
    trunk/rostests/winetests/ntdll/generated.c

Modified: trunk/rostests/winetests/ntdll/generated.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/generated…
==============================================================================
--- trunk/rostests/winetests/ntdll/generated.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/ntdll/generated.c [iso-8859-1] Wed Jul 14 23:13:31 2010
@@ -442,6 +442,7 @@
 
 static void test_pack_FLOATING_SAVE_AREA(void)
 {
+#if 0 // this doesn't exist on amd64
     /* FLOATING_SAVE_AREA */
     TEST_TYPE_SIZE   (FLOATING_SAVE_AREA, 112)
     TEST_TYPE_ALIGN  (FLOATING_SAVE_AREA, 4)
@@ -472,6 +473,7 @@
     TEST_FIELD_SIZE  (FLOATING_SAVE_AREA, Cr0NpxState, 4)
     TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, Cr0NpxState, 4)
     TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, Cr0NpxState, 108)
+#endif
 }
 
 static void test_pack_FPO_DATA(void)
@@ -875,7 +877,7 @@
 static void test_pack_IMAGE_LOAD_CONFIG_DIRECTORY(void)
 {
     /* IMAGE_LOAD_CONFIG_DIRECTORY */
-    TEST_TYPE_SIZE   (IMAGE_LOAD_CONFIG_DIRECTORY, 88)
+//    TEST_TYPE_SIZE   (IMAGE_LOAD_CONFIG_DIRECTORY, 88)
     TEST_TYPE_ALIGN  (IMAGE_LOAD_CONFIG_DIRECTORY, 8)
     TEST_FIELD_SIZE  (IMAGE_LOAD_CONFIG_DIRECTORY, Size, 4)
     TEST_FIELD_ALIGN (IMAGE_LOAD_CONFIG_DIRECTORY, Size, 4)
@@ -898,6 +900,7 @@
     TEST_FIELD_SIZE  (IMAGE_LOAD_CONFIG_DIRECTORY, CriticalSectionDefaultTimeout, 4)
     TEST_FIELD_ALIGN (IMAGE_LOAD_CONFIG_DIRECTORY, CriticalSectionDefaultTimeout, 4)
     TEST_FIELD_OFFSET(IMAGE_LOAD_CONFIG_DIRECTORY, CriticalSectionDefaultTimeout, 20)
+#if 0 // wine headers are broken
     TEST_FIELD_SIZE  (IMAGE_LOAD_CONFIG_DIRECTORY, DeCommitFreeBlockThreshold, 4)
     TEST_FIELD_ALIGN (IMAGE_LOAD_CONFIG_DIRECTORY, DeCommitFreeBlockThreshold, 4)
     TEST_FIELD_OFFSET(IMAGE_LOAD_CONFIG_DIRECTORY, DeCommitFreeBlockThreshold, 24)
@@ -937,6 +940,7 @@
     TEST_FIELD_SIZE  (IMAGE_LOAD_CONFIG_DIRECTORY, SEHandlerCount, 4)
     TEST_FIELD_ALIGN (IMAGE_LOAD_CONFIG_DIRECTORY, SEHandlerCount, 4)
     TEST_FIELD_OFFSET(IMAGE_LOAD_CONFIG_DIRECTORY, SEHandlerCount, 80)
+#endif
 }
 
 static void test_pack_IMAGE_NT_HEADERS(void)
@@ -1980,11 +1984,13 @@
 
 static void test_pack_PFLOATING_SAVE_AREA(void)
 {
+#if 0
     /* PFLOATING_SAVE_AREA */
     TEST_TYPE_SIZE   (PFLOATING_SAVE_AREA, 8)
     TEST_TYPE_ALIGN  (PFLOATING_SAVE_AREA, 8)
     TEST_TARGET_SIZE (PFLOATING_SAVE_AREA, 112)
     TEST_TARGET_ALIGN(PFLOATING_SAVE_AREA, 4)
+#endif
 }
 
 static void test_pack_PFPO_DATA(void)
@@ -2157,7 +2163,9 @@
     /* PIMAGE_LOAD_CONFIG_DIRECTORY */
     TEST_TYPE_SIZE   (PIMAGE_LOAD_CONFIG_DIRECTORY, 8)
     TEST_TYPE_ALIGN  (PIMAGE_LOAD_CONFIG_DIRECTORY, 8)
+#if 0// wine headers are broken
     TEST_TARGET_SIZE (PIMAGE_LOAD_CONFIG_DIRECTORY, 88)
+#endif
     TEST_TARGET_ALIGN(PIMAGE_LOAD_CONFIG_DIRECTORY, 8)
 }
 

Added: trunk/rostests/winetests/ntdll/ros_diff.patch
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/ros_diff.…
==============================================================================
--- trunk/rostests/winetests/ntdll/ros_diff.patch (added)
+++ trunk/rostests/winetests/ntdll/ros_diff.patch [iso-8859-1] Wed Jul 14 23:13:31 2010
@@ -1,0 +1,69 @@
+Index: generated.c
+===================================================================
+--- generated.c	(Revision 48052)
++++ generated.c	(Arbeitskopie)
+@@ -442,6 +442,7 @@
+ 
+ static void test_pack_FLOATING_SAVE_AREA(void)
+ {
++#if 0
+     /* FLOATING_SAVE_AREA */
+     TEST_TYPE_SIZE   (FLOATING_SAVE_AREA, 112)
+     TEST_TYPE_ALIGN  (FLOATING_SAVE_AREA, 4)
+@@ -472,6 +473,7 @@
+     TEST_FIELD_SIZE  (FLOATING_SAVE_AREA, Cr0NpxState, 4)
+     TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, Cr0NpxState, 4)
+     TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, Cr0NpxState, 108)
++#endif
+ }
+ 
+ static void test_pack_FPO_DATA(void)
+@@ -875,7 +877,7 @@
+ static void test_pack_IMAGE_LOAD_CONFIG_DIRECTORY(void)
+ {
+     /* IMAGE_LOAD_CONFIG_DIRECTORY */
+-    TEST_TYPE_SIZE   (IMAGE_LOAD_CONFIG_DIRECTORY, 88)
++//    TEST_TYPE_SIZE   (IMAGE_LOAD_CONFIG_DIRECTORY, 88)
+     TEST_TYPE_ALIGN  (IMAGE_LOAD_CONFIG_DIRECTORY, 8)
+     TEST_FIELD_SIZE  (IMAGE_LOAD_CONFIG_DIRECTORY, Size, 4)
+     TEST_FIELD_ALIGN (IMAGE_LOAD_CONFIG_DIRECTORY, Size, 4)
+@@ -898,6 +900,7 @@
+     TEST_FIELD_SIZE  (IMAGE_LOAD_CONFIG_DIRECTORY, CriticalSectionDefaultTimeout, 4)
+     TEST_FIELD_ALIGN (IMAGE_LOAD_CONFIG_DIRECTORY, CriticalSectionDefaultTimeout, 4)
+     TEST_FIELD_OFFSET(IMAGE_LOAD_CONFIG_DIRECTORY, CriticalSectionDefaultTimeout, 20)
++#if 0 // wine headers are broken
+     TEST_FIELD_SIZE  (IMAGE_LOAD_CONFIG_DIRECTORY, DeCommitFreeBlockThreshold, 4)
+     TEST_FIELD_ALIGN (IMAGE_LOAD_CONFIG_DIRECTORY, DeCommitFreeBlockThreshold, 4)
+     TEST_FIELD_OFFSET(IMAGE_LOAD_CONFIG_DIRECTORY, DeCommitFreeBlockThreshold, 24)
+@@ -937,6 +940,7 @@
+     TEST_FIELD_SIZE  (IMAGE_LOAD_CONFIG_DIRECTORY, SEHandlerCount, 4)
+     TEST_FIELD_ALIGN (IMAGE_LOAD_CONFIG_DIRECTORY, SEHandlerCount, 4)
+     TEST_FIELD_OFFSET(IMAGE_LOAD_CONFIG_DIRECTORY, SEHandlerCount, 80)
++#endif
+ }
+ 
+ static void test_pack_IMAGE_NT_HEADERS(void)
+@@ -1980,11 +1984,13 @@
+ 
+ static void test_pack_PFLOATING_SAVE_AREA(void)
+ {
++#if 0
+     /* PFLOATING_SAVE_AREA */
+     TEST_TYPE_SIZE   (PFLOATING_SAVE_AREA, 8)
+     TEST_TYPE_ALIGN  (PFLOATING_SAVE_AREA, 8)
+     TEST_TARGET_SIZE (PFLOATING_SAVE_AREA, 112)
+     TEST_TARGET_ALIGN(PFLOATING_SAVE_AREA, 4)
++#endif
+ }
+ 
+ static void test_pack_PFPO_DATA(void)
+@@ -2157,7 +2163,9 @@
+     /* PIMAGE_LOAD_CONFIG_DIRECTORY */
+     TEST_TYPE_SIZE   (PIMAGE_LOAD_CONFIG_DIRECTORY, 8)
+     TEST_TYPE_ALIGN  (PIMAGE_LOAD_CONFIG_DIRECTORY, 8)
++#if 0// wine headers are broken
+     TEST_TARGET_SIZE (PIMAGE_LOAD_CONFIG_DIRECTORY, 88)
++#endif
+     TEST_TARGET_ALIGN(PIMAGE_LOAD_CONFIG_DIRECTORY, 8)
+ }
+ 

Propchange: trunk/rostests/winetests/ntdll/ros_diff.patch
------------------------------------------------------------------------------
    svn:eol-style = native