Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ROSTESTS]

Browse source 
disable some tests on x64, since they don't build. Disable some exports from dllexport_test on non-x86 build, since decorations are x86 specific.

svn path=/trunk/; revision=63453
This commit is contained in:
Timo Kreuzer 2014-05-25 20:21:02 +00:00
parent c51c0ec1b4
commit 0339d4e1a5
6 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rostests/apitests/CMakeLists.txt
View file

@ -9,7 +9,9 @@ add_subdirectory(com)
add_subdirectory(crt) add_subdirectory(crt)
add_subdirectory(dciman32) add_subdirectory(dciman32)
add_subdirectory(gdi32) add_subdirectory(gdi32)
if(NOT ARCH STREQUAL "amd64")
add_subdirectory(kernel32) add_subdirectory(kernel32)
endif()
add_subdirectory(msvcrt) add_subdirectory(msvcrt)
add_subdirectory(ntdll) add_subdirectory(ntdll)
add_subdirectory(powrprof) add_subdirectory(powrprof)

4
rostests/apitests/crt/CMakeLists.txt
View file

@ -1,4 +1,6 @@
include(ntdll_crt_apitest.cmake) include(ntdll_crt_apitest.cmake)
include(crtdll_crt_apitest.cmake)
include(msvcrt_crt_apitest.cmake) include(msvcrt_crt_apitest.cmake)
if(NOT ARCH STREQUAL "amd64")
include(crtdll_crt_apitest.cmake)
endif()

10
rostests/tests/dllexport/dllexport_test.c
View file

@ -58,27 +58,33 @@ int main(int argc, char *argv[])
ok_int(StdcallFunc1(str), 0x11); ok_int(StdcallFunc1(str), 0x11);
ok_int(StdcallFunc2(str), 0x11); ok_int(StdcallFunc2(str), 0x11);
ok_int(StdcallFunc3(str), 0x10011); ok_int(StdcallFunc3(str), 0x10011);
#ifdef _M_IX86
ok_int(StdcallFunc4(str), 0x21); ok_int(StdcallFunc4(str), 0x21);
#endif
ok_int(StdcallFunc5(str), 0x10021); ok_int(StdcallFunc5(str), 0x10021);
#ifdef _M_IX86
ok_int(DecoratedStdcallFunc1(str), 0x21); ok_int(DecoratedStdcallFunc1(str), 0x21);
ok_int(DecoratedStdcallFunc2(str), 0x11); ok_int(DecoratedStdcallFunc2(str), 0x11);
//ok_int(DecoratedStdcallFunc3(str), 11); //ok_int(DecoratedStdcallFunc3(str), 11);
ok_int(DecoratedStdcallFunc4(str), 0x21); ok_int(DecoratedStdcallFunc4(str), 0x21);
ok_int(DecoratedStdcallFunc5(str), 0x10021); ok_int(DecoratedStdcallFunc5(str), 0x10021);
#endif
ok_int(FastcallFunc0(), 0x30); ok_int(FastcallFunc0(), 0x30);
ok_int(FastcallFunc1(str), 0x31); ok_int(FastcallFunc1(str), 0x31);
ok_int(FastcallFunc2(str), 0x31); ok_int(FastcallFunc2(str), 0x31);
ok_int(FastcallFunc3(str), 0x10031); ok_int(FastcallFunc3(str), 0x10031);
#ifdef _M_IX86
ok_int(FastcallFunc4(str), 0x42); ok_int(FastcallFunc4(str), 0x42);
ok_int(FastcallFunc5(str), 0x10041); ok_int(FastcallFunc5(str), 0x10041);
#endif
#ifdef _M_IX86
ok_int(DecoratedFastcallFunc1(str), 0x42); ok_int(DecoratedFastcallFunc1(str), 0x42);
ok_int(DecoratedFastcallFunc2(str), 0x31); ok_int(DecoratedFastcallFunc2(str), 0x31);
//ok_int(DecoratedFastcallFunc3(str), 11); //ok_int(DecoratedFastcallFunc3(str), 11);
ok_int(DecoratedFastcallFunc4(str), 0x42); ok_int(DecoratedFastcallFunc4(str), 0x42);
ok_int(DecoratedFastcallFunc5(str), 0x10041); ok_int(DecoratedFastcallFunc5(str), 0x10041);
#endif
ok_int(DataItem1, 0x51); ok_int(DataItem1, 0x51);
ok_int(DataItem2, 0x51); ok_int(DataItem2, 0x51);
ok_int(DataItem3, 0x10051); ok_int(DataItem3, 0x10051);

26
rostests/tests/dllexport/dllexport_test_dll1.spec
View file

@ -13,35 +13,35 @@
# Decorated export of a stdcall function # Decorated export of a stdcall function
@ stdcall _StdcallFunc1@4(ptr) @ stdcall _StdcallFunc1@4(ptr)
@ stdcall _DecoratedStdcallFunc1@4(ptr) @ stdcall -arch=i386 _DecoratedStdcallFunc1@4(ptr)
# Redirected stdcall function # Redirected stdcall function
@ stdcall StdcallFunc2(ptr) StdcallFunc1 @ stdcall StdcallFunc2(ptr) StdcallFunc1
@ stdcall StdcallFunc3(ptr) dllexport_test_dll2.StdcallFunc1 @ stdcall StdcallFunc3(ptr) dllexport_test_dll2.StdcallFunc1
@ stdcall StdcallFunc4(ptr) _DecoratedStdcallFunc1@4 @ stdcall -arch=i386 StdcallFunc4(ptr) _DecoratedStdcallFunc1@4
@ stdcall StdcallFunc5(ptr) dllexport_test_dll2._DecoratedStdcallFunc1@4 @ stdcall StdcallFunc5(ptr) dllexport_test_dll2._DecoratedStdcallFunc1@4
@ stdcall _DecoratedStdcallFunc2@4(ptr) StdcallFunc1 @ stdcall -arch=i386 _DecoratedStdcallFunc2@4(ptr) StdcallFunc1
; @ stdcall _DecoratedStdcallFunc3@4(ptr) dllexport_test_dll2.StdcallFunc1 # This doesn't work with MSVC! ; @ stdcall -arch=i386 _DecoratedStdcallFunc3@4(ptr) dllexport_test_dll2.StdcallFunc1 # This doesn't work with MSVC!
@ stdcall _DecoratedStdcallFunc4@4(ptr) _DecoratedStdcallFunc1@4 @ stdcall -arch=i386 _DecoratedStdcallFunc4@4(ptr) _DecoratedStdcallFunc1@4
@ stdcall _DecoratedStdcallFunc5@4(ptr) dllexport_test_dll2._DecoratedStdcallFunc1@4 @ stdcall -arch=i386 _DecoratedStdcallFunc5@4(ptr) dllexport_test_dll2._DecoratedStdcallFunc1@4
# Normal export of a fastcall function # Normal export of a fastcall function
@ fastcall FastcallFunc0() @ fastcall FastcallFunc0()
@ fastcall FastcallFunc1(ptr) @ fastcall FastcallFunc1(ptr)
# Decorated export of a fastcall function # Decorated export of a fastcall function
@ fastcall @DecoratedFastcallFunc1@4(ptr) @ fastcall -arch=i386 @DecoratedFastcallFunc1@4(ptr)
# Redirected fastcall function # Redirected fastcall function
@ fastcall FastcallFunc2(ptr) FastcallFunc1 @ fastcall FastcallFunc2(ptr) FastcallFunc1
@ fastcall FastcallFunc3(ptr) dllexport_test_dll2.FastcallFunc1 @ fastcall FastcallFunc3(ptr) dllexport_test_dll2.FastcallFunc1
@ fastcall FastcallFunc4(ptr) @DecoratedFastcallFunc1@4 @ fastcall -arch=i386 FastcallFunc4(ptr) @DecoratedFastcallFunc1@4
@ fastcall FastcallFunc5(ptr) dllexport_test_dll2.@DecoratedFastcallFunc1@4 @ fastcall -arch=i386 FastcallFunc5(ptr) dllexport_test_dll2.@DecoratedFastcallFunc1@4
@ fastcall @DecoratedFastcallFunc2@4(ptr) FastcallFunc1 @ fastcall -arch=i386 @DecoratedFastcallFunc2@4(ptr) FastcallFunc1
; @ fastcall @DecoratedFastcallFunc3@4(ptr) dllexport_test_dll2.FastcallFunc1 # This doesn't work with MSVC! ; @ fastcall -arch=i386 @DecoratedFastcallFunc3@4(ptr) dllexport_test_dll2.FastcallFunc1 # This doesn't work with MSVC!
@ fastcall @DecoratedFastcallFunc4@4(ptr) @DecoratedFastcallFunc1@4 @ fastcall -arch=i386 @DecoratedFastcallFunc4@4(ptr) @DecoratedFastcallFunc1@4
@ fastcall @DecoratedFastcallFunc5@4(ptr) dllexport_test_dll2.@DecoratedFastcallFunc1@4 @ fastcall -arch=i386 @DecoratedFastcallFunc5@4(ptr) dllexport_test_dll2.@DecoratedFastcallFunc1@4
# Normal export of data # Normal export of data
@ extern DataItem1 @ extern DataItem1

2
rostests/tests/dllexport/dllexport_test_dll2.spec
View file

@ -15,7 +15,7 @@
@ fastcall FastcallFunc1(ptr) @ fastcall FastcallFunc1(ptr)
# Decorated export of a fastcall function # Decorated export of a fastcall function
@ fastcall @DecoratedFastcallFunc1@4(ptr) @ fastcall -arch=i386 @DecoratedFastcallFunc1@4(ptr)
# Normal export of data # Normal export of data
@ extern DataItem1 @ extern DataItem1

2
rostests/winetests/CMakeLists.txt
View file

@ -77,7 +77,9 @@ add_subdirectory(rasapi32)
add_subdirectory(regedit) add_subdirectory(regedit)
add_subdirectory(riched20) add_subdirectory(riched20)
add_subdirectory(riched32) add_subdirectory(riched32)
if(NOT ARCH STREQUAL "amd64")
add_subdirectory(rpcrt4) add_subdirectory(rpcrt4)
endif()
add_subdirectory(rsaenh) add_subdirectory(rsaenh)
add_subdirectory(schannel) add_subdirectory(schannel)
add_subdirectory(scrrun) add_subdirectory(scrrun)