[ros-diffs] [tfaber] 53562: [KMTESTS] - Add ObReference to build. Was missing for some reason - Use the new CMake macros in preparation for PCH - Use kmtest_.exe as a file name for testcd to please rosautotest...

Author: tfaber
Date: Sat Sep  3 19:42:02 2011
New Revision: 53562

URL: http://svn.reactos.org/svn/reactos?rev=53562&view=rev
Log:
[KMTESTS]
- Add ObReference to build. Was missing for some reason
- Use the new CMake macros in preparation for PCH
- Use kmtest_.exe as a file name for testcd to please rosautotest. Perhaps there's a
better solution later

Modified:
    branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt
    branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild
    branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c

Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/C…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] Sat Sep  3 19:42:02
2011
@@ -6,6 +6,11 @@
 #
 add_subdirectory(example)
 add_subdirectory(ntos_io)
+
+list(APPEND COMMON_SOURCE
+    rtl/RtlAvlTree.c
+    rtl/RtlMemory.c
+    rtl/RtlSplayTree.c)
 
 #
 # kmtest_drv.sys driver
@@ -37,10 +42,9 @@
     ntos_ke/KeIrql.c
     ntos_ke/KeProcessor.c
     ntos_ke/KeSpinLock.c
+    ntos_ob/ObReference.c
     ntos_ob/ObType.c
-    rtl/RtlAvlTree.c
-    rtl/RtlMemory.c
-    rtl/RtlSplayTree.c
+    ${COMMON_SOURCE}
 
     kmtest_drv/kmtest_drv.rc)
 
@@ -49,15 +53,16 @@
 set_module_type(kmtest_drv kernelmodedriver)
 target_link_libraries(kmtest_drv kmtest_printf ${PSEH_LIB})
 add_importlibs(kmtest_drv ntoskrnl hal)
-set_property(TARGET kmtest_drv PROPERTY COMPILE_DEFINITIONS KMT_KERNEL_MODE
NTDDI_VERSION=NTDDI_WS03SP1)
+add_target_compile_definitions(kmtest_drv KMT_KERNEL_MODE NTDDI_VERSION=NTDDI_WS03SP1)
+#add_pch(kmtest_drv include/kmt_test.h)
 
 add_cd_file(TARGET kmtest_drv DESTINATION reactos/bin FOR all)
 
 add_library(kmtest_printf
     kmtest_drv/printf_stubs.c
     ${REACTOS_SOURCE_DIR}/lib/sdk/crt/printf/streamout.c)
-set_property(TARGET kmtest_printf PROPERTY COMPILE_DEFINITIONS _LIBCNT_ _USER32_WSPRINTF
wctomb=KmtWcToMb)
-set_property(TARGET kmtest_printf PROPERTY INCLUDE_DIRECTORIES
${REACTOS_SOURCE_DIR}/lib/sdk/crt/include)
+add_target_compile_definitions(kmtest_printf _LIBCNT_ _USER32_WSPRINTF wctomb=KmtWcToMb)
+add_target_include_directories(kmtest_printf ${REACTOS_SOURCE_DIR}/lib/sdk/crt/include)
 
 #
 # kmtest.exe loader application
@@ -72,9 +77,7 @@
 
     example/Example_user.c
     ntos_io/IoDeviceObject_user.c
-    rtl/RtlAvlTree.c
-    rtl/RtlMemory.c
-    rtl/RtlSplayTree.c
+    ${COMMON_SOURCE}
 
     kmtest/kmtest.rc)
 
@@ -82,9 +85,11 @@
 set_module_type(kmtest win32cui)
 target_link_libraries(kmtest ${PSEH_LIB})
 add_importlibs(kmtest advapi32 msvcrt kernel32 ntdll)
-set_property(TARGET kmtest PROPERTY COMPILE_DEFINITIONS KMT_USER_MODE)
+add_target_compile_definitions(kmtest KMT_USER_MODE)
+#add_pch(kmtest include/kmt_test.h)
 
-add_cd_file(TARGET kmtest DESTINATION reactos/bin FOR all)
+add_cd_file(TARGET kmtest DESTINATION reactos/bin FOR bootcd livecd)
+add_cd_file(TARGET kmtest DESTINATION reactos/bin NAME_ON_CD kmtest_.exe FOR regtest)
 
 #
 # Group targets

Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] Sat Sep  3
19:42:02 2011
@@ -44,6 +44,7 @@
 		<file>KeSpinLock.c</file>
 	</directory>
 	<directory name="ntos_ob">
+		<file>ObReference.c</file>
 		<file>ObType.c</file>
 	</directory>
 	<directory name="rtl">

Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k…
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c [iso-8859-1] Sat Sep  3
19:42:02 2011
@@ -30,6 +30,7 @@
 KMT_TESTFUNC Test_KeIrql;
 KMT_TESTFUNC Test_KeProcessor;
 KMT_TESTFUNC Test_KernelType;
+KMT_TESTFUNC Test_ObReference;
 KMT_TESTFUNC Test_ObType;
 KMT_TESTFUNC Test_ObTypeClean;
 KMT_TESTFUNC Test_ObTypeNoClean;
@@ -62,6 +63,7 @@
     { "KeIrql",                             Test_KeIrql },
     { "KeProcessor",                        Test_KeProcessor },
     { "-KernelType",                        Test_KernelType },
+    { "ObReference",                        Test_ObReference },
     { "ObType",                             Test_ObType },
     { "-ObTypeClean",                       Test_ObTypeClean },
     { "-ObTypeNoClean",                     Test_ObTypeNoClean },