Changeset 9020 for code

Timestamp:

Feb 25, 2012, 8:13:19 PM (13 years ago)

Author:

landauf

Message:

sample tests with boost test

Location:

code/branches/testing

Files:

• cmake/LibraryConfig.cmake (modified) (1 diff)
• test/BoostTest.cc (added)
• test/CMakeLists.txt (modified) (1 diff)

code/branches/testing/cmake/LibraryConfig.cmake

@@ -162 +162 @@
                               1.44 1.44.0 1.45 1.45.0 1.46 1.46.0 1.46.1)
 IF(NOT TARDIS)
+  # optional
+  FIND_PACKAGE(Boost 1.40 COMPONENTS unit_test_framework)
+  # required
   FIND_PACKAGE(Boost 1.40 REQUIRED thread filesystem system date_time)
 ENDIF()

code/branches/testing/test/CMakeLists.txt

@@ -1 +1 @@
 ENABLE_TESTING()
 
+ADD_CUSTOM_TARGET(test COMMAND ${CMAKE_CTEST_COMMAND})
+
 ADD_EXECUTABLE(sample_test EXCLUDE_FROM_ALL SampleTest.cc)
-ADD_TEST(test1 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/sample_test)
-ADD_TEST(test2 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/sample_test)
-ADD_TEST(test3 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/sample_test)
+ADD_DEPENDENCIES(test sample_test)
 
-ADD_CUSTOM_TARGET(test COMMAND ${CMAKE_CTEST_COMMAND} DEPENDS sample_test)
-#ADD_DEPENDENCIES(test sample_test)
+ADD_TEST(test1a ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/sample_test)
+ADD_TEST(test1b ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/sample_test)
+ADD_TEST(test1c ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/sample_test)
+
+
+IF(Boost_UNIT_TEST_FRAMEWORK_FOUND)
+  INCLUDE_DIRECTORIES(
+    ${Boost_INCLUDE_DIRS}
+  )
+  ADD_EXECUTABLE(boost_test EXCLUDE_FROM_ALL BoostTest.cc)
+  TARGET_LINK_LIBRARIES(boost_test ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+  ADD_DEPENDENCIES(test boost_test)
+
+  ADD_TEST(test2 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/boost_test)
+ENDIF()