winapi_test: The tests don't support WIN64 yet so disable them there.

Francois Gouget fgouget at free.fr
Mon Jan 5 12:57:16 CST 2009


---

Having tests to check the structure packing on 64bit would likely be 
pretty useful so I'll try to make some progress on it next. But for now 
this will at least cut down on the test failures.


 dlls/gdi32/tests/generated.c    |    4 +++-
 dlls/kernel32/tests/generated.c |    4 +++-
 dlls/ntdll/tests/generated.c    |    4 +++-
 dlls/rpcrt4/tests/generated.c   |    4 +++-
 dlls/shell32/tests/generated.c  |    4 +++-
 dlls/shlwapi/tests/generated.c  |    4 +++-
 dlls/urlmon/tests/generated.c   |    4 +++-
 dlls/user32/tests/generated.c   |    4 +++-
 dlls/wininet/tests/generated.c  |    4 +++-
 tools/winapi/winapi_test        |    2 ++
 10 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/dlls/gdi32/tests/generated.c b/dlls/gdi32/tests/generated.c
index 9a35f24..18343b2 100644
--- a/dlls/gdi32/tests/generated.c
+++ b/dlls/gdi32/tests/generated.c
@@ -1,4 +1,4 @@
-/* File generated automatically from tools/winapi/test.dat; do not edit! */
+/* File generated automatically from tools/winapi/tests.dat; do not edit! */
 /* This file can be copied, modified and distributed without restriction. */
 
 /*
@@ -4366,5 +4366,7 @@ static void test_pack(void)
 
 START_TEST(generated)
 {
+#ifndef _WIN64
     test_pack();
+#endif
 }
diff --git a/dlls/kernel32/tests/generated.c b/dlls/kernel32/tests/generated.c
index 846d726..8cc6d44 100644
--- a/dlls/kernel32/tests/generated.c
+++ b/dlls/kernel32/tests/generated.c
@@ -1,4 +1,4 @@
-/* File generated automatically from tools/winapi/test.dat; do not edit! */
+/* File generated automatically from tools/winapi/tests.dat; do not edit! */
 /* This file can be copied, modified and distributed without restriction. */
 
 /*
@@ -1331,5 +1331,7 @@ static void test_pack(void)
 
 START_TEST(generated)
 {
+#ifndef _WIN64
     test_pack();
+#endif
 }
diff --git a/dlls/ntdll/tests/generated.c b/dlls/ntdll/tests/generated.c
index 4818c9e..35c490d 100644
--- a/dlls/ntdll/tests/generated.c
+++ b/dlls/ntdll/tests/generated.c
@@ -1,4 +1,4 @@
-/* File generated automatically from tools/winapi/test.dat; do not edit! */
+/* File generated automatically from tools/winapi/tests.dat; do not edit! */
 /* This file can be copied, modified and distributed without restriction. */
 
 /*
@@ -2387,5 +2387,7 @@ static void test_pack(void)
 
 START_TEST(generated)
 {
+#ifndef _WIN64
     test_pack();
+#endif
 }
diff --git a/dlls/rpcrt4/tests/generated.c b/dlls/rpcrt4/tests/generated.c
index 609e49c..04a7ea9 100644
--- a/dlls/rpcrt4/tests/generated.c
+++ b/dlls/rpcrt4/tests/generated.c
@@ -1,4 +1,4 @@
-/* File generated automatically from tools/winapi/test.dat; do not edit! */
+/* File generated automatically from tools/winapi/tests.dat; do not edit! */
 /* This file can be copied, modified and distributed without restriction. */
 
 /*
@@ -719,5 +719,7 @@ static void test_pack(void)
 
 START_TEST(generated)
 {
+#ifndef _WIN64
     test_pack();
+#endif
 }
diff --git a/dlls/shell32/tests/generated.c b/dlls/shell32/tests/generated.c
index 7e8d281..33ed7dd 100644
--- a/dlls/shell32/tests/generated.c
+++ b/dlls/shell32/tests/generated.c
@@ -1,4 +1,4 @@
-/* File generated automatically from tools/winapi/test.dat; do not edit! */
+/* File generated automatically from tools/winapi/tests.dat; do not edit! */
 /* This file can be copied, modified and distributed without restriction. */
 
 /*
@@ -1385,5 +1385,7 @@ static void test_pack(void)
 
 START_TEST(generated)
 {
+#ifndef _WIN64
     test_pack();
+#endif
 }
diff --git a/dlls/shlwapi/tests/generated.c b/dlls/shlwapi/tests/generated.c
index 6d50fbc..c91df79 100644
--- a/dlls/shlwapi/tests/generated.c
+++ b/dlls/shlwapi/tests/generated.c
@@ -1,4 +1,4 @@
-/* File generated automatically from tools/winapi/test.dat; do not edit! */
+/* File generated automatically from tools/winapi/tests.dat; do not edit! */
 /* This file can be copied, modified and distributed without restriction. */
 
 /*
@@ -176,5 +176,7 @@ static void test_pack(void)
 
 START_TEST(generated)
 {
+#ifndef _WIN64
     test_pack();
+#endif
 }
diff --git a/dlls/urlmon/tests/generated.c b/dlls/urlmon/tests/generated.c
index d29c226..977971d 100644
--- a/dlls/urlmon/tests/generated.c
+++ b/dlls/urlmon/tests/generated.c
@@ -1,4 +1,4 @@
-/* File generated automatically from tools/winapi/test.dat; do not edit! */
+/* File generated automatically from tools/winapi/tests.dat; do not edit! */
 /* This file can be copied, modified and distributed without restriction. */
 
 /*
@@ -345,5 +345,7 @@ static void test_pack(void)
 
 START_TEST(generated)
 {
+#ifndef _WIN64
     test_pack();
+#endif
 }
diff --git a/dlls/user32/tests/generated.c b/dlls/user32/tests/generated.c
index c2d24f9..809cb0b 100644
--- a/dlls/user32/tests/generated.c
+++ b/dlls/user32/tests/generated.c
@@ -1,4 +1,4 @@
-/* File generated automatically from tools/winapi/test.dat; do not edit! */
+/* File generated automatically from tools/winapi/tests.dat; do not edit! */
 /* This file can be copied, modified and distributed without restriction. */
 
 /*
@@ -2477,5 +2477,7 @@ static void test_pack(void)
 
 START_TEST(generated)
 {
+#ifndef _WIN64
     test_pack();
+#endif
 }
diff --git a/dlls/wininet/tests/generated.c b/dlls/wininet/tests/generated.c
index 2d6cdd0..e0ad824 100644
--- a/dlls/wininet/tests/generated.c
+++ b/dlls/wininet/tests/generated.c
@@ -1,4 +1,4 @@
-/* File generated automatically from tools/winapi/test.dat; do not edit! */
+/* File generated automatically from tools/winapi/tests.dat; do not edit! */
 /* This file can be copied, modified and distributed without restriction. */
 
 /*
@@ -1024,5 +1024,7 @@ static void test_pack(void)
 
 START_TEST(generated)
 {
+#ifndef _WIN64
     test_pack();
+#endif
 }
diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test
index f4f00fb..76a1493 100755
--- a/tools/winapi/winapi_test
+++ b/tools/winapi/winapi_test
@@ -608,7 +608,9 @@ sub output_footer($$$) {
     print OUT "START_TEST(generated)\n";
     print OUT "{\n";
     foreach my $test (@tests) {
+	print OUT "#ifndef _WIN64\n";
 	print OUT "    test_$test();\n";
+	print OUT "#endif\n";
     }
     print OUT "}\n";
 }
-- 
1.5.6.5




More information about the wine-patches mailing list