[akhaldi] 70790: [ROSTESTS] Even if "generated" build tests were done for i386, do not penalize the other arch builds by removing all the core modules tests from them. Simply skip the source file i...
Author: akhaldi Date: Sat Feb 27 18:15:59 2016 New Revision: 70790
URL: http://svn.reactos.org/svn/reactos?rev=70790&view=rev Log: [ROSTESTS] Even if "generated" build tests were done for i386, do not penalize the other arch builds by removing all the core modules tests from them. Simply skip the source file in question from their build. This reverts r70789.
Modified: trunk/rostests/winetests/CMakeLists.txt trunk/rostests/winetests/gdi32/CMakeLists.txt trunk/rostests/winetests/kernel32/CMakeLists.txt trunk/rostests/winetests/ntdll/CMakeLists.txt trunk/rostests/winetests/shell32/CMakeLists.txt trunk/rostests/winetests/urlmon/CMakeLists.txt trunk/rostests/winetests/user32/CMakeLists.txt trunk/rostests/winetests/wininet/CMakeLists.txt
Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?r... ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Sat Feb 27 18:15:59 2016 @@ -28,9 +28,7 @@ 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(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(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(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(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(windowscodecs) add_subdirectory(windowscodecsext) add_subdirectory(winhttp) -if(ARCH STREQUAL "i386") add_subdirectory(wininet) -endif() add_subdirectory(winmm) add_subdirectory(winspool) add_subdirectory(wintrust)
Modified: trunk/rostests/winetests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/CMakeLists... ============================================================================== --- trunk/rostests/winetests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/CMakeLists.txt [iso-8859-1] Sat Feb 27 18:15:59 2016 @@ -9,7 +9,6 @@ dib.c font.c gdiobj.c - generated.c icm.c mapping.c metafile.c @@ -17,6 +16,10 @@ path.c 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)
Modified: trunk/rostests/winetests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/CMakeLi... ============================================================================== --- trunk/rostests/winetests/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/CMakeLists.txt [iso-8859-1] Sat Feb 27 18:15:59 2016 @@ -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 @@ fiber.c file.c format_msg.c - #generated.c heap.c loader.c locale.c @@ -39,6 +37,10 @@ volume.c testlist.c)
+#if(ARCH STREQUAL "i386") +# list(APPEND SOURCE generated.c) +#endif() + add_executable(kernel32_winetest ${SOURCE} resource.rc)
if(NOT MSVC)
Modified: trunk/rostests/winetests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/CMakeLists... ============================================================================== --- trunk/rostests/winetests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/CMakeLists.txt [iso-8859-1] Sat Feb 27 18:15:59 2016 @@ -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 @@ error.c exception.c file.c - generated.c info.c large_int.c om.c @@ -28,6 +25,10 @@ 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)
Modified: trunk/rostests/winetests/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/CMakeLis... ============================================================================== --- trunk/rostests/winetests/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/CMakeLists.txt [iso-8859-1] Sat Feb 27 18:15:59 2016 @@ -7,7 +7,6 @@ autocomplete.c brsfolder.c ebrowser.c - generated.c progman_dde.c recyclebin.c shelldispatch.c @@ -24,6 +23,10 @@ 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)
Modified: trunk/rostests/winetests/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/CMakeList... ============================================================================== --- trunk/rostests/winetests/urlmon/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/CMakeLists.txt [iso-8859-1] Sat Feb 27 18:15:59 2016 @@ -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 @@ 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)
Modified: trunk/rostests/winetests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/CMakeList... ============================================================================== --- trunk/rostests/winetests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/CMakeLists.txt [iso-8859-1] Sat Feb 27 18:15:59 2016 @@ -9,7 +9,6 @@ dde.c dialog.c edit.c - generated.c input.c listbox.c menu.c @@ -26,6 +25,10 @@ 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)
Modified: trunk/rostests/winetests/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/CMakeLis... ============================================================================== --- trunk/rostests/winetests/wininet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/CMakeLists.txt [iso-8859-1] Sat Feb 27 18:15:59 2016 @@ -3,13 +3,16 @@
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)
-
akhaldi＠svn.reactos.org