WIP

project-tsurugi · Jan 27, 2025 · 25cd448 · 25cd448
1 parent 5873690
commit 25cd448
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/cmake/Tests.cmake b/cmake/Tests.cmake
@@ -112,8 +112,7 @@ function(register_tests)
                     set_property(TEST ${test_name} PROPERTY LABELS ${TESTS_TEST_LABELS})
                     if (${TESTS_TEST_LABELS} MATCHES "DOUBLE")
                         #set_property(TEST ${test_name} PROPERTY ENVIRONMENT LD_PRELOAD=${CMAKE_BINARY_DIR}/limestone-double.so)
-                        target_link_libraries(${test_name} PRIVATE ${CMAKE_BINARY_DIR}/fake-limestone.so)
-                        set_property(TEST ${test_name} PROPERTY ENVIRONMENT LD_PRELOAD=${CMAKE_BINARY_DIR}/fake-limestone.so ASAN_OPTIONS=verify_asan_link_order=0)
+                        set_property(TEST ${test_name} PROPERTY ENVIRONMENT LD_PRELOAD=$<TARGET_FILE:limestone-double> ASAN_OPTIONS=verify_asan_link_order=0)
                     endif()
                 endif()
             else()

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -139,6 +139,14 @@ else ()
   endif()
 endif()
 
+file (GLOB LIMESTONE_DOUBLE_SOURCES "test_double/doubles/limestone_double.cpp")
+add_library(limestone-double ${LIMESTONE_DOUBLE_SOURCES})
+target_link_libraries(limestone-double PRIVATE limestone)
+target_include_directories(limestone-double
+        PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
+        PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
+        )
+
 register_tests(
         TARGET shirakami
         DEPENDS
@@ -193,6 +201,7 @@ else ()
               PRIVATE ${tbb_prefix}tbbmalloc_proxy
               PRIVATE yakushima
               PRIVATE atomic
+              PRIVATE limestone-double
             SOURCES ${TEST_WITH_DOUBLE_SOURCES}
             TEST_LABELS "DOUBLE"
     )

diff --git a/test/test_double/blob_send_mock_test.cpp b/test/test_double/blob_send_mock_test.cpp
@@ -38,6 +38,8 @@ class blob_send_mock_test : public ::testing::Test {
 TEST_F(blob_send_mock_test, insert_update_blob) {
     std::vector<std::pair<std::string, std::vector<limestone::api::blob_id_type>>> added;
     // prepare
+
+    // test double
     test_double::log_channel_add_entry1::hook_func = [&added] (
             [[maybe_unused]] test_double::log_channel_add_entry1::orig_type orig_func,
             [[maybe_unused]] limestone::api::log_channel* this_ptr,
@@ -69,7 +71,7 @@ TEST_F(blob_send_mock_test, insert_update_blob) {
     };
 
     Storage st{};
-    create_storage("", st);
+    create_storage("", st); // N.B. create_storage may call add_entry
     Token s{};
     ASSERT_EQ(Status::OK, enter(s));
     added.clear();

diff --git a/test/test_double/doubles/limestone_double.cpp b/test/test_double/doubles/limestone_double.cpp
@@ -2,7 +2,7 @@
 #include <dlfcn.h>
 
 #include "glog/logging.h"
-#include "shirakami/logging.h"  // span_printer for test-main
+//#include "shirakami/logging.h"  // span_printer for test-main
 
 #include "limestone_double.h"