WIP: Better abstraction for channel factory pipeline

Signed-off-by: Taylor Foxhall <[email protected]>

Author: hallfox

.github/workflows/build-ubuntu.yaml

@@ -101,6 +101,7 @@ jobs:
             libfl-dev \
             libbenchmark-dev \
             libgmock-dev \
+            libgtest-dev \
             libz-dev
       - name: Install cached non packaged dependencies
         if: steps.build-cache-restore-step.outputs.cache-hit != 'true' # Variable type is string, thus using quotes

.github/workflows/build.yaml

@@ -279,6 +279,7 @@ jobs:
             libfl-dev \
             libbenchmark-dev \
             libgmock-dev \
+            libgtest-dev \
             libz-dev \
             autoconf \
             libtool

.github/workflows/dependencies.yaml

@@ -53,6 +53,7 @@ jobs:
             libfl-dev \
             libbenchmark-dev \
             libgmock-dev \
+            libgtest-dev \
             libz-dev
 
       - name: Fetch & build non packaged dependencies

bin/build-ubuntu.sh

@@ -6,7 +6,7 @@ echo -e "Before running this script, install the following prerequisites, if not
         "by executing the following commands:\n"                                               \
         "sudo apt update && sudo apt -y install ca-certificates\n"                             \
         "sudo apt install -y --no-install-recommends"                                          \
-        "autoconf automake build-essential gdb cmake ninja-build pkg-config bison libfl-dev libbenchmark-dev libgmock-dev libtool libz-dev"
+        "autoconf automake build-essential gdb cmake ninja-build pkg-config bison libfl-dev libbenchmark-dev libgmock-dev libgtest-dev libtool libz-dev"
 
 # :: Parse and validate arguments :::::::::::::::::::::::::::::::::::::::::::::
 print_usage_and_exit_with_error() {

docker/Dockerfile

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

etc/cmake/BMQTest.cmake

@@ -1,89 +1,10 @@
 # This module provides functions to support generating test targets compatible
 # with BlazingMQ CI.
 #
-# add_bmq_test( TARGET )
+# bmq_add_application_test( TARGET )
 
 include_guard()
 
-# :: bmq_add_test :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-# This function searches for the test drivers of a UOR-style TARGET within the
-# `tests` directory of each package. For each component, it generates a target
-# named ${UOR_component}.t for each component found.
-function(bmq_add_test target)
-  cmake_parse_arguments(PARSE_ARGV 1
-    ""
-    "SKIP_TESTS;NO_GEN_BDE_METADATA;NO_EMIT_PKG_CONFIG_FILE;COMPAT"
-    "SOURCE_DIR"
-    "CUSTOM_PACKAGES")
-
-  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}/group)
-      bbs_read_metadata(GROUP ${uor_name}
-        SOURCE_DIR ${_SOURCE_DIR}
-        CUSTOM_PACKAGES "${_CUSTOM_PACKAGES}")
-    else()
-      if(EXISTS ${_SOURCE_DIR}/package)
-        bbs_read_metadata(PACKAGE ${uor_name}
-          SOURCE_DIR ${_SOURCE_DIR})
-      endif()
-    endif()
-  endif()
-
-  # Each package in the groups
-  if(${uor_name}_PACKAGES)
-    foreach(pkg ${${uor_name}_PACKAGES})
-      bbs_configure_target_tests(${pkg}
-        SOURCES ${${pkg}_TEST_SOURCES}
-        TEST_DEPS ${${pkg}_DEPENDS}
-        ${${pkg}_TEST_DEPENDS}
-        ${${uor_name}_PCDEPS}
-        ${${uor_name}_TEST_PCDEPS}
-        LABELS "unit;all" ${target} ${pkg})
-    endforeach()
-
-    set(import_test_deps ON)
-
-    foreach(pkg ${${uor_name}_PACKAGES})
-      if(${pkg}_TEST_TARGETS)
-        if(NOT TARGET ${target}.t)
-          add_custom_target(${target}.t)
-        endif()
-
-        add_dependencies(${target}.t ${${pkg}_TEST_TARGETS})
-
-        if(import_test_deps)
-          # Import UOR test dependencies only once and only if we have at least
-          # one generated test target
-          bbs_import_target_dependencies(${target} ${${uor_name}_TEST_PCDEPS})
-          set(import_test_deps OFF)
-        endif()
-      endif()
-    endforeach()
-  else()
-    # Configure standalone library ( no packages ) and tests from BDE metadata
-    bbs_configure_target_tests(${target}
-      SOURCES ${${uor_name}_TEST_SOURCES}
-      TEST_DEPS ${${uor_name}_PCDEPS}
-      ${${uor_name}_TEST_PCDEPS}
-      LABELS "unit;all" ${target})
-
-    if(${target}_TEST_TARGETS)
-      bbs_import_target_dependencies(${target} ${${uor_name}_TEST_PCDEPS})
-    endif()
-  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

etc/cmake/BmqPackageProvider.cmake

@@ -22,5 +22,6 @@ macro(setup_package_provider)
 
         find_package(GTest CONFIG REQUIRED)
         add_library(gmock ALIAS GTest::gmock)
+        add_library(gtest ALIAS GTest::gtest)
     endif()
 endmacro()

etc/cmake/TargetBMQStyleUor.cmake

@@ -59,7 +59,6 @@ function(target_bmq_style_uor TARGET)
   add_library(${TARGET}-flags INTERFACE IMPORTED)
 
   bbs_setup_target_uor(${TARGET}
-    SKIP_TESTS
     PRIVATE_PACKAGES "${_PRIVATE_PACKAGES}")
 
   get_target_property(uor_name ${TARGET} NAME)
@@ -84,9 +83,6 @@ function(target_bmq_style_uor TARGET)
       target_link_libraries(${pkg}-iface PUBLIC ${TARGET}-flags)
     endforeach()
   endif()
-
-  include(BMQTest)
-  bmq_add_test(${TARGET} COMPAT)
 endfunction()
 
 # :: bmq_install_target_headers ::::::::::::::::::::::::::::::::::::::::::::::::