ceedling 1.2.1 → 1.2.2

data/plugins/dependencies/config/defaults.yml

@@ -26,9 +26,9 @@
     :name: 'Dependencies archiver'
     :optional: true  # Checked when :build_lib archives, not by every Ceedling command
     :arguments:  
-      - rcs  
-      - ${2}  
-      - ${1}
+      - rcs
+      - '"${2}"'  # Library
+      - '"${1}"'  # Objects
 
   :deps_zip:
     :executable: unzip
@@ -36,7 +36,7 @@
     :optional: true
     :arguments:
       - -o
-      - ${1}  # Filepath
+      - '"${1}"'  # Filepath
 
   :deps_targzip:
     :executable: tar
@@ -57,7 +57,7 @@
       - clone
       - ${1}  # Optional branch with `-b` flag
       - ${2}  # Optional depth with `--depth` flag
-      - ${3}  # Repository source
+      - '"${3}"'  # Repository source
       - .
 
   :deps_git_checkout:
@@ -75,7 +75,7 @@
     :arguments:
       - checkout
       - ${1}  # Optional branch with `--revision` flag
-      - ${2}  # Repository source
+      - '"${2}"'  # Repository source
       - .
 
 ...

data/plugins/dependencies/dependencies.rake

@@ -89,12 +89,15 @@
   task :prepare => all_deps
 end
 
-# Dependency libraries join the library names and paths test and release builds link with
+# Dependency libraries join the library names and paths test and release builds link with,
+# and their files join those the links depend on
 link_libraries = @ceedling[DEPENDENCIES_SYM].link_libraries
 PATHS_LIBRARIES ||= []
 PATHS_LIBRARIES.concat( link_libraries[:paths] ).uniq!
 LIBRARIES_SYSTEM ||= []
 LIBRARIES_SYSTEM.concat( link_libraries[:names] ).uniq!
+LIBRARIES_LINK_FILES ||= []
+LIBRARIES_LINK_FILES.concat( link_libraries[:files] ).uniq!
 
 # Add any artifact:include or :source folders to our release & test includes paths so linking and mocking work.
 @ceedling[DEPENDENCIES_SYM].add_headers_and_sources()

data/plugins/dependencies/lib/dependencies.rb

@@ -8,6 +8,8 @@
 require 'ceedling/plugins/plugin'
 require 'ceedling/constants'
 require 'ceedling/exceptions'
+require 'ceedling/filesystem/project_paths'
+require 'ceedling/filesystem/working_dir'
 require 'dependency_spec'
 require 'dependency_commands'
 require 'dependency_environment'
@@ -121,13 +123,15 @@ class Dependencies < Plugin
     end
   end
 
-  # Library names and their directories, for test and release linking
+  # Library names and their directories, for test and release linking, and the library files
+  # themselves, which those links depend on
   def link_libraries
     libraries = @specs.flat_map { |spec| spec.static_libraries + spec.dynamic_libraries }
 
     return {
       names: libraries.map { |library| File.basename( library, '.*' ).delete_prefix( 'lib' ) }.reject( &:empty? ).uniq,
-      paths: libraries.map { |library| File.dirname( library ) }.reject( &:empty? ).uniq
+      paths: libraries.map { |library| File.dirname( library ) }.reject( &:empty? ).uniq,
+      files: libraries.uniq
     }
   end
 
@@ -173,7 +177,7 @@ class Dependencies < Plugin
 
   # The one place this plugin changes directory, around a dependency's own commands
   def in_directory(path, &block)
-    Dir.chdir( path, &block )
+    WorkingDir.chdir( path, &block )
   end
 
   # A fetch path that already holds files is taken as fetched, so fetching again, or
@@ -273,7 +277,7 @@ class Dependencies < Plugin
   end
 
   def compile(spec, source, search_paths)
-    object = object_for( spec, source )
+    object = prepared_object( spec, source )
     @ceedling[:generator].generate_object_file_c(
       tool:         TOOLS_DEPS_COMPILER,
       module_name:  File.basename( source ).ext,
@@ -283,13 +287,13 @@ class Dependencies < Plugin
       search_paths: search_paths,
       flags:        spec.flags,
       defines:      spec.defines,
-      list:         @ceedling[:file_path_utils].form_release_build_list_filepath( File.basename( source ).ext )
+      list:         @ceedling[:file_path_utils].form_release_build_list_filepath( object )
     )
     return object
   end
 
   def assemble(spec, source)
-    object = object_for( spec, source )
+    object = prepared_object( spec, source )
     @ceedling[:generator].generate_object_file_asm(
       tool: TOOLS_DEPS_ASSEMBLER, module_name: File.basename( source ).ext, context: DEPENDENCIES_SYM,
       source: source, object: object
@@ -297,8 +301,14 @@ class Dependencies < Plugin
     return object
   end
 
-  def object_for(spec, source)
-    return File.join( spec.build_path, File.basename( source ).ext( EXTENSION_OBJECT.primary ) )
+  # A source's object sits at the source's own path below the dependency's source path, so
+  # same-named sources in different directories keep apart. Its directory is made here.
+  def prepared_object(spec, source)
+    subdir = ProjectPaths.subdir_below( spec.source_path, File.dirname( source ) ) || ''
+    object = File.join( spec.build_path, subdir, File.basename( source ).ext( EXTENSION_OBJECT.primary ) )
+
+    @ceedling[:file_wrapper].mkdir( File.dirname( object ) )
+    return object
   end
 
   def copy_library(built, destination)

data/plugins/dependencies/lib/dependency_spec.rb

@@ -6,14 +6,15 @@
 # =========================================================================
 
 require 'ceedling/exceptions'
+require 'ceedling/filesystem/project_paths'
 
 # One configured dependency, validated and normalized.
 #
 # Each dependency names its paths under :paths, and each path falls back to another when
 # left out: :source and :fetch to each other, :build to :source then :fetch, :artifact to
 # :build. With none configured, every path is `dependencies/<task name>`. Artifacts
-# (libraries, executables, includes, sources) live under the artifact path. An optional
-# :deploy path receives deployed copies.
+# (libraries, executables, includes, sources) live under the artifact path, unless named by
+# an absolute path. An optional :deploy path receives deployed copies.
 #
 # The task name is the configured name's word characters, which `dependencies:*` tasks
 # use, so it must be non-empty and unique among dependencies.
@@ -47,7 +48,7 @@ class DependencySpec
     @name      = dep[:name] or raise CeedlingException.new( 'Each dependency must have a :name.' )
     @task_name = task_name_for( @name )
     @fetch     = dep[:fetch] || {}
-    @paths     = dep[:paths] || {}
+    @paths     = standardized( dep[:paths] || {} )
     @artifacts = dep[:artifacts] || {}
 
     problem = fetch_problem
@@ -106,7 +107,7 @@ class DependencySpec
   # glob expands through `collector` against the disk, and anything else is a directory.
   def include_directories(collector)
     return Array( @artifacts[:includes] ).flat_map do |include|
-      path = File.join( artifact_path, include )
+      path = artifact_at( include )
       if include.end_with?( '.h' ) then [File.dirname( path )]
       elsif include.match?( INCLUDE_GLOB ) then collector.call( path )
       else [path]
@@ -128,7 +129,18 @@ class DependencySpec
   end
 
   def artifacts(kind)
-    return Array( @artifacts[kind] ).map { |path| File.join( artifact_path, path ) }
+    return Array( @artifacts[kind] ).map { |path| artifact_at( path ) }
+  end
+
+  # Configured paths, read as every configured path is read
+  def standardized(paths)
+    return paths.transform_values { |path| path.is_a?( String ) ? ProjectPaths.standardize( path ) : path }
+  end
+
+  # An artifact below the artifact path, or one named by an absolute path as written
+  def artifact_at(path)
+    path = ProjectPaths.standardize( path )
+    return ProjectPaths.absolute?( path ) ? path : File.join( artifact_path, path )
   end
 
   # What is wrong with the fetch configuration, or nil

data/plugins/fff/lib/fff.rb

@@ -10,6 +10,7 @@
 #   ⏩️ https://github.com/ElectronVector/fake_function_framework
 # =========================================================================
 
+require 'fileutils'
 require 'ceedling/plugins/plugin'
 require 'fff_mock_generator'
 
@@ -36,16 +37,17 @@ end # class Fff
 
 class FffCMockWrapper
 
-    def initialize(options=nil)
+  def initialize(options=nil)
     @cm_config      = CMockConfig.new(options)
     @cm_parser      = CMockHeaderParser.new(@cm_config)
-    @silent        = (@cm_config.verbosity < 2)
-
-    # These are the additional files to include in the mock files.
-    @includes_h_pre_orig_header  = (@cm_config.includes || @cm_config.includes_h_pre_orig_header || []).map{|h| h.match?(/</) ? h : "\"#{h}\""}
-    @includes_h_post_orig_header = (@cm_config.includes_h_post_orig_header || []).map{|h| h.match?(/</) ? h : "\"#{h}\""}
-    @includes_c_pre_header       = (@cm_config.includes_c_pre_header || []).map{|h| h.match?(/</) ? h : "\"#{h}\""}
-    @includes_c_post_header      = (@cm_config.includes_c_post_header || []).map{|h| h.match?(/</) ? h : "\"#{h}\""}
+    # CMock's levels: 0 errors only, 1 warnings, 2 normal, 3 verbose
+    @verbosity      = @cm_config.verbosity
+
+    # The additional files to include in the fake files, gathered as CMock gathers them
+    @includes_h_pre_orig_header  = quoted( @cm_config.includes, @cm_config.includes_h_pre_orig_header )
+    @includes_h_post_orig_header = quoted( @cm_config.includes_h_post_orig_header )
+    @includes_c_pre_header       = quoted( @cm_config.includes_c_pre_header )
+    @includes_c_post_header      = quoted( @cm_config.includes_c_post_header )
   end
 
   # Matches CMock's own entry point, which Ceedling calls with the folder a mock's
@@ -57,37 +59,14 @@ class FffCMockWrapper
   end
 
   def generate_mock(header_file_to_mock, folder=nil)
-      module_name = File.basename(header_file_to_mock, '.h')
-      puts( "Creating fake functions for #{module_name}..." ) unless @silent
-      mock_name = @cm_config.mock_prefix + module_name + @cm_config.mock_suffix
-      mock_path = folder.nil? ? @cm_config.mock_path : File.join(@cm_config.mock_path, folder)
-      if @cm_config.subdir
-          # If a subdirectory has been configured, append it to the mock path.
-          mock_path = "#{mock_path}/#{@cm_config.subdir}"
-      end
-      full_path_for_mock = "#{mock_path}/#{mock_name}"
-      c_name = c_name_for(mock_name, folder)
-
-      # Parse the header file so we know what to mock.
-      parsed_header = @cm_parser.parse(module_name, File.read(header_file_to_mock))
-
-      # Create the directory if it doesn't exist.
-      mkdir_p full_path_for_mock.pathmap("%d")
-
-      # Generate the fake function header file.
-      puts( "Creating fake functions: #{full_path_for_mock}.h" )
-
-      # Create the mock header.
-      File.open("#{full_path_for_mock}.h", 'w') do |f|
-        f.write(FffMockGenerator.create_mock_header(module_name, mock_name, parsed_header,
-          @includes_h_pre_orig_header, @includes_h_post_orig_header, c_name: c_name))
-      end
-
-      # Create the mock source file.
-      File.open("#{full_path_for_mock}.c", 'w') do |f|
-        f.write(FffMockGenerator.create_mock_source(mock_name, parsed_header,
-          @includes_c_pre_orig_header, @includes_c_post_orig_header, c_name: c_name))
-      end
+    module_name = File.basename(header_file_to_mock, '.h')
+    puts( "Creating fake functions for #{module_name}..." ) unless @verbosity < 2
+    mock_name = @cm_config.mock_prefix + module_name + @cm_config.mock_suffix
+
+    # Parse the header file so we know what to mock.
+    parsed_header = @cm_parser.parse(module_name, File.read(header_file_to_mock))
+
+    write_fake( "#{mock_path_for( folder )}/#{mock_name}", module_name, mock_name, parsed_header, c_name_for( mock_name, folder ) )
   end
 
   # The name for a fake's guard and control functions, as CMock forms it. With
@@ -103,6 +82,33 @@ class FffCMockWrapper
     return identity.gsub( %r{[-/\\.,\s]}, '_' )
   end
 
+  private
+
+  # The directory a fake is written to: the mock root, the folder its #include names,
+  # then any configured :subdir
+  def mock_path_for(folder)
+    mock_path = folder.nil? ? @cm_config.mock_path : File.join( @cm_config.mock_path, folder )
+    return @cm_config.subdir ? "#{mock_path}/#{@cm_config.subdir}" : mock_path
+  end
+
+  # Writes the fake's header and source at `path`, which ends in the mock's name
+  def write_fake(path, module_name, mock_name, parsed_header, c_name)
+    FileUtils.mkdir_p( File.dirname( path ) )
+
+    puts( "Creating fake functions: #{path}.h and #{path}.c" ) unless @verbosity < 3
+    File.write( "#{path}.h", FffMockGenerator.create_mock_header( module_name, mock_name, parsed_header,
+      @includes_h_pre_orig_header, @includes_h_post_orig_header, c_name: c_name ) )
+
+    File.write( "#{path}.c", FffMockGenerator.create_mock_source( mock_name, parsed_header,
+      @includes_c_pre_header, @includes_c_post_header, c_name: c_name ) )
+  end
+
+  # Joins include lists, each named once, as #include operands. A name holding `<` is
+  # kept as written, and any other is quoted, as CMock does.
+  def quoted(*lists)
+    return lists.compact.flatten.uniq.map { |name| name.match?( /</ ) ? name : "\"#{name}\"" }
+  end
+
 end
 
 # Switch out the CMock with FFF Mock Generator

data/plugins/fff/spec/fff_cmock_wrapper_spec.rb

@@ -0,0 +1,128 @@
+# =========================================================================
+#   Ceedling - Test-Centered Build System for C
+#   ThrowTheSwitch.org
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   SPDX-License-Identifier: MIT
+# =========================================================================
+
+require 'tmpdir'
+require 'fileutils'
+
+repo_root = File.expand_path( '../../..', __dir__ )
+$LOAD_PATH.unshift( File.join( repo_root, 'lib' ), File.join( repo_root, 'vendor/cmock/lib' ) )
+
+require 'fff.rb'
+
+# GH #1377: A fake gets the extra includes CMock would give a mock of the same header.
+# Each example runs the wrapper Ceedling swaps in for CMock, with Ceedling's own
+# :includes default, and reads back the files it writes.
+describe FffCMockWrapper do
+
+  around(:each) do |example|
+    Dir.mktmpdir do |root|
+      @root = root
+      @header = File.join( root, 'src', 'bar.h' )
+      FileUtils.mkdir_p( File.dirname( @header ) )
+      File.write( @header, "void bar_turn_on(void);\n" )
+      example.run
+    end
+  end
+
+  def fake(options = {})
+    mock_path = File.join( @root, 'mocks' )
+    config = { :mock_prefix => 'mock_', :mock_path => mock_path, :includes => [], :verbosity => 0 }
+    FffCMockWrapper.new( config.merge( options ) ).setup_mocks( @header )
+    return {
+      :h => File.readlines( File.join( mock_path, 'mock_bar.h' ), chomp: true ),
+      :c => File.readlines( File.join( mock_path, 'mock_bar.c' ), chomp: true )
+    }
+  end
+
+  def position(lines, line)
+    index = lines.index( line )
+    expect( index ).not_to be_nil, "expected #{line.inspect} in:\n#{lines.join( "\n" )}"
+    return index
+  end
+
+  def extra_includes(lines)
+    standard = ['#include <string.h>', '#include "fff.h"', '#include "fff_unity_helper.h"', '#include "bar.h"', '#include "mock_bar.h"']
+    return lines.grep( /\A#include / ) - standard
+  end
+
+  it 'adds no includes when no setting names any' do
+    files = fake
+
+    expect( extra_includes( files[:h] ) ).to eq( [] )
+    expect( extra_includes( files[:c] ) ).to eq( [] )
+  end
+
+  it 'includes :includes_c_pre_header in the source before the fake header' do
+    files = fake( :includes_c_pre_header => ['extra_c.h'] )
+
+    expect( position( files[:c], '#include "extra_c.h"' ) ).to be < position( files[:c], '#include "mock_bar.h"' )
+  end
+
+  it 'includes :includes_c_post_header in the source after the fake header' do
+    files = fake( :includes_c_post_header => ['extra_c.h'] )
+
+    expect( position( files[:c], '#include "extra_c.h"' ) ).to be > position( files[:c], '#include "mock_bar.h"' )
+  end
+
+  it 'includes :includes_h_pre_orig_header in the header before the original header' do
+    files = fake( :includes_h_pre_orig_header => ['extra_h.h'] )
+
+    expect( position( files[:h], '#include "extra_h.h"' ) ).to be < position( files[:h], '#include "bar.h"' )
+  end
+
+  it 'includes :includes_h_post_orig_header in the header after the original header' do
+    files = fake( :includes_h_post_orig_header => ['extra_h.h'] )
+
+    expect( position( files[:h], '#include "extra_h.h"' ) ).to be > position( files[:h], '#include "bar.h"' )
+  end
+
+  it 'merges :includes with :includes_h_pre_orig_header, :includes first, each once' do
+    files = fake( :includes => ['first.h', 'both.h'], :includes_h_pre_orig_header => ['both.h', 'second.h'] )
+
+    expect( extra_includes( files[:h] ) ).to eq( ['#include "first.h"', '#include "both.h"', '#include "second.h"'] )
+  end
+
+  it 'keeps an angle-bracket include as written and quotes a bare name' do
+    files = fake( :includes_c_pre_header => ['<stdint.h>', 'extra_c.h'] )
+
+    expect( extra_includes( files[:c] ) ).to eq( ['#include <stdint.h>', '#include "extra_c.h"'] )
+  end
+
+  it 'includes a Unity helper in the source after the fake header, by its path from the mock root' do
+    helper = File.join( @root, 'support', 'helper.h' )
+    FileUtils.mkdir_p( File.dirname( helper ) )
+    File.write( helper, "\n" )
+
+    files = fake( :unity_helper_path => [helper] )
+
+    expect( position( files[:c], '#include "../support/helper.h"' ) ).to be > position( files[:c], '#include "mock_bar.h"' )
+  end
+
+  # CMock's :verbosity levels: 0 errors only, 1 warnings, 2 normal, 3 verbose
+  context 'at CMock\'s verbosity levels' do
+
+    it 'prints nothing for errors only or warnings' do
+      expect { fake( :verbosity => 0 ) }.not_to output.to_stdout
+      expect { fake( :verbosity => 1 ) }.not_to output.to_stdout
+    end
+
+    it 'announces each fake at normal verbosity, as CMock announces each mock' do
+      expect { fake( :verbosity => 2 ) }.to output( "Creating fake functions for bar...\n" ).to_stdout
+    end
+
+    it 'also names the files written at verbose' do
+      path = File.join( @root, 'mocks', 'mock_bar' )
+
+      expect { fake( :verbosity => 3 ) }.to output(
+        "Creating fake functions for bar...\n" \
+        "Creating fake functions: #{path}.h and #{path}.c\n"
+      ).to_stdout
+    end
+
+  end
+
+end

data/plugins/gcov/config/defaults_gcov.rb

@@ -41,7 +41,7 @@ DEFAULT_GCOV_LINKER_TOOL = {
   }
 
 DEFAULT_GCOV_FIXTURE_TOOL = {
-  :executable => '${1}'.freeze,
+  :executable => '"${1}"'.freeze, # Test executable, quoted as a path
   :name => 'default_gcov_fixture'.freeze,
   :optional => false.freeze,
   :arguments => [].freeze

data/plugins/gcov/lib/console_reportinator.rb

@@ -6,7 +6,7 @@
 # =========================================================================
 
 require 'ceedling/constants'
-require 'ceedling/path_mirror'
+require 'ceedling/filesystem/path_mirror'
 require 'gcov_reportinator'
 
 class ConsoleReportinator < GcovReportinator
@@ -173,22 +173,8 @@ class ConsoleReportinator < GcovReportinator
   def run_gcov_summary(test, source, opts)
     filename = File.basename(source)
 
-    # A module-under-test's object (and its accompanying .gcno/.gcda) mirrors its source's own
-    # subdirectory below whichever configured root it came from -- the same convention its actual
-    # compile step already follows -- so the directory gcov is told to search must include that
-    # mirrored subdirectory too, not just the flat <build>/gcov/out/<test name> root.
-    # A generated Partial sits below its own test's Partials build root rather than a
-    # configured source root, so the source roots mirror nothing for it. Its own root is
-    # what carries the module's subdirectory.
-    roots =
-      if File.basename(source).match?(PATTERNS::PARTIAL_IMPL_FILENAME)
-        [File.join( @configurator.project_test_partials_path, test )]
-      else
-        @configurator.paths_source + @configurator.paths_support
-      end
-
-    subdir  = PathMirror.relative_subdir( source, roots )
-    obj_dir = subdir.empty? ? File.join(GCOV_BUILD_OUTPUT_PATH, test) : File.join(GCOV_BUILD_OUTPUT_PATH, test, subdir)
+    # The coverage data sits beside the object, wherever the test's build placed it
+    obj_dir = File.dirname( @file_path_utils.form_test_object_filepath( source, name: test, context: GCOV_SYM ) )
 
     # Run gcov to extract the coverage summary
     command = @tool_executor.build_command_line(
@@ -197,7 +183,7 @@ class ConsoleReportinator < GcovReportinator
       (opts[:gcov_mcdc] ? ['-g'] : []),
       # Argument replacement
       filename, # .c source file compiled with coverage
-      obj_dir # <build>/gcov/out/<test name>[/mirrored subdir] for coverage data files
+      obj_dir # <build>/gcov/out/<test name>[/source directory] for coverage data files
     )
 
     # Do not raise an exception if `gcov` terminates with a non-zero exit code, just note it and move on.

data/plugins/gcov/lib/gcov.rb

@@ -12,6 +12,7 @@ require 'gcov_constants'
 require 'gcov_types'
 require 'gcov_reportinator'
 require 'console_reportinator'
+require 'gcovr_thresholds'
 require 'gcovr_reportinator'
 require 'reportgenerator_reportinator'
 
@@ -141,7 +142,7 @@ class Gcov < Plugin
 
       # Full filepaths (not basenames)
       header = "Untested source files not in the coverage report (:untested_sources is :list):"
-      @loginator.log_list( untested_sources.sort, header, Verbosity::COMPLAIN, LogLabels::WARNING )
+      @loginator.log_list( untested_sources.sort, header, Verbosity::COMPLAIN )
 
     when GCOV_UNTESTED_SOURCES_COMPILE
       validate_mcdc_gcc_version!
@@ -163,7 +164,7 @@ class Gcov < Plugin
       untested_sources.each do |filepath|
         filename     = File.basename(filepath)
         object       = @file_path_utils.form_test_object_filepath( filepath, context:GCOV_SYM )
-        dependencies = @file_path_utils.form_test_dependencies_filepath( filepath, context:GCOV_SYM )
+        dependencies = @file_path_utils.form_test_dependencies_filepath( object, context:GCOV_SYM )
         search_paths = @configurator.collection_paths_include
         # Defines and flags resolve as a tested source's do, against this source's filepath
         defines      = @test_build_setup.context_defines( context:GCOV_SYM, filepath:filepath )
@@ -196,6 +197,9 @@ class Gcov < Plugin
           next
         end
 
+        @file_wrapper.mkdir( File.dirname( object ) )
+        @file_wrapper.mkdir( File.dirname( dependencies ) )
+
         begin
           @generator.generate_object_file_c(
             tool:         TOOLS_GCOV_COMPILER,
@@ -382,6 +386,9 @@ class Gcov < Plugin
 
       begin
         reportinator.generate_reports( @configurator.project_config_hash )
+      rescue GcovrThresholdError => ex
+        # Each violated threshold is its own build failure
+        ex.violations.each { |violation| @ceedling[:plugin_manager].register_build_failure( GCOV_SYM, violation ) }
       rescue => ex
         # Register the exception as a build failure
         @ceedling[:plugin_manager].register_build_failure( GCOV_SYM, ex.message )

data/plugins/gcov/lib/gcovr_reportinator.rb

@@ -7,8 +7,10 @@
 
 require 'ceedling/exceptions'
 require 'ceedling/constants'
+require 'ceedling/filename_extension'
 require 'gcov_types'
 require 'gcov_reportinator'
+require 'gcovr_thresholds'
 
 class GcovrReportinator < GcovReportinator
 
@@ -507,9 +509,8 @@ class GcovrReportinator < GcovReportinator
     data = build_exclusion_data
     patterns = []
 
-    # A source extension can be configured as more than one string, so its escaped forms
-    # are joined into one alternation rather than assuming there's only ever one to match.
-    src_extension_alternation = data[:src_extension].to_a.map { |ext| Regexp.escape(ext) }.join('|')
+    # A source extension can be configured as more than one string, so any one of them matches
+    src_extension_alternation = FilenameExtension.new( data[:src_extension] ).pattern
     test_prefix = Regexp.escape(data[:test_prefix].to_s)
     build_root = Regexp.escape(strip_leading_dot_slash(data[:build_root].to_s))
 
@@ -576,23 +577,6 @@ class GcovrReportinator < GcovReportinator
   end
 
 
-  # Returns the error message text from gcovr stderr, or nil if none found.
-  # Matches lines beginning with "error" or "(ERROR)" and extracts the trailing message.
-  def extract_gcovr_error_message(shell_result)
-    return nil if shell_result.nil?
-
-    stderr = shell_result[:stderr]
-    return nil if stderr.nil? || stderr.empty?
-
-    stderr.each_line do |line|
-      match = line.match( /^\(?error\S*\s+(.+)/i )
-      return match[1].strip.capitalize if match
-    end
-
-    nil
-  end
-
-
   # Extract the last contiguous block of lines containing '%' from gcovr stdout.
   # gcovr --print-summary emits lines like "lines: 69.6% (80 out of 115)" — this
   # locates that block generically without depending on exact line labels.
@@ -620,33 +604,17 @@ class GcovrReportinator < GcovReportinator
   end
 
 
-  # Output to console a human-friendly message on certain coverage failure exit codes.
-  # Prefers the actual gcovr error text from stderr; falls back to descriptive strings.
-  # gcovr's composite exit code bit-ORs every violated :fail_under_* threshold together --
-  # every violated bit is collected and reported, not just whichever is checked first.
+  # Reports every :fail_under_* threshold a gcovr run violated, raising when boom is set and
+  # logging otherwise. Returns whether the exit code holds a problem no threshold explains.
   def gcovr_exec_exception?(opts, exitcode, boom, shell_result=nil)
-    violations = []
-
-    {
-      2  => [:fail_under_line,     'Line'],
-      4  => [:fail_under_branch,   'Branch'],
-      8  => [:fail_under_decision, 'Decision'],
-      16 => [:fail_under_function, 'Function'],
-    }.each do |bit, (option, label)|
-      next unless ((exitcode & bit) == bit) && !opts[option].nil?
-
-      fallback = "#{label} coverage is less than the configured minimum of #{opts[option]}%"
-      violations << "Gcovr ⏩️ #{extract_gcovr_error_message( shell_result ) || fallback}"
-      exitcode &= ~bit
-    end
+    violations, exitcode = GcovrThresholds.decode( opts: opts, exitcode: exitcode, stderr: shell_result&.dig( :stderr ) )
 
     if boom
-      raise CeedlingException.new( violations.join("\n") ) unless violations.empty?
+      raise GcovrThresholdError.new( violations ) unless violations.empty?
     else
       violations.each { |msg| @loginator.log( msg, Verbosity::COMPLAIN ) }
     end
 
-    # A non-zero exit code is a problem
     return (exitcode != 0)
   end