ceedling 1.1.0 → 1.1.1

data/docs/mkdocs/plugins/gcov/gcovr.md

@@ -1,126 +1,61 @@
 # GCovr Configuration
 
-All reports generated by `gcovr` are found in `<build root>/artifacts/gcov/gcovr/`.
+!!! note
+    All reports generated by `gcovr` are found in `<build root>/artifacts/gcov/gcovr/`.
 
-## HTML reports
-
-Generation of HTML reports may be modified with the following configuration items.
-
-```yaml
-:gcov:
-  :gcovr:
-    # HTML report filename.
-    :html_artifact_filename: <filename>
-
-    # Use 'title' as title for the HTML report.
-    # Default is 'Head'. (gcovr --html-title)
-    :html_title: <title>
-
-    # If the coverage is below MEDIUM, the value is marked as low coverage in the HTML report.
-    # MEDIUM has to be lower than or equal to value of html_high_threshold.
-    # If MEDIUM is equal to value of html_high_threshold the report has only high and low coverage.
-    # Default is 75.0. (gcovr --html-medium-threshold)
-    :html_medium_threshold: 75
-
-    # If the coverage is below HIGH, the value is marked as medium coverage in the HTML report.
-    # HIGH has to be greater than or equal to value of html_medium_threshold.
-    # If HIGH is equal to value of html_medium_threshold the report has only high and low coverage.
-    # Default is 90.0. (gcovr -html-high-threshold)
-    :html_high_threshold: 90
-
-    # Set to 'true' to use absolute paths to link the 'detailed' reports.
-    # Defaults to relative links. (gcovr --html-absolute-paths)
-    :html_absolute_paths: <true|false>
-
-    # Override the declared HTML report encoding. Defaults to UTF-8. (gcovr --html-encoding)
-    :html_encoding: <html_encoding>
-```
-
-## Cobertura XML reports
+The following sections first discuss GCovr options in common across reports
+and then break out report-specific options.
 
-Generation of Cobertura XML reports may be modified with the following configuration items.
+## GCovr options
 
-```yaml
-:gcov:
-  :gcovr:
-    # Set to 'true' to pretty-print the Cobertura XML report, otherwise set to 'false'.
-    # Defaults to disabled. (gcovr --xml-pretty)
-    :cobertura_pretty: <true|false>
+### Project config vs. GCovr config file
 
-    # Override default Cobertura XML report filename.
-    :cobertura_artifact_filename: <filename>
-```
+GCovr can be configured in two ways:
 
-## SonarQube XML reports
+1. Using one or more of the options documented below in the `:gcov` section
+   of your project configuration.
+1. Through a Gcovr configuration file (.ini format) provided to Gcovr via
+   the speciial `:config_file` value in the `:gcov` section of your project
+   configuration.
 
-Generation of SonarQube XML reports may be modified with the following configuration items.
+### Gcovr configuration file
 
-```yaml
-:gcov:
-  :gcovr:
-    # Override default SonarQube XML report filename.
-    :sonarqube_artifact_filename: <filename>
-```
+!!! warning "Using a gcovr configuration file"
+    When `:config_file` is set, Ceedling passes only `--root` (`:report_root`) 
+    and `--config` (`:config_file`) to `gcovr` at the command line from your
+    plugin configuration. This prevents overriding config file settings with 
+    CLI arguments. You must provide any settings that would have been provided 
+    by the Gcov plugin.
 
-## JSON reports
+To preserve filtering of test and build files from coverage results when
+using a Gcovr config file, you must provide explicit exclusion patterns matching 
+your project layout (example below).
 
-Generation of JSON reports may be modified with the following configuration items.
+```ini
+[gcovr]
+; You will need to revise these example exclude patterns to match your
+; project directories and file naming as they cannot be automatically 
+; provided to Gcovr when a Gcovr configuration file is in use.
 
-```yaml
-:gcov:
-  :gcovr:
-    # Set to 'true' to pretty-print the JSON report, otherwise set 'false'.
-    # Defaults to disabled. (gcovr --json-pretty)
-    :json_pretty: <true|false>
+; Test path(s) exclusions for 'test_' files with .c extensions. 
+exclude = .*test.*/test_.+\.c$
 
-    # Override default JSON report filename.
-    :json_artifact_filename: <filename>
+; Build path exlcude for all generated C files (runners, mocks, partials).
+exclude = .*build/.+\.c$
 ```
 
-## Text reports
-
-Generation of text reports may be modified with the following configuration items.
-Text reports may be printed to the console or output to a file.
+### Plugin project configuration
 
-```yaml
-:gcov:
-  :gcovr:
-    # Override default text report filename.
-    :text_artifact_filename: <filename>
-```
+The following is an exhaustive commented version of all GCovr configuration 
+options exposed through your project configuration file. Only specify those 
+you need or those whose defaults you need to override. You do not need to 
+include all these options in your Gcov plugin configuration.
 
-## Common GCovr options
-
-A number of options exist to control which files are considered part of a 
-coverage report. This Ceedling gcov plugin itself handles the most important 
-aspect — only source files under test are compiled with coverage. Tests, mocks,
-and test runners, are not compiled with coverage.
-
-!!! note "`gcovr` accepts only one report root path"
-    `gcovr` will only accept a single path for `:report_root`. In typical usage,
-    this is of no concern as it is handled automatically. In unusual project
-    layouts, you may need to specify a folder that encompasses _all_ build folders
-    containing coverage result files and optionally, selectively exclude patterns
-    of paths or files. For instance, if your Ceedling project file is not at the
-    root of your project, you may need set `:report_root` as well as
-    `:report_exclude` and `:exclude_directories`.
-
-!!! note "Using a gcovr configuration file"
-    When `:config_file:` is set, Ceedling passes only `--root` and `--config`
-    to gcovr and defers all other settings to that file. This prevents Ceedling
-    from overriding config file values with its CLI arguments. Only `:report_root:`
-    is still applied because Ceedling may invoke gcovr from a different working
-    directory than your project root.
-
-    To preserve the plugin's default filtering of test and build files, include
-    equivalent exclusion patterns in your gcovr config file (adjust for your
-    project's `:test_file_prefix`, test paths, and `:build_root` settings):
-
-    ```ini
-    [gcovr]
-    exclude = .*test.*/test_.+\.c$
-    exclude = .*build/.+\.c$
-    ```
+!!! warning "`gcovr` accepts only one reporting root path"
+    `gcovr` accepts only a single path for `:report_root`. In unusual project
+    layouts, you may need to specify as root a parent folder that includes 
+    _all_ source files and selectively exclude paths or files from coverage 
+    reporting (see `:report_exclude` and `:exclude_directories`).
 
 ```yaml
 :gcov:
@@ -139,8 +74,8 @@ and test runners, are not compiled with coverage.
     # :report_root is still applied because Ceedling may invoke gcovr from a
     # different working directory than your project root.
     #
-    # To preserve the plugin's base filtering behavior, include the following
-    # patterns in your config file (adjust paths to match your project's
+    # To preserve the plugin’s base filtering behavior, include the following
+    # patterns in your config file (adjust paths to match your project’s
     # :test_file_prefix, test paths, and :build_root settings):
     #
     #   [gcovr]
@@ -210,7 +145,7 @@ and test runners, are not compiled with coverage.
 
     # Use a particular gcov executable. (gcovr --gcov-executable).
     # (This may be appropriate and necessary in special circumstances.
-    #  Please review Ceedling's options for modifying tools first.)
+    #  Please review Ceedling’s options for modifying tools first.)
     :gcov_executable: <cmd>
 
     # Exclude branch coverage from lines without useful
@@ -247,5 +182,91 @@ and test runners, are not compiled with coverage.
     # Set the number of threads to use in parallel. (gcovr -j).
     :threads: <count>
 ```
+## HTML reports
+
+Generation of HTML reports may be modified with the following configuration items.
+
+```yaml
+:gcov:
+  :gcovr:
+    # HTML report filename.
+    :html_artifact_filename: <filename>
+
+    # Use 'title' as title for the HTML report.
+    # Default is 'Head'. (gcovr --html-title)
+    :html_title: <title>
+
+    # If the coverage is below MEDIUM, the value is marked as low coverage in the HTML report.
+    # MEDIUM has to be lower than or equal to value of html_high_threshold.
+    # If MEDIUM is equal to value of html_high_threshold the report has only high and low coverage.
+    # Default is 75.0. (gcovr --html-medium-threshold)
+    :html_medium_threshold: 75
+
+    # If the coverage is below HIGH, the value is marked as medium coverage in the HTML report.
+    # HIGH has to be greater than or equal to value of html_medium_threshold.
+    # If HIGH is equal to value of html_medium_threshold the report has only high and low coverage.
+    # Default is 90.0. (gcovr -html-high-threshold)
+    :html_high_threshold: 90
+
+    # Set to 'true' to use absolute paths to link the 'detailed' reports.
+    # Defaults to relative links. (gcovr --html-absolute-paths)
+    :html_absolute_paths: <true|false>
+
+    # Override the declared HTML report encoding. Defaults to UTF-8. (gcovr --html-encoding)
+    :html_encoding: <html_encoding>
+```
+
+## Cobertura XML reports
+
+Generation of Cobertura XML reports may be modified with the following configuration items.
+
+```yaml
+:gcov:
+  :gcovr:
+    # Set to 'true' to pretty-print the Cobertura XML report, otherwise set to 'false'.
+    # Defaults to disabled. (gcovr --xml-pretty)
+    :cobertura_pretty: <true|false>
+
+    # Override default Cobertura XML report filename.
+    :cobertura_artifact_filename: <filename>
+```
+
+## SonarQube XML reports
+
+Generation of SonarQube XML reports may be modified with the following configuration items.
+
+```yaml
+:gcov:
+  :gcovr:
+    # Override default SonarQube XML report filename.
+    :sonarqube_artifact_filename: <filename>
+```
+
+## JSON reports
+
+Generation of JSON reports may be modified with the following configuration items.
+
+```yaml
+:gcov:
+  :gcovr:
+    # Set to 'true' to pretty-print the JSON report, otherwise set 'false'.
+    # Defaults to disabled. (gcovr --json-pretty)
+    :json_pretty: <true|false>
+
+    # Override default JSON report filename.
+    :json_artifact_filename: <filename>
+```
+
+## Text reports
+
+Generation of text reports may be modified with the following configuration items.
+Text reports may be printed to the console or output to a file.
+
+```yaml
+:gcov:
+  :gcovr:
+    # Override default text report filename.
+    :text_artifact_filename: <filename>
+```
 
 <br/><br/>

data/docs/mkdocs/plugins/gcov/index.md

@@ -4,6 +4,12 @@ The `gcov` plugin integrates the code coverage abilities of the GNU compiler
 collection with test builds. It provides simple coverage metrics by default and
 can optionally produce sophisticated coverage reports.
 
+!!! note
+    The Gcov plugin creates a duplicate test build with `gcov:` command line
+    plugin tasks. [This is intentional and needed](../index.md#understanding-plugin-build-duplication).
+
+---
+
 <div class="grid cards" markdown>
 
 -   :material-information-outline: **[Overview][overview]**

data/docs/mkdocs/plugins/index.md

@@ -16,6 +16,46 @@ includes full documentation of its capabilities and configuration options.
 See the [`:plugins` configuration reference](../configuration/reference/plugins.md) 
 for how to enable built-in plugins and load custom plugins in your project.
 
+---
+
+## Understanding plugin build duplication
+
+!!! warning
+    Build-related plugins intentionally execute duplicated builds.
+
+Plugins including [Gcov](gcov/index.md), [Bullseye](bullseye.md), and [Valgrind](valgrind.md)
+recreate test build tasks. That is, the command line build task `test:foo` also exists 
+as `gcov:foo`, `bullseye:foo`, and/or `valgrind:foo` if these plugins are enabled.
+Each of these triggers a full rebuild of the named test with instrumentation 
+activated. **This duplication is intentional and very necessary.**
+
+These plugins modify executable code or the environment in which a test suite 
+executable runs. Duplicating and segregating the build tasks addresses several 
+important issues:
+
+1. **Conflicting interactions**. Enabling multiple plugins without 
+   duplicated tasks (i.e. integrated build tasks) can bring about conflicts and
+   undefined behavior. For instance, Gcov’s instrumentation does not
+   necessarily play nice with Valgrind’s memory-instrumented emulation
+   runtime, and the two should be kept entirely segregated.
+2. **Unforeseen effects**. These plugins can directly alter the functioning of
+   the code under test. For instance, coverage instrumentation inserted into
+   your compiled code can alter its function or timing. As such, it is vital
+   to maintain distinct builds to compare them. Your vanilla test suite build
+   may function slightly differently than the coverage-instrumented build.
+3. **Optional instrumentation**. The `<plugin>:` command line task convention
+   also provides a very simple opt-in scheme. Plugins automatically enabled 
+   for every build drives the desire to optional disable them. Valgrind testing
+   can require 25-50x the execution time of a test suite, and you likely will
+   want the option to easily disable it. While Ceedling could certainly provide
+   that option at the command line for otherwise always-on plugins, this
+   plugin task namespacing scheme naturally accomplished this along with the
+   needs of (1) and (2).
+
+---
+
+## Directory
+
 ### Console Test Results
 
 <div class="grid cards" markdown>

data/docs/mkdocs/plugins/valgrind.md

@@ -4,6 +4,12 @@ Adds Ceedling tasks to run test executables under [Valgrind] memory error
 detection to help find memory leaks, invalid memory accesses, and
 use-after-free bugs in your C code.
 
+!!! note
+    The Valgrind plugin creates a duplicate test build with `valgrind:` 
+    command line plugin tasks. [This is intentional and needed](index.md#understanding-plugin-build-duplication).
+
+---
+
 ## Plugin overview
 
 !!! note "Linux only"

data/docs/mkdocs/testing-guide/partials/index.md

@@ -4,23 +4,25 @@ A _Partial_ is your C code sliced and diced to expose elements for testing
 that you could not otherwise access without rewriting your source code. 
 Think of Partials as a unit testing scalpel.
 
-Partials are useful when a module under test contains:
+Partials are useful when you need to test:
 
-* **`static` or `inline` functions** — These become accessible within 
-  your test code.
+* **`static` or `inline` functions** — These become accessible to 
+  your test code without modifying your source.
 * **File-scoped `static` variables** — The `static` keyword is stripped, 
-  and the variable is automatically made `extern` for easy access within 
-  your test code.
+  and the variable is automatically made `extern` for your test code 
+  with no changes to the source under test.
 * **Function-scoped `static` variables** — These are promoted from
   function scope to module scope so they can be accessed in your
-  test code. Apart from necessary renaming, this works identically to
-  file-scoped `static` variables.
-
-!!! warning "Limitations of Partials"
-    Partials are new to Ceedling with 1.1.0. Carving up C code is tricky
-    business. Complex code _may_ break Ceedling’s lexing or its assumptions 
-    on symbol ordering. Some issues may be [bugs to be reported](../../help.md) 
-    while others may be complexities that Partials are simply unable to resolve.
+  test code just like file-scoped `static` variables.
+* **Same-module mocked functions** — You can mix and match tested and 
+  mocked functions from the same source module. Partials allow mocking 
+  functions inside a module that are called by other functions inside 
+  the same module.
+  
+!!! tip
+    See the [`wondrous_forest`](../../getting-started/example-projects/wondrous-forest.md) 
+    example available within Ceedling for a working example project 
+    demonstrating Partials in action.
 
 ---
 
@@ -69,6 +71,13 @@ Partials are useful when a module under test contains:
 
 </div>
 
+!!! warning "Limitations of Partials"
+    Partials are new to Ceedling with 1.1.0. Carving up C code is tricky
+    business. Complex code _may_ break Ceedling’s lexing or certain assumptions.
+    Some issues may be [bugs to be reported](../../help.md) while others may 
+    be complexities that Partials are simply unable to resolve.
+
+
 [overview]:        overview.md
 [conventions]:     conventions.md
 [directives]:      directives.md

data/lib/ceedling/config/configurator.rb

@@ -11,6 +11,7 @@ require 'ceedling/file_path_utils'
 require 'ceedling/exceptions'
 require 'ceedling/rake_app/rakefile_component_resolver'
 require 'ceedling/config/config_matchinator'
+require 'ceedling/tool_executor'
 require 'deep_merge'
 
 class Configurator
@@ -431,7 +432,7 @@ class Configurator
       end
 
       # Populate name if not given
-      tool[:name] = name.to_s if (tool[:name].nil?)
+      ToolExecutor.default_name!( tool, name.to_s )
 
       # Populate $stderr redirect option
       tool[:stderr_redirect] = StdErrRedirect::NONE if (tool[:stderr_redirect].nil?)

data/lib/ceedling/preprocess/preprocessinator.rb

@@ -264,14 +264,15 @@ class Preprocessinator
     # `extras` are macro definitions, pragmas, etc. needed for the special case of mocking `inline` function declarations.
     # `extras` are empty for any cases other than mocking `inline` function declarations
     # (We don't want to increase our chances of a badly generated file--extracting extras could fail in complex files.)
-    contents, extras = @file_assembler.collect_mockable_header_file_contents( **arg_hash )
+    contents, extras, include_guard = @file_assembler.collect_mockable_header_file_contents( **arg_hash )
 
     arg_hash = {
       filename:              File.basename( filepath ),
       preprocessed_filepath: preprocessed_filepath,
       contents:              contents,
       extras:                extras,
-      includes:              includes                       
+      includes:              includes,
+      include_guard:         include_guard
     }
 
     # Create a reconstituted header file from preprocessing expansion and preserving any extras

data/lib/ceedling/preprocess/preprocessinator_file_assembler.rb

@@ -60,15 +60,26 @@ class PreprocessinatorFileAssembler
     end
 
     # Bail out if no extras are required
-    return contents, [] if !extras
-
-    # Try to find an #include guard in the first 2k of the file text.
-    # An #include guard is one macro from the original file we don't want to preserve if we can help it.
-    # We create our own #include guard in the header file we create.
-    # It's possible preserving the macro from the original file's #include guard could trip something up.
-    # Of course, it's also possible some header conditional compilation feature is dependent on it.
-    # ¯\_(ツ)_/¯
-    include_guard = @preprocessinator_reconstructor.extract_include_guard( @file_wrapper.read( filepath, 2048 ).clean_encoding )
+    return contents, [], nil if !extras
+
+    # Try to find an #include guard in the first 2k of the file text. This name is used two ways:
+    #   1. To exclude the guard's own #define from the macro definitions preserved as "extras" below
+    #      (it would be redundant -- assemble_preprocessed_header_file writes its own guard).
+    #   2. Returned to the caller so the reconstructed header can reuse this exact guard name (see
+    #      assemble_preprocessed_header_file) instead of a synthetic one. Reusing the original name keeps
+    #      the reconstructed file recognized as "the same header" by the preprocessor wherever both the
+    #      original and a reconstructed/mocked copy are reachable in the same translation unit's include
+    #      graph. A mismatched synthetic guard was the root cause of enum/type redeclaration errors in
+    #      https://github.com/ThrowTheSwitch/Ceedling/issues/1064.
+    # If no guard is found (e.g. the header uses `#pragma once` or has none), `nil` flows through and
+    # assemble_preprocessed_header_file falls back to a synthetic guard, matching prior behavior.
+    include_guard =
+      @preprocessinator_reconstructor.extract_include_guard(
+        @file_wrapper.read(
+          filepath,
+          2048
+        ).clean_encoding
+      )
 
     if fallback
       msg = @reportinator.generate_module_progress(
@@ -104,7 +115,7 @@ class PreprocessinatorFileAssembler
       end
     end
 
-    return contents, (pragmas + macro_defs)
+    return contents, (pragmas + macro_defs), include_guard
   end
 
 
@@ -197,9 +208,12 @@ class PreprocessinatorFileAssembler
   end
 
 
-  def assemble_preprocessed_header_file(filename:, preprocessed_filepath:, contents:, extras:, includes:)
-    # Generate #include guard name for header files
-    guardname = FileWrapper.generate_include_guard( filename )
+  def assemble_preprocessed_header_file(filename:, preprocessed_filepath:, contents:, extras:, includes:, include_guard: nil)
+    # Reuse the original header's own #include guard name when we found one so that this
+    # reconstructed file is recognized as "the same header" by the preprocessor wherever both
+    # are reachable (e.g. once via a mock's shadowed copy, once via the original source path).
+    # Fall back to a synthetic guard derived from the filename otherwise.
+    guardname = include_guard || FileWrapper.generate_include_guard( filename )
 
     # Write contents of final preprocessed file a line at a time
     # ----------------------------------------------------------

data/lib/ceedling/test_invoker/test_build_executor.rb

@@ -412,7 +412,6 @@ class TestBuildExecutor
     @batchinator.exec(workload: :compile, things: state.objects_list) do |obj|
       src = @file_finder.find_build_input_file( filepath: obj[:obj], context: state.context )
       compile_test_component(
-        tool:    obj[:tool],
         context: state.context,
         test:    obj[:test],
         source:  src,
@@ -546,7 +545,7 @@ class TestBuildExecutor
   private
 
   # Compile a single C or assembly source file into an object file.
-  def compile_test_component(tool:, context:, test:, source:, object:, state:)
+  def compile_test_component(context:, test:, source:, object:, state:)
     testable     = state.testables[test.to_sym]
     defines      = testable.compile_defines
     search_paths = tailor_search_paths( search_paths: testable.search_paths, filepath: source )
@@ -555,7 +554,7 @@ class TestBuildExecutor
       flags = testable.compile_flags
 
       arg_hash = {
-        tool:         tool,
+        tool:         @configurator.tools_test_compiler,
         module_name:  test,
         context:      context,
         source:       source,
@@ -573,7 +572,7 @@ class TestBuildExecutor
       flags = testable.assembler_flags
 
       arg_hash = {
-        tool:         tool,
+        tool:         @configurator.tools_test_assembler,
         module_name:  test,
         context:      context,
         source:       source,

data/lib/ceedling/test_invoker/test_build_planner.rb

@@ -162,7 +162,6 @@ class TestBuildPlanner
         testable.no_link_objects = test_no_link_objects
         testable.results_pass    = test_pass
         testable.results_fail    = test_fail
-        testable.tool            = TOOLS_TEST_COMPILER
       end
     end
   end
@@ -172,7 +171,6 @@ class TestBuildPlanner
     state.objects_list = state.testables.map do |_, testable|
       testable.objects.map do |obj|
         {
-          tool: testable.tool,
           test: testable.name,
           obj:  obj
         }

data/lib/ceedling/test_invoker/test_invoker_types.rb

@@ -37,7 +37,7 @@ module TestInvokerTypes
     :mocks,                                    # Hash — mock name → mock info
     :partials,                                 # TestablePartials — configs map + tests/mocks module name lists
     :sources, :frameworks, :core, :objects, :executable,
-    :no_link_objects, :results_pass, :results_fail, :tool,
+    :no_link_objects, :results_pass, :results_fail,
     keyword_init: true
   ) do
     def initialize(**kwargs)

data/lib/ceedling/tool_executor.rb

@@ -11,6 +11,11 @@ require 'benchmark'
 
 class ToolExecutor
 
+  # Populate a tool config hash's :name key from `default` if the user did not set one explicitly.
+  def self.default_name!(tool, default)
+    tool[:name] = default if tool[:name].nil?
+  end
+
   constructor :configurator, :tool_executor_helper, :loginator, :verbosinator, :system_wrapper, :ruby_expandinator
 
   # build up a command line from yaml provided config

data/lib/version.rb

@@ -15,7 +15,7 @@
 module Ceedling
   module Version
     # Convenience constants for gem building, etc.
-    GEM = '1.1.0'
+    GEM = '1.1.1'
     TAG = GEM
 
     # If run as a script print Ceedling's version to $stdout

data/plugins/command_hooks/lib/command_hooks.rb

@@ -8,6 +8,7 @@
 require 'ceedling/constants'
 require 'ceedling/exceptions'
 require 'ceedling/plugins/plugin'
+require 'ceedling/tool_executor'
 
 COMMAND_HOOKS_ROOT_NAME = 'command_hooks'.freeze
 COMMAND_HOOKS_SYM       = COMMAND_HOOKS_ROOT_NAME.to_sym
@@ -157,6 +158,9 @@ class CommandHooks < Plugin
       raise CeedlingException.new( error )
     end
 
+    # Populate name if not given
+    ToolExecutor.default_name!( entry, keys.join('_') )
+
     # Validate the Ceedling tool components of the hook entry config
     @tool_validator.validate( tool: entry, name: name, boom: true )
 

data/plugins/gcov/lib/console_reportinator.rb

@@ -16,7 +16,9 @@ class ConsoleReportinator < GcovReportinator
 
   attr_reader :artifacts_path  # nil — console output only, no filesystem artifacts
 
-  def initialize(system_objects)
+  def initialize(system_objects, config)
+    super(config)
+
     @loginator           = system_objects[:loginator]
     @plugin_reportinator = system_objects[:plugin_reportinator]
     @test_invoker        = system_objects[:test_invoker]

data/plugins/gcov/lib/gcov.rb

@@ -317,7 +317,7 @@ class Gcov < Plugin
 
     # Instantiate console summary reportinator if summaries enabled
     @console_reportinator = summaries_enabled?(@project_config) ?
-      ConsoleReportinator.new(@ceedling) : nil
+      ConsoleReportinator.new(@ceedling, @project_config) : nil
 
     # Do not instantiate file reportinators (and tool validation) unless reports enabled
     return reportinators if (!enabled)
@@ -332,13 +332,13 @@ class Gcov < Plugin
 
     # Run reports using gcovr
     if utility_enabled?( config, GCOV_UTILITY_NAME_GCOVR )
-      reportinator = GcovrReportinator.new( @ceedling )
+      reportinator = GcovrReportinator.new( @ceedling, @project_config )
       reportinators << reportinator
     end
 
     # Run reports using ReportGenerator
     if utility_enabled?( config, GCOV_UTILITY_NAME_REPORT_GENERATOR )
-      reportinator = ReportGeneratorReportinator.new( @ceedling )
+      reportinator = ReportGeneratorReportinator.new( @ceedling, @project_config )
       reportinators << reportinator
     end
 

data/plugins/gcov/lib/gcov_reportinator.rb

@@ -20,6 +20,10 @@
 #
 class GcovReportinator
 
+  def initialize(config)
+    @config = config
+  end
+
   def name
     raise NotImplementedError.new("#{self.class} must implement name()")
   end