Merge branch 'alice' into mad-hatter

* alice:
  MB-42358: Pass path to memory-tracking test plugin on command-line

Change-Id: I0781426f9b3e4f3763d5bdb9ec5e5802ebedf7fa

Author: daverigby

tests/memory_tracking_test/CMakeLists.txt

@@ -1,23 +1,17 @@
 if (NOT MEMORY_ALLOCATOR STREQUAL "system")
-  # Need to ensure that the directory containing
-  # memcached_memory_tracking_test is added to the RPATH so we can
-  # successfully dlopen() the plugin.
-  link_directories(${Memcached_BINARY_DIR})
-
   add_executable(memcached_memory_tracking_test
     $<TARGET_OBJECTS:memory_tracking>
     memory_tracking_test.cc)
   target_link_libraries(memcached_memory_tracking_test
   memcached_logger
   platform gtest
   ${MALLOC_LIBRARIES})
+  add_dependencies(memcached_memory_tracking_test memcached_memory_tracking_plugin)
 
   add_test(NAME memcached-memory-tracking
-           WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-           COMMAND memcached_memory_tracking_test)
+           COMMAND memcached_memory_tracking_test $<TARGET_FILE:memcached_memory_tracking_plugin>)
 
   add_library(memcached_memory_tracking_plugin MODULE
               memory_tracking_plugin.cc)
   target_link_libraries(memcached_memory_tracking_plugin platform)
-  set_target_properties(memcached_memory_tracking_plugin PROPERTIES PREFIX "")
 endif (NOT MEMORY_ALLOCATOR STREQUAL "system")

tests/memory_tracking_test/memory_tracking_test.cc

@@ -33,6 +33,9 @@
 // via DCE.
 char* p;
 
+/// Path to plugin to be loaded via dlopen.
+const char* pluginPath = nullptr;
+
 class MemoryTrackerTest : public ::testing::Test {
 public:
     // callback function for when memory is allocated.
@@ -154,7 +157,7 @@ void MemoryTrackerTest::AccountingTestThread(void* arg) {
 
     // Test memory allocations performed from another shared library loaded
     // at runtime.
-    auto plugin = cb::io::loadLibrary("memcached_memory_tracking_plugin");
+    auto plugin = cb::io::loadLibrary(pluginPath);
 
     // dlopen()ing a plugin can allocate memory. Reset alloc_size.
     alloc_size = 0;
@@ -236,6 +239,13 @@ TEST_F(MemoryTrackerTest, mallocUsableSize) {
 int main(int argc, char** argv) {
     ::testing::InitGoogleTest(&argc, argv);
 
+    if (argc != 2) {
+        std::cerr << "Usage: <memory_tracking_test> "
+                     "<path_to_memory_tracking_plugin>\n";
+        return 1;
+    }
+    pluginPath = argv[1];
+
     AllocHooks::initialize();
 
     return RUN_ALL_TESTS();