Changeset 9025

Timestamp:

Mar 11, 2012, 8:26:30 PM (12 years ago)

Author:

landauf

Message:

• added CTestCustom.cmake to add dependencies to $PATH when executing tests with ctest
• added ARGS parameter for "test" target in make to pass command line options to ctest (make test ARGS="—some-ctest-option")
• added unit tests for math functions in util library

Location:

code/branches/testing/test

Files:

• CMakeLists.txt (modified) (2 diffs)
• CTestCustom.cmake (added)
• util (added)
• util/CMakeLists.txt (added)
• util/MathTest.cc (added)

code/branches/testing/test/CMakeLists.txt

@@ -1 +1 @@
 ENABLE_TESTING()
 
-ADD_CUSTOM_TARGET(test COMMAND ${CMAKE_CTEST_COMMAND})
+ADD_CUSTOM_TARGET(test COMMAND ${CMAKE_CTEST_COMMAND} "$(ARGS)" COMMENT "Running tests")
 
 ADD_EXECUTABLE(sample_test EXCLUDE_FROM_ALL SampleTest.cc)
@@ -41 +41 @@
 
 ADD_TEST(gtest_sample ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/gtest_sample)
+
+#-----------------
+
+CONFIGURE_FILE("CTestCustom.cmake" "CTestCustom.cmake" @ONLY)
+
+INCLUDE_DIRECTORIES(
+  ../src/libraries
+  ../src/orxonox
+  ../src/modules
+  ${CMAKE_BINARY_DIR}/src
+  ${OGRE_INCLUDE_DIR}
+  ${POCO_INCLUDE_DIR}
+)
+
+ADD_SUBDIRECTORY(util)