mirror of
https://github.com/reactos/reactos.git
synced 2024-06-03 03:01:49 +00:00
[ROSTESTS]
Handle generated tests on all architectures. Update i386 files. The kernel32 generated remains disabled, Wine's definition of COMMCONFIG differs from our/MSDN definition. Commented out nonexisting LPEXCEPTION_RECORD. svn path=/trunk/; revision=70802
This commit is contained in:
parent
fbaaa03502
commit
dd21fa115a
|
@ -9,6 +9,7 @@ list(APPEND SOURCE
|
||||||
dib.c
|
dib.c
|
||||||
font.c
|
font.c
|
||||||
gdiobj.c
|
gdiobj.c
|
||||||
|
generated_${ARCH}.c
|
||||||
icm.c
|
icm.c
|
||||||
mapping.c
|
mapping.c
|
||||||
metafile.c
|
metafile.c
|
||||||
|
@ -17,10 +18,6 @@ list(APPEND SOURCE
|
||||||
pen.c
|
pen.c
|
||||||
testlist.c)
|
testlist.c)
|
||||||
|
|
||||||
if(ARCH STREQUAL "i386")
|
|
||||||
list(APPEND SOURCE generated.c)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
add_executable(gdi32_winetest ${SOURCE} resource.rc)
|
add_executable(gdi32_winetest ${SOURCE} resource.rc)
|
||||||
set_module_type(gdi32_winetest win32cui)
|
set_module_type(gdi32_winetest win32cui)
|
||||||
add_importlibs(gdi32_winetest gdi32 user32 advapi32 msvcrt kernel32)
|
add_importlibs(gdi32_winetest gdi32 user32 advapi32 msvcrt kernel32)
|
||||||
|
|
|
@ -17,6 +17,7 @@ list(APPEND SOURCE
|
||||||
fiber.c
|
fiber.c
|
||||||
file.c
|
file.c
|
||||||
format_msg.c
|
format_msg.c
|
||||||
|
#generated_${ARCH}.c
|
||||||
heap.c
|
heap.c
|
||||||
loader.c
|
loader.c
|
||||||
locale.c
|
locale.c
|
||||||
|
@ -37,10 +38,6 @@ list(APPEND SOURCE
|
||||||
volume.c
|
volume.c
|
||||||
testlist.c)
|
testlist.c)
|
||||||
|
|
||||||
#if(ARCH STREQUAL "i386")
|
|
||||||
# list(APPEND SOURCE generated.c)
|
|
||||||
#endif()
|
|
||||||
|
|
||||||
add_executable(kernel32_winetest ${SOURCE} resource.rc)
|
add_executable(kernel32_winetest ${SOURCE} resource.rc)
|
||||||
|
|
||||||
if(NOT MSVC)
|
if(NOT MSVC)
|
||||||
|
|
|
@ -989,12 +989,12 @@ static void test_pack_LPEXCEPTION_POINTERS(void)
|
||||||
TEST_TYPE_ALIGN (LPEXCEPTION_POINTERS, 8)
|
TEST_TYPE_ALIGN (LPEXCEPTION_POINTERS, 8)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void test_pack_LPEXCEPTION_RECORD(void)
|
//static void test_pack_LPEXCEPTION_RECORD(void)
|
||||||
{
|
//{
|
||||||
/* LPEXCEPTION_RECORD */
|
// /* LPEXCEPTION_RECORD */
|
||||||
TEST_TYPE_SIZE (LPEXCEPTION_RECORD, 8)
|
// TEST_TYPE_SIZE (LPEXCEPTION_RECORD, 8)
|
||||||
TEST_TYPE_ALIGN (LPEXCEPTION_RECORD, 8)
|
// TEST_TYPE_ALIGN (LPEXCEPTION_RECORD, 8)
|
||||||
}
|
//}
|
||||||
|
|
||||||
static void test_pack_LPFIBER_START_ROUTINE(void)
|
static void test_pack_LPFIBER_START_ROUTINE(void)
|
||||||
{
|
{
|
||||||
|
@ -2846,12 +2846,12 @@ static void test_pack_LPEXCEPTION_POINTERS(void)
|
||||||
TEST_TYPE_ALIGN (LPEXCEPTION_POINTERS, 4)
|
TEST_TYPE_ALIGN (LPEXCEPTION_POINTERS, 4)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void test_pack_LPEXCEPTION_RECORD(void)
|
//static void test_pack_LPEXCEPTION_RECORD(void)
|
||||||
{
|
//{
|
||||||
/* LPEXCEPTION_RECORD */
|
// /* LPEXCEPTION_RECORD */
|
||||||
TEST_TYPE_SIZE (LPEXCEPTION_RECORD, 4)
|
// TEST_TYPE_SIZE (LPEXCEPTION_RECORD, 4)
|
||||||
TEST_TYPE_ALIGN (LPEXCEPTION_RECORD, 4)
|
// TEST_TYPE_ALIGN (LPEXCEPTION_RECORD, 4)
|
||||||
}
|
//}
|
||||||
|
|
||||||
static void test_pack_LPFIBER_START_ROUTINE(void)
|
static void test_pack_LPFIBER_START_ROUTINE(void)
|
||||||
{
|
{
|
|
@ -11,6 +11,7 @@ list(APPEND SOURCE
|
||||||
error.c
|
error.c
|
||||||
exception.c
|
exception.c
|
||||||
file.c
|
file.c
|
||||||
|
generated_${ARCH}.c
|
||||||
info.c
|
info.c
|
||||||
large_int.c
|
large_int.c
|
||||||
om.c
|
om.c
|
||||||
|
@ -25,10 +26,6 @@ list(APPEND SOURCE
|
||||||
time.c
|
time.c
|
||||||
testlist.c)
|
testlist.c)
|
||||||
|
|
||||||
if(ARCH STREQUAL "i386")
|
|
||||||
list(APPEND SOURCE generated.c)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
add_executable(ntdll_winetest ${SOURCE})
|
add_executable(ntdll_winetest ${SOURCE})
|
||||||
set_module_type(ntdll_winetest win32cui)
|
set_module_type(ntdll_winetest win32cui)
|
||||||
add_importlibs(ntdll_winetest user32 msvcrt kernel32 ntdll)
|
add_importlibs(ntdll_winetest user32 msvcrt kernel32 ntdll)
|
||||||
|
|
|
@ -10,7 +10,7 @@ unset(IDL_FLAGS)
|
||||||
|
|
||||||
list(APPEND SOURCE
|
list(APPEND SOURCE
|
||||||
cstub.c
|
cstub.c
|
||||||
generated.c
|
generated_${ARCH}.c
|
||||||
ndr_marshall.c
|
ndr_marshall.c
|
||||||
rpc.c
|
rpc.c
|
||||||
rpc_async.c
|
rpc_async.c
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include "windef.h"
|
#include "windef.h"
|
||||||
#include "winbase.h"
|
#include "winbase.h"
|
||||||
|
#include "ole2.h"
|
||||||
#include "rpc.h"
|
#include "rpc.h"
|
||||||
#include "rpcndr.h"
|
#include "rpcndr.h"
|
||||||
#include "rpcproxy.h"
|
#include "rpcproxy.h"
|
|
@ -7,6 +7,7 @@ list(APPEND SOURCE
|
||||||
autocomplete.c
|
autocomplete.c
|
||||||
brsfolder.c
|
brsfolder.c
|
||||||
ebrowser.c
|
ebrowser.c
|
||||||
|
generated_${ARCH}.c
|
||||||
progman_dde.c
|
progman_dde.c
|
||||||
recyclebin.c
|
recyclebin.c
|
||||||
shelldispatch.c
|
shelldispatch.c
|
||||||
|
@ -23,10 +24,6 @@ list(APPEND SOURCE
|
||||||
testlist.c
|
testlist.c
|
||||||
rsrc.rc)
|
rsrc.rc)
|
||||||
|
|
||||||
if(ARCH STREQUAL "i386")
|
|
||||||
list(APPEND SOURCE generated.c)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
add_executable(shell32_winetest ${SOURCE})
|
add_executable(shell32_winetest ${SOURCE})
|
||||||
target_link_libraries(shell32_winetest uuid)
|
target_link_libraries(shell32_winetest uuid)
|
||||||
set_module_type(shell32_winetest win32cui)
|
set_module_type(shell32_winetest win32cui)
|
||||||
|
|
|
@ -5,7 +5,7 @@ list(APPEND SOURCE
|
||||||
assoc.c
|
assoc.c
|
||||||
clist.c
|
clist.c
|
||||||
clsid.c
|
clsid.c
|
||||||
generated.c
|
generated_${ARCH}.c
|
||||||
istream.c
|
istream.c
|
||||||
ordinal.c
|
ordinal.c
|
||||||
path.c
|
path.c
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
add_definitions(-DUSE_WINE_TODOS)
|
add_definitions(-DUSE_WINE_TODOS)
|
||||||
|
|
||||||
list(APPEND SOURCE
|
list(APPEND SOURCE
|
||||||
|
generated_${ARCH}.c
|
||||||
misc.c
|
misc.c
|
||||||
protocol.c
|
protocol.c
|
||||||
sec_mgr.c
|
sec_mgr.c
|
||||||
|
@ -10,10 +11,6 @@ list(APPEND SOURCE
|
||||||
url.c
|
url.c
|
||||||
testlist.c)
|
testlist.c)
|
||||||
|
|
||||||
if(ARCH STREQUAL "i386")
|
|
||||||
list(APPEND SOURCE generated.c)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
add_executable(urlmon_winetest ${SOURCE})
|
add_executable(urlmon_winetest ${SOURCE})
|
||||||
target_link_libraries(urlmon_winetest uuid)
|
target_link_libraries(urlmon_winetest uuid)
|
||||||
set_module_type(urlmon_winetest win32cui)
|
set_module_type(urlmon_winetest win32cui)
|
||||||
|
|
|
@ -8,7 +8,8 @@ list(APPEND SOURCE
|
||||||
dce.c
|
dce.c
|
||||||
dde.c
|
dde.c
|
||||||
dialog.c
|
dialog.c
|
||||||
edit.c
|
edit.c
|
||||||
|
generated_${ARCH}.c
|
||||||
input.c
|
input.c
|
||||||
listbox.c
|
listbox.c
|
||||||
menu.c
|
menu.c
|
||||||
|
@ -25,10 +26,6 @@ list(APPEND SOURCE
|
||||||
wsprintf.c
|
wsprintf.c
|
||||||
testlist.c)
|
testlist.c)
|
||||||
|
|
||||||
if(ARCH STREQUAL "i386")
|
|
||||||
list(APPEND SOURCE generated.c)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
add_executable(user32_winetest ${SOURCE} resource.rc)
|
add_executable(user32_winetest ${SOURCE} resource.rc)
|
||||||
# some tests need to be run from an app compiled as GUI
|
# some tests need to be run from an app compiled as GUI
|
||||||
set_module_type(user32_winetest win32gui)
|
set_module_type(user32_winetest win32gui)
|
||||||
|
|
|
@ -12,7 +12,7 @@ extern void func_dce(void);
|
||||||
extern void func_dde(void);
|
extern void func_dde(void);
|
||||||
extern void func_dialog(void);
|
extern void func_dialog(void);
|
||||||
extern void func_edit(void);
|
extern void func_edit(void);
|
||||||
extern void func_generated(void);
|
//extern void func_generated(void);
|
||||||
extern void func_input(void);
|
extern void func_input(void);
|
||||||
extern void func_listbox(void);
|
extern void func_listbox(void);
|
||||||
extern void func_menu(void);
|
extern void func_menu(void);
|
||||||
|
@ -53,7 +53,7 @@ const struct test winetest_testlist[] =
|
||||||
{ "dde", func_dde },
|
{ "dde", func_dde },
|
||||||
{ "dialog", func_dialog },
|
{ "dialog", func_dialog },
|
||||||
{ "edit", func_edit },
|
{ "edit", func_edit },
|
||||||
{ "generated", func_generated },
|
//{ "generated", func_generated },
|
||||||
{ "input", func_input },
|
{ "input", func_input },
|
||||||
{ "listbox", func_listbox },
|
{ "listbox", func_listbox },
|
||||||
{ "menu", func_menu },
|
{ "menu", func_menu },
|
||||||
|
|
|
@ -3,16 +3,13 @@ add_definitions(-DUSE_WINE_TODOS)
|
||||||
|
|
||||||
list(APPEND SOURCE
|
list(APPEND SOURCE
|
||||||
ftp.c
|
ftp.c
|
||||||
|
generated_${ARCH}.c
|
||||||
http.c
|
http.c
|
||||||
internet.c
|
internet.c
|
||||||
url.c
|
url.c
|
||||||
urlcache.c
|
urlcache.c
|
||||||
testlist.c)
|
testlist.c)
|
||||||
|
|
||||||
if(ARCH STREQUAL "i386")
|
|
||||||
list(APPEND SOURCE generated.c)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
add_executable(wininet_winetest ${SOURCE})
|
add_executable(wininet_winetest ${SOURCE})
|
||||||
set_module_type(wininet_winetest win32cui)
|
set_module_type(wininet_winetest win32cui)
|
||||||
add_importlibs(wininet_winetest wininet crypt32 ws2_32 user32 advapi32 msvcrt kernel32)
|
add_importlibs(wininet_winetest wininet crypt32 ws2_32 user32 advapi32 msvcrt kernel32)
|
||||||
|
|
Loading…
Reference in a new issue