[ROSTESTS] Even if "generated" build tests were done for i386, do not penalize the...

svn path=/trunk/; revision=70790

diff --git a/rostests/winetests/CMakeLists.txt b/rostests/winetests/CMakeLists.txt
index 1f71467..2d938cb 100644 (file)
--- a/rostests/winetests/CMakeLists.txt
+++ b/rostests/winetests/CMakeLists.txt
@@ -28,9 +28,7 @@ add_subdirectory(dsound)
 add_subdirectory(dxdiagn)
 add_subdirectory(faultrep)
 add_subdirectory(fusion)
-if(ARCH STREQUAL "i386")
 add_subdirectory(gdi32)
-endif()
 add_subdirectory(gdiplus)
 add_subdirectory(hlink)
 add_subdirectory(imagehlp)
@@ -40,9 +38,7 @@ add_subdirectory(inetmib1)
 add_subdirectory(iphlpapi)
 add_subdirectory(itss)
 add_subdirectory(jscript)
-if(ARCH STREQUAL "i386")
 add_subdirectory(kernel32)
-endif()
 add_subdirectory(localspl)
 add_subdirectory(localui)
 add_subdirectory(lz32)
@@ -64,9 +60,7 @@ add_subdirectory(msvfw32)
 add_subdirectory(msxml3)
 add_subdirectory(netapi32)
 add_subdirectory(netcfgx)
-if(ARCH STREQUAL "i386")
 add_subdirectory(ntdll)
-endif()
 add_subdirectory(ntdsapi)
 add_subdirectory(ntprint)
 add_subdirectory(odbccp32)
@@ -86,7 +80,7 @@ add_subdirectory(reg)
 add_subdirectory(regedit)
 add_subdirectory(riched20)
 add_subdirectory(riched32)
-if(ARCH STREQUAL "i386")
+if(NOT ARCH STREQUAL "amd64")
     add_subdirectory(rpcrt4)
 endif()
 add_subdirectory(rsaenh)
@@ -97,19 +91,15 @@ add_subdirectory(serialui)
 add_subdirectory(services)
 add_subdirectory(setupapi)
 add_subdirectory(shdocvw)
-if(ARCH STREQUAL "i386")
 add_subdirectory(shell32)
-endif()
 add_subdirectory(shlwapi)
 add_subdirectory(snmpapi)
 add_subdirectory(spoolss)
 add_subdirectory(sti)
 add_subdirectory(sxs)
 add_subdirectory(twain_32)
-if(ARCH STREQUAL "i386")
 add_subdirectory(urlmon)
 add_subdirectory(user32)
-endif()
 add_subdirectory(userenv)
 add_subdirectory(usp10)
 add_subdirectory(uxtheme)
@@ -120,9 +110,7 @@ add_subdirectory(wbemprox)
 add_subdirectory(windowscodecs)
 add_subdirectory(windowscodecsext)
 add_subdirectory(winhttp)
-if(ARCH STREQUAL "i386")
 add_subdirectory(wininet)
-endif()
 add_subdirectory(winmm)
 add_subdirectory(winspool)
 add_subdirectory(wintrust)

diff --git a/rostests/winetests/gdi32/CMakeLists.txt b/rostests/winetests/gdi32/CMakeLists.txt
index 6de9f0a..033f658 100644 (file)
--- a/rostests/winetests/gdi32/CMakeLists.txt
+++ b/rostests/winetests/gdi32/CMakeLists.txt
@@ -9,7 +9,6 @@ list(APPEND SOURCE
     dib.c
     font.c
     gdiobj.c
-    generated.c
     icm.c
     mapping.c
     metafile.c
@@ -18,6 +17,10 @@ list(APPEND SOURCE
     pen.c
     testlist.c)
 
+if(ARCH STREQUAL "i386")
+    list(APPEND SOURCE generated.c)
+endif()
+
 add_executable(gdi32_winetest ${SOURCE} resource.rc)
 set_module_type(gdi32_winetest win32cui)
 add_importlibs(gdi32_winetest gdi32 user32 advapi32 msvcrt kernel32)

diff --git a/rostests/winetests/kernel32/CMakeLists.txt b/rostests/winetests/kernel32/CMakeLists.txt
index 6977acb..53fd02c 100644 (file)
--- a/rostests/winetests/kernel32/CMakeLists.txt
+++ b/rostests/winetests/kernel32/CMakeLists.txt
@@ -1,6 +1,5 @@
 
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
 
 list(APPEND SOURCE
@@ -18,7 +17,6 @@ list(APPEND SOURCE
     fiber.c
     file.c
     format_msg.c
-    #generated.c
     heap.c
     loader.c
     locale.c
@@ -39,6 +37,10 @@ list(APPEND SOURCE
     volume.c
     testlist.c)
 
+#if(ARCH STREQUAL "i386")
+#    list(APPEND SOURCE generated.c)
+#endif()
+
 add_executable(kernel32_winetest ${SOURCE} resource.rc)
 
 if(NOT MSVC)

diff --git a/rostests/winetests/ntdll/CMakeLists.txt b/rostests/winetests/ntdll/CMakeLists.txt
index 815f3d0..1c891d3 100644 (file)
--- a/rostests/winetests/ntdll/CMakeLists.txt
+++ b/rostests/winetests/ntdll/CMakeLists.txt
@@ -1,8 +1,6 @@
 
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502)
-
 add_definitions(-D__WINESRC__)
 
 list(APPEND SOURCE
@@ -13,7 +11,6 @@ list(APPEND SOURCE
     error.c
     exception.c
     file.c
-    generated.c
     info.c
     large_int.c
     om.c
@@ -28,6 +25,10 @@ list(APPEND SOURCE
     time.c
     testlist.c)
 
+if(ARCH STREQUAL "i386")
+    list(APPEND SOURCE generated.c)
+endif()
+
 add_executable(ntdll_winetest ${SOURCE})
 set_module_type(ntdll_winetest win32cui)
 add_importlibs(ntdll_winetest user32 msvcrt kernel32 ntdll)

diff --git a/rostests/winetests/shell32/CMakeLists.txt b/rostests/winetests/shell32/CMakeLists.txt
index 525bd5f..e9009fc 100644 (file)
--- a/rostests/winetests/shell32/CMakeLists.txt
+++ b/rostests/winetests/shell32/CMakeLists.txt
@@ -7,7 +7,6 @@ list(APPEND SOURCE
     autocomplete.c
     brsfolder.c
     ebrowser.c
-    generated.c
     progman_dde.c
     recyclebin.c
     shelldispatch.c
@@ -24,6 +23,10 @@ list(APPEND SOURCE
     testlist.c
     rsrc.rc)
 
+if(ARCH STREQUAL "i386")
+    list(APPEND SOURCE generated.c)
+endif()
+
 add_executable(shell32_winetest ${SOURCE})
 target_link_libraries(shell32_winetest uuid)
 set_module_type(shell32_winetest win32cui)

diff --git a/rostests/winetests/urlmon/CMakeLists.txt b/rostests/winetests/urlmon/CMakeLists.txt
index f2a1106..b7773c8 100644 (file)
--- a/rostests/winetests/urlmon/CMakeLists.txt
+++ b/rostests/winetests/urlmon/CMakeLists.txt
@@ -2,7 +2,6 @@
 add_definitions(-DUSE_WINE_TODOS)
 
 list(APPEND SOURCE
-    generated.c
     misc.c
     protocol.c
     sec_mgr.c
@@ -11,6 +10,10 @@ list(APPEND SOURCE
     url.c
     testlist.c)
 
+if(ARCH STREQUAL "i386")
+    list(APPEND SOURCE generated.c)
+endif()
+
 add_executable(urlmon_winetest ${SOURCE})
 target_link_libraries(urlmon_winetest uuid)
 set_module_type(urlmon_winetest win32cui)

diff --git a/rostests/winetests/user32/CMakeLists.txt b/rostests/winetests/user32/CMakeLists.txt
index 1e256bc..15f1c1e 100644 (file)
--- a/rostests/winetests/user32/CMakeLists.txt
+++ b/rostests/winetests/user32/CMakeLists.txt
@@ -9,7 +9,6 @@ list(APPEND SOURCE
     dde.c
     dialog.c
     edit.c
-    generated.c
     input.c
     listbox.c
     menu.c
@@ -26,6 +25,10 @@ list(APPEND SOURCE
     wsprintf.c
     testlist.c)
 
+if(ARCH STREQUAL "i386")
+    list(APPEND SOURCE generated.c)
+endif()
+
 add_executable(user32_winetest ${SOURCE} resource.rc)
 # some tests need to be run from an app compiled as GUI
 set_module_type(user32_winetest win32gui)

diff --git a/rostests/winetests/wininet/CMakeLists.txt b/rostests/winetests/wininet/CMakeLists.txt
index cb81ec8..444f60b 100644 (file)
--- a/rostests/winetests/wininet/CMakeLists.txt
+++ b/rostests/winetests/wininet/CMakeLists.txt
@@ -3,13 +3,16 @@ add_definitions(-DUSE_WINE_TODOS)
 
 list(APPEND SOURCE
     ftp.c
-    generated.c
     http.c
     internet.c
     url.c
     urlcache.c
     testlist.c)
 
+if(ARCH STREQUAL "i386")
+    list(APPEND SOURCE generated.c)
+endif()
+
 add_executable(wininet_winetest ${SOURCE})
 set_module_type(wininet_winetest win32cui)
 add_importlibs(wininet_winetest wininet crypt32 ws2_32 user32 advapi32 msvcrt kernel32)