From 6443144a2bdf9ae492b76249c3c334567488bca6 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sat, 5 May 2012 10:09:38 +0000 Subject: [PATCH] [POWRPROF_WINETEST] - This test is not from Wine! Move to apitests. svn path=/trunk/; revision=56505 --- rostests/apitests/CMakeLists.txt | 13 +++++-------- rostests/apitests/powrprof/CMakeLists.txt | 13 +++++++++++++ .../pwrprof.c => apitests/powrprof/power.c} | 0 .../{winetests => apitests}/powrprof/testlist.c | 0 rostests/winetests/CMakeLists.txt | 1 - rostests/winetests/powrprof/CMakeLists.txt | 14 -------------- 6 files changed, 18 insertions(+), 23 deletions(-) create mode 100644 rostests/apitests/powrprof/CMakeLists.txt rename rostests/{winetests/powrprof/pwrprof.c => apitests/powrprof/power.c} (100%) rename rostests/{winetests => apitests}/powrprof/testlist.c (100%) delete mode 100644 rostests/winetests/powrprof/CMakeLists.txt diff --git a/rostests/apitests/CMakeLists.txt b/rostests/apitests/CMakeLists.txt index 8fd42d2073c..a1da26967d0 100644 --- a/rostests/apitests/CMakeLists.txt +++ b/rostests/apitests/CMakeLists.txt @@ -5,16 +5,13 @@ add_subdirectory(advapi32) #add_subdirectory(crt) add_subdirectory(dciman32) add_subdirectory(gdi32) +add_subdirectory(kernel32) add_subdirectory(msvcrt) add_subdirectory(ntdll) +add_subdirectory(powrprof) add_subdirectory(user32) -add_subdirectory(kernel32) - -if(NOT MSVC) -if(ARCH MATCHES i386) -add_subdirectory(w32kdll) -add_subdirectory(w32knapi) +if(NOT MSVC AND ARCH MATCHES i386) + add_subdirectory(w32kdll) + add_subdirectory(w32knapi) endif() -endif() - add_subdirectory(ws2_32) diff --git a/rostests/apitests/powrprof/CMakeLists.txt b/rostests/apitests/powrprof/CMakeLists.txt new file mode 100644 index 00000000000..c00d7781cec --- /dev/null +++ b/rostests/apitests/powrprof/CMakeLists.txt @@ -0,0 +1,13 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_UNICODE -DUNICODE) + +add_executable(powrprof_apitest power.c testlist.c) +set_module_type(powrprof_apitest win32cui) +add_importlibs(powrprof_apitest advapi32 powrprof msvcrt kernel32 ntdll) +add_cd_file(TARGET powrprof_apitest DESTINATION reactos/bin FOR all) + +if(NOT MSVC) + allow_warnings(powrprof_apitest) +endif() diff --git a/rostests/winetests/powrprof/pwrprof.c b/rostests/apitests/powrprof/power.c similarity index 100% rename from rostests/winetests/powrprof/pwrprof.c rename to rostests/apitests/powrprof/power.c diff --git a/rostests/winetests/powrprof/testlist.c b/rostests/apitests/powrprof/testlist.c similarity index 100% rename from rostests/winetests/powrprof/testlist.c rename to rostests/apitests/powrprof/testlist.c diff --git a/rostests/winetests/CMakeLists.txt b/rostests/winetests/CMakeLists.txt index 7468a5ee6dc..7f377fbc44e 100644 --- a/rostests/winetests/CMakeLists.txt +++ b/rostests/winetests/CMakeLists.txt @@ -69,7 +69,6 @@ if(NOT MSVC) endif() add_subdirectory(opengl32) add_subdirectory(pdh) -add_subdirectory(powrprof) add_subdirectory(psapi) add_subdirectory(qmgr) add_subdirectory(quartz) diff --git a/rostests/winetests/powrprof/CMakeLists.txt b/rostests/winetests/powrprof/CMakeLists.txt deleted file mode 100644 index 3ae788bee91..00000000000 --- a/rostests/winetests/powrprof/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP - -D_UNICODE -DUNICODE) - -add_executable(powrprof_winetest pwrprof.c testlist.c) -set_module_type(powrprof_winetest win32cui) -add_importlibs(powrprof_winetest advapi32 powrprof msvcrt kernel32 ntdll) -add_cd_file(TARGET powrprof_winetest DESTINATION reactos/bin FOR all) - -if(NOT MSVC) - allow_warnings(powrprof_winetest) -endif() -- 2.17.1