Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-28 13:38:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ntdll_winetest]

Browse source 
Comment out some tests for WIN64 builds (wine headers are broken)

svn path=/trunk/; revision=48054
This commit is contained in:
Timo Kreuzer 2010-07-14 23:13:31 +00:00
parent 58358394d6
commit 6ae7a76cda
2 changed files with 78 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rostests/winetests/ntdll/generated.c
View file

@ -442,6 +442,7 @@ static void test_pack_EXECUTION_STATE(void)
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 @@ static void test_pack_FLOATING_SAVE_AREA(void)
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_LINENUMBER(void)
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 @@ static void test_pack_IMAGE_LOAD_CONFIG_DIRECTORY(void)
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 @@ static void test_pack_IMAGE_LOAD_CONFIG_DIRECTORY(void)
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_PEXCEPTION_RECORD(void)
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 @@ static void test_pack_PIMAGE_LOAD_CONFIG_DIRECTORY(void)
/* 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)
}

69
rostests/winetests/ntdll/ros_diff.patch Normal file
View file

@ -0,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)
}