added test_shell to cmake build and removed only rsExample #869

rsExample seems deprecated
Tokutek · Jan 6, 2014 · 910d119 · 910d119
1 parent 37ed55d
commit 910d119
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/mongo/CMakeLists.txt b/src/mongo/CMakeLists.txt
@@ -302,6 +302,14 @@ install_executables(tokumx_server
   mongod
   )
 
+if (BUILD_TESTING)
+  add_test(mongo/shell/test_shell
+    "${PYTHON2}"
+      "${CMAKE_CURRENT_SOURCE_DIR}/../../buildscripts/test_shell.py"
+      "$<TARGET_FILE:mongo>"
+    )
+endif ()
+
 set(client_sources
   base/configuration_variable_manager.cpp
   base/global_initializer.cpp

diff --git a/src/mongo/client/examples/CMakeLists.txt b/src/mongo/client/examples/CMakeLists.txt
@@ -34,7 +34,8 @@ foreach (bin ${normal_bins} ${abnormal_bins})
   target_link_libraries(${bin}
     mongoclient
     )
-  if (BUILD_TESTING AND NOT ${bin} MATCHES Example)
+  # rsExample seems to be dead, at least not maintained upstream
+  if (BUILD_TESTING AND NOT ${bin} STREQUAL rsExample)
     add_test(mongo/client/${bin} ${bin})
   endif ()
 endforeach ()