BlazingMQ Storage Tool

.github/workflows/build.yaml

@@ -32,6 +32,7 @@ jobs:
             bison \
             libfl-dev \
             libbenchmark-dev \
+            libgmock-dev \
             libz-dev
       - name: Create dependency fetcher working directory
         run: mkdir -p deps
@@ -163,6 +164,7 @@ jobs:
             bison \
             libfl-dev \
             libbenchmark-dev \
+            libgmock-dev \
             libz-dev \
             autoconf \
             libtool

CMakeLists.txt

@@ -104,15 +104,16 @@ endif()
 
 if (NOT DEFINED INSTALL_TARGETS)
   # If no specic install targets has been set, then enable them all
-  set(BMQ_TARGET_BMQBRKR_NEEDED    YES)
-  set(BMQ_TARGET_BMQBRKRCFG_NEEDED YES)
-  set(BMQ_TARGET_BMQTOOL_NEEDED    YES)
-  set(BMQ_TARGET_MWC_NEEDED        YES)
-  set(BMQ_TARGET_BMQ_NEEDED        YES)
-  set(BMQ_TARGET_MQB_NEEDED        YES)
-  set(BMQ_TARGET_E_BMQBRKR_NEEDED  YES)
-  set(BMQ_TARGET_TUTORIAL_NEEDED   YES)
-  set(BMQ_TARGET_PROMETHEUS_NEEDED NO)
+  set(BMQ_TARGET_BMQBRKR_NEEDED        YES)
+  set(BMQ_TARGET_BMQBRKRCFG_NEEDED     YES)
+  set(BMQ_TARGET_BMQTOOL_NEEDED        YES)
+  set(BMQ_TARGET_BMQSTORAGETOOL_NEEDED YES)
+  set(BMQ_TARGET_MWC_NEEDED            YES)
+  set(BMQ_TARGET_BMQ_NEEDED            YES)
+  set(BMQ_TARGET_MQB_NEEDED            YES)
+  set(BMQ_TARGET_E_BMQBRKR_NEEDED      YES)
+  set(BMQ_TARGET_TUTORIAL_NEEDED       YES)
+  set(BMQ_TARGET_PROMETHEUS_NEEDED     NO)
 else()
   bbproject_check_install_target("bmqbrkr"         installBMQBRKR)
   bbproject_check_install_target("BMQBRKR_NIGHTLY" installNightly)
@@ -126,21 +127,23 @@ else()
 
   # Disable all by default, and then we'll enable selectively based on the
   # content of INSTALL_TARGETS
-  set(BMQ_TARGET_BMQBRKR_NEEDED    NO)
-  set(BMQ_TARGET_BMQBRKRCFG_NEEDED NO)
-  set(BMQ_TARGET_BMQTOOL_NEEDED    NO)
-  set(BMQ_TARGET_MWC_NEEDED        NO)
-  set(BMQ_TARGET_BMQ_NEEDED        NO)
-  set(BMQ_TARGET_MQB_NEEDED        NO)
-  set(BMQ_TARGET_TUTORIAL_NEEDED   NO)
-  set(BMQ_TARGET_PROMETHEUS_NEEDED NO)
-
-  bbproject_check_install_target("mwc"        installMWC)
-  bbproject_check_install_target("bmq"        installBMQ)
-  bbproject_check_install_target("mqb"        installMQB)
-  bbproject_check_install_target("bmqbrkrcfg" installBMQBRKRCFG)
-  bbproject_check_install_target("bmqtool"    installBMQTOOL)
-  bbproject_check_install_target("prometheus" installPROMETHEUS)
+  set(BMQ_TARGET_BMQBRKR_NEEDED        NO)
+  set(BMQ_TARGET_BMQBRKRCFG_NEEDED     NO)
+  set(BMQ_TARGET_BMQTOOL_NEEDED        NO)
+  set(BMQ_TARGET_BMQSTORAGETOOL_NEEDED NO)
+  set(BMQ_TARGET_MWC_NEEDED            NO)
+  set(BMQ_TARGET_BMQ_NEEDED            NO)
+  set(BMQ_TARGET_MQB_NEEDED            NO)
+  set(BMQ_TARGET_TUTORIAL_NEEDED       NO)
+  set(BMQ_TARGET_PROMETHEUS_NEEDED     NO)
+
+  bbproject_check_install_target("mwc"            installMWC)
+  bbproject_check_install_target("bmq"            installBMQ)
+  bbproject_check_install_target("mqb"            installMQB)
+  bbproject_check_install_target("bmqbrkrcfg"     installBMQBRKRCFG)
+  bbproject_check_install_target("bmqtool"        installBMQTOOL)
+  bbproject_check_install_target("bmqstoragetool" installBMQSTORAGETOOL)
+  bbproject_check_install_target("prometheus"     installPROMETHEUS)
 
   # NOTE: All targets should get 'mwc' from DPKG, except for the 'mwc' release
   #       itself (and the development work).
@@ -174,6 +177,12 @@ else()
     set(BMQ_TARGET_BMQTOOL_NEEDED YES)
   endif()
 
+  if (installBMQSTORAGETOOL)
+    set(BMQ_TARGET_BMQ_NEEDED            YES)
+    set(BMQ_TARGET_MQB_NEEDED            YES)
+    set(BMQ_TARGET_BMQSTORAGETOOL_NEEDED YES)
+  endif()
+
   if (installPROMETHEUS)
     set(BMQ_TARGET_MWC_NEEDED        YES)
     set(BMQ_TARGET_BMQ_NEEDED        YES)

bin/build-darwin.sh

@@ -83,14 +83,14 @@ fi
 
 
 # Build other dependencies
-brew install flex bison google-benchmark zlib
+brew install flex bison google-benchmark googletest zlib
 
 # Determine paths based on Intel vs Apple Silicon CPU
 if [ "$(uname -p)" == 'arm' ]; then
-    BREW_PKG_CONFIG_PATH="/opt/homebrew/lib/pkgconfig:/opt/homebrew/opt/zlib/lib/pkgconfig"
+    BREW_PKG_CONFIG_PATH="/opt/homebrew/lib/pkgconfig:/opt/homebrew/opt/zlib/lib/pkgconfig:/opt/homebrew/opt/googletest/lib/pkgconfig"
     FLEX_ROOT="/opt/homebrew/opt/flex"
 else
-    BREW_PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:/usr/local/opt/zlib/lib/pkgconfig"
+    BREW_PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:/usr/local/opt/zlib/lib/pkgconfig:/usr/local/opt/googletest/lib/pkgconfig"
     FLEX_ROOT="/usr/local/opt/flex"
 fi
 

bin/build-ubuntu.sh

@@ -19,6 +19,7 @@ sudo apt install -y --no-install-recommends \
     bison \
     libfl-dev \
     libbenchmark-dev \
+    libgmock-dev \
     libtool \
     libz-dev
 PREREQUISITES

docker/Dockerfile

@@ -13,6 +13,7 @@ RUN apt-get update && \
     bison \
     libfl-dev \
     libbenchmark-dev \
+    libgmock-dev \
     libz-dev \
     && apt clean \
     && rm -rf /var/lib/apt/lists/*

etc/cmake/BMQTest.cmake

@@ -131,6 +131,103 @@ function(bmq_add_test target)
     if(${target}_TEST_TARGETS)
       bbs_import_target_dependencies(${target} ${${uor_name}_TEST_PCDEPS})
     endif()
+
+    # Generate the test driver manifest file for compatibility with rat.rb
+    if(_COMPAT)
+      _bmq_target_generate_td_manifest(${target} TEST_DRIVERS ${td_manifest})
+    endif()
+
+  endif()
+
+  if(_COMPAT AND NOT TARGET all.td)
+    add_custom_target(all.td)
+    add_dependencies(all.td all.t)
+  endif()
+endfunction()
+
+# :: bmq_add_application_test :::::::::::::::::::::::::::::::::::::::::::::::::
+# This function searches for the test drivers of an 'application' TARGET. 
+# It expects existence of intermediate library '${uor_name}_lib' which is 
+# created by 'bbs_setup_target_uor()'.
+# It generates a target named ${UOR_component}.t and ${UOR_component}.td for
+# each component found, and an all.td target which depends on all the tests
+# together.
+#
+# The *.td targets should not be depended upon directly mostly exist for
+# historical compatibility.
+function(bmq_add_application_test target)
+  cmake_parse_arguments(PARSE_ARGV 1
+    ""
+    "COMPAT"
+    "SOURCE_DIR"
+    "")
+
+  find_package(BdeBuildSystem REQUIRED)
+
+  # Get the name of the unit from the target
+  get_target_property(uor_name ${target} NAME)
+
+  # Use the current source directory if none is specified
+  if(NOT _SOURCE_DIR)
+    set(_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+  endif()
+
+  # Check that BDE metadata exists and load it
+  if(NOT DEFINED ${uor_name}_PACKAGES)
+    if(EXISTS ${_SOURCE_DIR}/package)
+      bbs_read_metadata(PACKAGE ${uor_name}
+        SOURCE_DIR ${_SOURCE_DIR})
+    endif()
+  endif()
+
+  # Refer to intermediate library created by 'bbs_setup_target_uor()'
+  set(lib_target "${uor_name}_lib")
+
+  bbs_configure_target_tests(${lib_target}
+    SOURCES    ${${uor_name}_TEST_SOURCES}
+    TEST_DEPS  ${${uor_name}_PCDEPS}
+               ${${uor_name}_TEST_PCDEPS}
+    LABELS     "all" ${target})
+
+  if (TARGET ${lib_target}.t)
+    if (NOT TARGET ${target}.t)
+      add_custom_target(${target}.t)
+    endif()
+    add_dependencies(${target}.t ${lib_target}.t)
+  endif()
+
+  if (${lib_target}_TEST_TARGETS)
+    bbs_import_target_dependencies(${lib_target} ${${uor_name}_TEST_PCDEPS})
+  endif()
+
+  set(td_manifest)
+
+  if(${lib_target}_TEST_TARGETS)
+
+    if(NOT TARGET ${lib_target}.t)
+      add_custom_target(${lib_target}.t)      
+      if(_COMPAT)
+        add_custom_target(${lib_target}.td)
+      endif()
+    endif()
+
+    add_dependencies(${lib_target}.t ${${lib_target}_TEST_TARGETS})
+
+    if(_COMPAT)
+      foreach(test_target ${${lib_target}_TEST_TARGETS})
+        string(REPLACE ".t" "" component ${test_target})
+        set_target_properties(${test_target} PROPERTIES OUTPUT_NAME "${test_target}.tsk")
+        list(APPEND td_manifest
+          "${component}: $<TARGET_FILE:${test_target}>")
+      endforeach()
+    endif()
+
+    bbs_import_target_dependencies(${lib_target} ${${uor_name}_TEST_PCDEPS})
+  endif()
+
+  # Generate the test driver manifest file for compatibility with rat.rb
+  if(_COMPAT)
+    _bmq_target_generate_td_manifest(${lib_target} TEST_DRIVERS ${td_manifest})
   endif()
 
   if(_COMPAT AND NOT TARGET all.td)

src/applications/CMakeLists.txt

@@ -2,4 +2,5 @@
 # ------------
 
 add_subdirectory( bmqbrkr )
+add_subdirectory( bmqstoragetool )
 add_subdirectory( bmqtool )

src/applications/bmqstoragetool/CMakeLists.txt

@@ -0,0 +1,21 @@
+# bmqstoragetool
+# --------------
+
+if(NOT BMQ_TARGET_BMQSTORAGETOOL_NEEDED)
+  return()
+endif()
+
+add_executable(bmqstoragetool)
+
+target_compile_definitions(bmqstoragetool PRIVATE "MWC_INTERNAL_USAGE")
+
+target_bmq_default_compiler_flags(bmqstoragetool)
+
+set_target_properties(bmqstoragetool
+  PROPERTIES OUTPUT_NAME "bmqstoragetool.tsk")
+bbs_setup_target_uor(bmqstoragetool SKIP_TESTS)
+
+include(BMQTest)
+bmq_add_application_test(bmqstoragetool COMPAT)
+
+install(TARGETS bmqstoragetool RUNTIME DESTINATION bin)