Changeset 9022

Timestamp:

Feb 26, 2012, 4:22:54 PM (13 years ago)

Author:

landauf

Message:

sample tests with google test

Location:

code/branches/testing/test

Files:

• CMakeLists.txt (modified) (2 diffs)
• gtest_samples (added)
• gtest_samples/prime_tables.h (added)
• gtest_samples/sample1.cc (added)
• gtest_samples/sample1.h (added)
• gtest_samples/sample1_unittest.cc (added)
• gtest_samples/sample2.cc (added)
• gtest_samples/sample2.h (added)
• gtest_samples/sample2_unittest.cc (added)
• gtest_samples/sample3-inl.h (added)
• gtest_samples/sample3_unittest.cc (added)
• gtest_samples/sample4.cc (added)
• gtest_samples/sample4.h (added)
• gtest_samples/sample4_unittest.cc (added)

code/branches/testing/test/CMakeLists.txt

@@ -6 +6 @@
 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)
+ADD_TEST(sample_test ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/sample_test)
 
 
@@ -19 +17 @@
   ADD_DEPENDENCIES(test boost_test)
 
-  ADD_TEST(test2 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/boost_test)
+  ADD_TEST(boost_test_sample ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/boost_test)
 ENDIF()
+
+INCLUDE_DIRECTORIES(
+  ../src/external/gtest/include
+  ../src/external/gmock/include
+)
+
+ADD_EXECUTABLE(
+    gtest_sample
+    EXCLUDE_FROM_ALL
+    ${GTEST_MAIN}
+    gtest_samples/sample1.cc
+    gtest_samples/sample1_unittest.cc
+    gtest_samples/sample2.cc
+    gtest_samples/sample2_unittest.cc
+    gtest_samples/sample3_unittest.cc
+    gtest_samples/sample4.cc
+    gtest_samples/sample4_unittest.cc
+)
+TARGET_LINK_LIBRARIES(gtest_sample gtest_orxonox)
+ADD_DEPENDENCIES(test gtest_sample)
+
+ADD_TEST(gtest_sample ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/gtest_sample)