added remaining tests to cmake build system #869

Tokutek · Jan 6, 2014 · 37ed55d · 37ed55d
1 parent 9760cb7
commit 37ed55d
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 12 deletions.
diff --git a/src/mongo/bson/CMakeLists.txt b/src/mongo/bson/CMakeLists.txt
@@ -41,10 +41,6 @@ if (BUILD_TESTING)
       )
     add_test(mongo/bson/${test} ${test})
   endforeach ()
-
-  # TODO: index_set_test
-  # TODO: descriptive_stats_test
-  # TODO: sock_test
 endif ()
 
 install(FILES bsondemo/bsondemo.cpp

diff --git a/src/mongo/client/CMakeLists.txt b/src/mongo/client/CMakeLists.txt
@@ -71,3 +71,34 @@ target_link_libraries(allclient LINK_PRIVATE
   )
 
 add_subdirectory(examples)
+
+if (BUILD_TESTING)
+  foreach (test
+      dbclient_rs_test
+      scoped_db_conn_test
+      )
+    add_executable(${test} ${test})
+    add_dependencies(${test} generate_error_codes generate_action_types)
+    target_link_libraries(${test}
+      unittest_main
+      foundation
+      )
+    target_link_whole_libraries(${test}
+      coredb
+      coreserver
+      coreshard
+      dbcmdline
+      mongocommon
+      mongodandmongos
+      mongoscore
+      base
+      )
+    target_link_libraries(${test}
+      ${TokuKV_LIBRARIES}
+      )
+    add_test(mongo/client/${test} ${test})
+  endforeach ()
+  target_link_libraries(dbclient_rs_test
+    mocklib
+    )
+endif ()
diff --git a/src/mongo/client/examples/CMakeLists.txt b/src/mongo/client/examples/CMakeLists.txt
@@ -34,7 +34,7 @@ foreach (bin ${normal_bins} ${abnormal_bins})
   target_link_libraries(${bin}
     mongoclient
     )
-  if (BUILD_TESTING)
+  if (BUILD_TESTING AND NOT ${bin} MATCHES Example)
     add_test(mongo/client/${bin} ${bin})
   endif ()
 endforeach ()

diff --git a/src/mongo/db/CMakeLists.txt b/src/mongo/db/CMakeLists.txt
@@ -10,7 +10,6 @@ add_library(server_parameters STATIC
   )
 add_dependencies(server_parameters generate_error_codes generate_action_types)
 target_link_libraries(server_parameters foundation bson)
-# TODO: server_parameters_test
 
 add_library(index_set STATIC
   index_set
@@ -235,6 +234,8 @@ if (BUILD_TESTING)
   foreach (test
       cmdline_test
       field_ref_test
+      index_set_test
+      server_parameters_test
       )
     add_executable(${test} ${test})
     add_dependencies(${test} generate_error_codes generate_action_types)
@@ -249,4 +250,6 @@ if (BUILD_TESTING)
 
   target_link_libraries(cmdline_test dbcmdline)
   target_link_libraries(field_ref_test db_common)
+  target_link_libraries(index_set_test bson index_set)
+  target_link_libraries(server_parameters_test server_parameters)
 endif ()
diff --git a/src/mongo/s/CMakeLists.txt b/src/mongo/s/CMakeLists.txt
@@ -118,9 +118,12 @@ if (BUILD_TESTING)
 
   # no crutch
   foreach (test
+      balancer_policy_tests
       chunk_diff_test
       collection_manager_test
       metadata_loader_test
+      shard_conn_test
+      shard_test
       )
     add_executable(${test} ${test})
     add_dependencies(${test} generate_error_codes generate_action_types)
@@ -135,6 +138,24 @@ if (BUILD_TESTING)
       )
     add_test(mongo/s/${test} ${test})
   endforeach ()
+  foreach (test
+      balancer_policy_tests
+      shard_conn_test
+      shard_test
+      )
+    target_link_whole_libraries(${test}
+      mongoscore
+      coreshard
+      coreserver
+      coredb
+      dbcmdline
+      mongodandmongos
+      )
+    target_link_libraries(${test}
+      ${TokuKV_LIBRARIES}
+      )
+  endforeach ()
   target_link_libraries(collection_manager_test mocklib)
   target_link_libraries(metadata_loader_test mocklib)
+  target_link_libraries(shard_conn_test mocklib)
 endif ()
diff --git a/src/mongo/util/CMakeLists.txt b/src/mongo/util/CMakeLists.txt
@@ -112,16 +112,18 @@ target_link_libraries(fail_point LINK_PRIVATE
   bson
   )
 
-# TODO: ntservice, ntservice_test
+# WONTFIX: ntservice, ntservice_test
 
 if (BUILD_TESTING)
   foreach (test_source
-      text_test
-      stringutils_test
       concurrency/partitioned_counter_test
+      descriptive_stats_test
+      fail_point_test
       processinfo_test
-      string_map_test
       safe_num_test
+      string_map_test
+      stringutils_test
+      text_test
       )
     string(REGEX REPLACE "^.*/" "" test ${test_source})
     add_executable(${test} ${test_source})
@@ -135,10 +137,25 @@ if (BUILD_TESTING)
     add_test(mongo/util/${test} ${test})
   endforeach ()
 
-  target_link_libraries(stringutils_test stringutils)
+  target_link_libraries(descriptive_stats_test bson)
+  target_link_libraries(fail_point_test fail_point)
   target_link_libraries(processinfo_test processinfo)
-  target_link_libraries(string_map_test bson)
   target_link_libraries(safe_num_test bson)
+  target_link_libraries(string_map_test bson)
+  target_link_libraries(stringutils_test stringutils)
+
+  # no crutch
+  add_executable(sock_test net/sock_test)
+  add_dependencies(sock_test generate_error_codes generate_action_types)
+  target_link_libraries(sock_test
+    unittest_main
+    foundation
+    )
+  target_link_whole_libraries(sock_test
+    mongocommon
+    base
+    )
+  add_test(mongo/util/sock_test sock_test)
 
   add_executable(md5_test md5_test md5main)
   add_dependencies(md5_test generate_error_codes generate_action_types)