ceedling 1.0.1 → 1.1.0

data/lib/ceedling/{configurator_builder.rb → config/configurator_builder.rb}

@@ -13,7 +13,7 @@ require 'ceedling/constants'       # for Verbosity constants class & base file p
 
 class ConfiguratorBuilder
 
-  constructor :file_path_collection_utils, :file_wrapper, :system_wrapper
+  constructor :file_path_collection_utils, :loginator, :file_wrapper, :system_wrapper
 
 
   def build_global_constant(elem, value)
@@ -105,7 +105,8 @@ class ConfiguratorBuilder
 
   def cleanup(in_hash)
     # Ensure that include files inserted into test runners have file extensions & proper ones at that
-    in_hash[:test_runner_includes].map!{|include| include.ext(in_hash[:extension_header])}
+    # TODO: Remove once we know it can be removed
+    # in_hash[:test_runner_includes].map!{|include| include.ext(in_hash[:extension_header])}
   end
 
 
@@ -131,6 +132,8 @@ class ConfiguratorBuilder
       [:project_test_dependencies_path,         File.join(project_build_tests_root, 'dependencies'),      true ],
 
       [:project_build_vendor_unity_path,        File.join(project_build_vendor_root, 'unity', 'src'),       true ],
+      # Always include a Ceedling path (even if empty) as we need a search path present for certain preprocessing steps
+      [:project_build_vendor_ceedling_path,     File.join(project_build_vendor_root, 'ceedling'),           true ],
       [:project_build_vendor_cmock_path,        File.join(project_build_vendor_root, 'cmock', 'src'),       in_hash[:project_use_mocks] ],
       [:project_build_vendor_cexception_path,   File.join(project_build_vendor_root, 'c_exception', 'lib'), in_hash[:project_use_exceptions] ],
 
@@ -143,6 +146,8 @@ class ConfiguratorBuilder
 
       [:project_test_preprocess_includes_path,  File.join(project_build_tests_root, 'preprocess/includes'), (in_hash[:project_use_test_preprocessor] != :none) ],
       [:project_test_preprocess_files_path,     File.join(project_build_tests_root, 'preprocess/files'),    (in_hash[:project_use_test_preprocessor] != :none) ],
+
+      [:project_test_partials_path,             File.join(project_build_tests_root, 'partials'),            in_hash[:project_use_partials] ],
     ]
 
     out_hash[:project_build_paths] = []
@@ -226,7 +231,6 @@ class ConfiguratorBuilder
     }
   end
 
-
   def set_test_preprocessor_accessors(in_hash)
     accessors = {}
 
@@ -288,6 +292,7 @@ class ConfiguratorBuilder
   def collect_source_include_vendor_paths(in_hash)
     extra_paths = []
     extra_paths <<  in_hash[:project_build_vendor_cexception_path] if (in_hash[:project_use_exceptions])
+    extra_paths <<  in_hash[:project_build_vendor_ceedling_path] if (in_hash[:project_use_partials])
 
     return {
       :collection_paths_source_include_vendor =>
@@ -332,10 +337,13 @@ class ConfiguratorBuilder
     # Force Rake::FileList to expand patterns to ensure it happens (FileList is a bit unreliable)
     all_tests.resolve()
 
-    return {
+    revised_list = @file_path_collection_utils.revise_filelist( all_tests, in_hash[:files_test] )
+    collection = {
       # Add / subtract files via :files ↳ :test
-      :collection_all_tests => @file_path_collection_utils.revise_filelist( all_tests, in_hash[:files_test] )
+      :collection_all_tests => revised_list
     }
+
+    return collection, revised_list
   end
 
 
@@ -365,7 +373,7 @@ class ConfiguratorBuilder
   end
 
 
-  def collect_source(in_hash)
+  def collect_source(in_hash, test_list)
     all_source = @file_wrapper.instantiate_file_list
 
     in_hash[:collection_paths_source].each do |path|
@@ -375,6 +383,16 @@ class ConfiguratorBuilder
     # Force Rake::FileList to expand patterns to ensure it happens (FileList is a bit unreliable)
     all_source.resolve()
 
+    # Identify any test files that accidentally landed in the source list due to path list overlap and remove them
+    mixed_in = test_list.select { |t| all_source.include?( t ) }
+    unless mixed_in.empty?
+      all_source.exclude( *mixed_in )
+      @loginator.log(
+        "Test file paths and source file paths overlap -- test files have been filtered out of the source file collection",
+        Verbosity::COMPLAIN
+      )
+    end
+
     return {
       # Add / subtract files via :files ↳ :source
       :collection_all_source => @file_path_collection_utils.revise_filelist( all_source, in_hash[:files_source] )
@@ -551,6 +569,7 @@ class ConfiguratorBuilder
     vendor_paths << in_hash[:project_build_vendor_unity_path]
     vendor_paths << in_hash[:project_build_vendor_cmock_path]       if (in_hash[:project_use_mocks])
     vendor_paths << in_hash[:project_build_vendor_cexception_path]  if (in_hash[:project_use_exceptions])
+    vendor_paths << in_hash[:project_build_vendor_ceedling_path]    if (in_hash[:project_use_partials])
 
     return vendor_paths
   end

data/lib/ceedling/{configurator_plugins.rb → config/configurator_plugins.rb}

@@ -1,7 +1,7 @@
 # =========================================================================
 #   Ceedling - Test-Centered Build System for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2010-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 
@@ -72,11 +72,10 @@ class ConfiguratorPlugins
   # Gather up and return .rake filepaths that exist in plugin paths
   def find_rake_plugins(config, plugin_paths)
     @rake_plugins = []
-    plugins_with_path = []
 
     config[:plugins][:enabled].each do |plugin|
       if path = plugin_paths[(plugin + '_path').to_sym]
-        rake_plugin_path = File.join(path, "#{plugin}.rake")
+        rake_plugin_path = File.join( path, "#{plugin}.rake" )
         if @file_wrapper.exist?( rake_plugin_path )
           @rake_plugins << {:plugin => plugin, :path => rake_plugin_path}
         end
@@ -108,7 +107,6 @@ class ConfiguratorPlugins
   # Gather up and return config .yml filepaths that exist in plugin paths + config/
   def find_config_plugins(config, plugin_paths)
     @config_plugins = []
-    plugins_with_path = []
 
     config[:plugins][:enabled].each do |plugin|
       if path = plugin_paths[(plugin + '_path').to_sym]

data/lib/ceedling/{configurator_setup.rb → config/configurator_setup.rb}

@@ -1,7 +1,7 @@
 # =========================================================================
 #   Ceedling - Test-Centered Build System for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2010-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 
@@ -45,11 +45,8 @@ class ConfiguratorSetup
   end
 
   def build_directory_structure(flattened_config)
-    msg = "Build paths:"
-    flattened_config[:project_build_paths].each do |path|
-      msg += "\n - #{(path.nil? or path.empty?) ? '<empty>' : path}"
-    end
-    @loginator.log( msg, Verbosity::DEBUG )
+    _paths = flattened_config[:project_build_paths].map { |p| (p.nil? || p.empty?) ? '<empty>' : p }
+    @loginator.log_list( _paths, "Build paths:", Verbosity::DEBUG )
 
     flattened_config[:project_build_paths].each do |path|
       if path.nil? or path.empty?
@@ -82,11 +79,22 @@ class ConfiguratorSetup
       flattened_config[:project_build_vendor_cexception_path]
     ) if flattened_config[:project_use_exceptions]
 
-    # Copy backtrace debugging script into build/test directory structure
+    # Copy backtrace debugging script into build/test directory structure.
+    # Ensure the destination exists first — it may not on a fresh build since
+    # Rake's :directories task runs later than this configuration-time setup.
+    if flattened_config[:project_use_backtrace] == :gdb
+      @file_wrapper.mkdir( flattened_config[:project_build_tests_root] )
+      @file_wrapper.cp_r(
+        File.join( ceedling_lib_path, BACKTRACE_GDB_SCRIPT_FILE ),
+        flattened_config[:project_build_tests_root]
+      )
+    end
+
+    # Copy supporting partials code into build/vendor directory structure
     @file_wrapper.cp_r(
-      File.join( ceedling_lib_path, BACKTRACE_GDB_SCRIPT_FILE ),
-      flattened_config[:project_build_tests_root]
-    ) if flattened_config[:project_use_backtrace] == :gdb
+      File.join( ceedling_lib_path, CEEDLING_HEADER_FILEPATH ),
+      flattened_config[:project_build_vendor_ceedling_path]
+    ) if flattened_config[:project_use_partials]
   end
 
   def build_project_collections(flattened_config)
@@ -98,9 +106,13 @@ class ConfiguratorSetup
     flattened_config.merge!( @configurator_builder.collect_source_include_vendor_paths( flattened_config ) )
     flattened_config.merge!( @configurator_builder.collect_test_support_source_include_paths( flattened_config ) )
     flattened_config.merge!( @configurator_builder.collect_test_support_source_include_vendor_paths( flattened_config ) )
-    flattened_config.merge!( @configurator_builder.collect_tests( flattened_config ) )
+
+    # Collect tests: (1) To be merged (2) To filter out of sources (preventing accidental mixing of tests and source)
+    tests_collection, tests_list = @configurator_builder.collect_tests( flattened_config )
+    flattened_config.merge!( tests_collection )
+
     flattened_config.merge!( @configurator_builder.collect_assembly( flattened_config ) )
-    flattened_config.merge!( @configurator_builder.collect_source( flattened_config ) )
+    flattened_config.merge!( @configurator_builder.collect_source( flattened_config, tests_list ) )
     flattened_config.merge!( @configurator_builder.collect_headers( flattened_config ) )
     flattened_config.merge!( @configurator_builder.collect_release_build_input( flattened_config ) )
     flattened_config.merge!( @configurator_builder.collect_existing_test_build_input( flattened_config ) )
@@ -224,6 +236,10 @@ class ConfiguratorSetup
     #       - FOO
     #       - BAR
 
+    # These contexts support filename matchers optionally. Others can only contain simple lists
+    contexts_supporting_matchers = [:test, :preprocess]
+    contexts_supporting_matchers << :gcov if (_config && _config[:plugins] && _config[:plugins][:enabled] && _config[:plugins][:enabled].include?('gcov'))
+
     defines.each_pair do |context, config|
       walk = @reportinator.generate_config_walk( [:defines, context] )
 
@@ -231,7 +247,7 @@ class ConfiguratorSetup
       next if context == :use_test_definition
 
       # Matcher contexts (only contexts that support matcher hashes)
-      if context == :test or context == :preprocess
+      if contexts_supporting_matchers.include? context
         if config.class != Array and config.class != Hash
           msg = "#{walk} entry '#{config}' must be a list or matcher, not #{config.class.to_s.downcase} (see docs for examples)"
           @loginator.log( msg, Verbosity::ERRORS )
@@ -242,7 +258,7 @@ class ConfiguratorSetup
       else
         # Handle the (probably) common case of trying to use matchers for any context other than :test or :preprocess
         if config.class == Hash
-          msg = "#{walk} entry '#{config}' must be a list--matcher hashes only availalbe for :test & :preprocess contexts (see docs for details)"
+          msg = "#{walk} entry '#{config}' must be a list; matcher hashes are only available for :test & :preprocess contexts (see docs for details)"
           @loginator.log( msg, Verbosity::ERRORS )
           valid = false
         # Catchall for any oddball entries
@@ -414,6 +430,10 @@ class ConfiguratorSetup
     #       :<matcher>:
     #         - --flag
 
+    # These contexts support filename matchers optionally. Others can only contain simple lists
+    contexts_supporting_matchers = [:test]
+    contexts_supporting_matchers << :gcov if (_config && _config[:plugins] && _config[:plugins][:enabled] && _config[:plugins][:enabled].include?('gcov'))
+
     flags.each_pair do |context, operations|
       operations.each_pair do |operation, config|
         walk = @reportinator.generate_config_walk( [:flags, context, operation] )
@@ -427,7 +447,7 @@ class ConfiguratorSetup
         end
 
         # :test context operations with lists or matchers (hashes)
-        if context == :test
+        if contexts_supporting_matchers.include? context
           if config.class != Array and config.class != Hash
             msg = "#{walk} entry '#{config}' must be a list or matcher hash, not #{config.class.to_s.downcase} (see docs for examples)"
             @loginator.log( msg, Verbosity::ERRORS )
@@ -438,7 +458,7 @@ class ConfiguratorSetup
         else
           # Handle the (probably) common case of trying to use matchers for operations in any context other than :test
           if config.class == Hash
-            msg = "#{walk} entry '#{config}' must be a list--matcher hashes only availalbe for :test context (see docs for details)"
+            msg = "#{walk} entry '#{config}' must be a list; matcher hashes are only available for :test context (see docs for details)"
             @loginator.log( msg, Verbosity::ERRORS )
             valid = false
           # Catchall for any oddball entries
@@ -575,24 +595,6 @@ class ConfiguratorSetup
   end
 
 
-  def validate_deep_preprocessor(config)
-    valid = true
-
-    options = [:none, :mocks]
-
-    use_deep_preprocessor = config[:project][:use_deep_preprocessor]
-
-    if !options.include?( use_deep_preprocessor )
-      walk = @reportinator.generate_config_walk( [:project, :use_deep_preprocessor] )
-      msg = "#{walk} is ':#{use_deep_preprocessor}' but must be one of {#{options.map{|o| ':' + o.to_s()}.join(', ')}}"
-      @loginator.log( msg, Verbosity::ERRORS )
-      valid = false
-    end
-
-    return valid
-  end
-
-
   def validate_environment_vars(config)
     environment = config[:environment]
 
@@ -756,44 +758,10 @@ class ConfiguratorSetup
     return ( (missing_plugins.size > 0) ? false : true )
   end
 
+  # Hook for any warnings about configuration combinations that are legal but likely
+  # unintentional or surprising.
   def warnings_for_problematic_configs(config)
-    warning_for_parameterized_tests_with_preprocessing( config )
-    warning_for_deep_preprocessor_without_preprocessing( config )
+    # Empty
   end
 
-  ### Private
-
-  private
-
-  def warning_for_parameterized_tests_with_preprocessing(config)
-    # Unity parameterized tests incompatible with Ceedling test file preprocessing
-    test_preprocessing = 
-      (config[:project][:use_test_preprocessor] == :tests) ||
-      (config[:project][:use_test_preprocessor] == :all)
-
-    if ((config[:unity][:use_param_tests] == true) and test_preprocessing)
-      setting_sym = config[:project][:use_test_preprocessor]
-      msg = "Unity's parameterized test macros are enabled [:unity ↳ :use_param_tests] " \
-            "but are incompatible with Ceedling's preprocessing of test files " \
-            "[:project ↳ :use_test_preprocessor => :#{setting_sym}]. See docs for more. " \
-            "Compilation of your test cases will probably fail."
-      @loginator.log( msg, Verbosity::COMPLAIN )
-    end
-  end
-
-  def warning_for_deep_preprocessor_without_preprocessing(config)
-    # :use_deep_preprocessor set without :use_test_preprocessor for mocks
-    mock_preprocessing = 
-      (config[:project][:use_test_preprocessor] == :mocks) ||
-      (config[:project][:use_test_preprocessor] == :all)
-
-    if ((config[:project][:use_deep_preprocessor] == :mocks) and !mock_preprocessing)
-      msg = "The deep dependencies preprocessor configuration setting [:project ↳ :use_deep_preprocessor => :mocks] " \
-            "is only useful when Ceedling's test preprocessing feature is also enabled and configured for mocks. " \
-            "See docs for more."
-      @loginator.log( msg, Verbosity::COMPLAIN )
-    end
-  end
-
-
 end

data/lib/ceedling/{configurator_validator.rb → config/configurator_validator.rb}

@@ -1,7 +1,7 @@
 # =========================================================================
 #   Ceedling - Test-Centered Build System for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2010-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 

data/lib/ceedling/constants.rb

@@ -1,7 +1,7 @@
 # =========================================================================
 #   Ceedling - Test-Centered Build System for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2010-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 
@@ -26,18 +26,21 @@ VERBOSITY_OPTIONS = {
 
 # Label + decorator options for logging
 class LogLabels
-  NONE       =  0  # Override logic and settings with no label and no decoration
-  AUTO       =  1  # Default labeling and decorators
-  NOTICE     =  2  # decorator + 'NOTICE:'
-  WARNING    =  3  # decorator + 'WARNING:'
-  ERROR      =  4  # decorator + 'ERROR:'
-  EXCEPTION  =  5  # decorator + 'EXCEPTION:'
-  CONSTRUCT  =  6  # decorator only
-  RUN        =  7  # decorator only
-  CRASH      =  8  # decorator only
-  PASS       =  9  # decorator only
-  FAIL       = 10  # decorator only
-  TITLE      = 11  # decorator only
+  NONE          =  0  # Override logic and settings with no label and no decoration
+  AUTO          =  1  # Default labeling and decorators
+  NOTICE        =  2  # decorator + 'NOTICE:'
+  WARNING       =  3  # decorator + 'WARNING:'
+  ERROR         =  4  # decorator + 'ERROR:'
+  EXCEPTION     =  5  # decorator + 'EXCEPTION:'
+  CONSTRUCT     =  6  # decorator only
+  RUN           =  7  # decorator only
+  CRASH         =  8  # decorator only
+  PASS          =  9  # decorator only
+  FAIL          = 10  # decorator only
+  TITLE         = 11  # decorator only
+  DOCUMENTATION = 12  # decorator only
+  COMMERCIAL    = 13  # decorator only
+  REQUEST       = 14  # decorator only
 
   # Verbosity levels ERRORS – DEBUG default to certain labels or lack thereof
   # The above label constants are available to override Loginator's default AUTO level as needed
@@ -65,13 +68,42 @@ class StdErrRedirect
   TCSH = :tcsh
 end
 
+EXTENSION_WIN_EXE     = '.exe'
+EXTENSION_NONWIN_EXE  = '.out'
+
+# Vendor frameworks, generated mocks, generated runners are always .c files
+EXTENSION_CORE_HEADER = '.h'
+EXTENSION_CORE_SOURCE = '.c'
+
+CEEDLING_HEADER_FILENAME = 'ceedling.h'
+CEEDLING_HEADER_FILEPATH = CEEDLING_HEADER_FILENAME # lib/ceedling/
+PARTIAL_FILENAME_PREFIX  = 'ceedling_partial_'
+
 class PATTERNS
   GLOB = /[\*\?\{\}\[\]]/
+
   RUBY_STRING_REPLACEMENT = /#\{.+\}/
   TOOL_EXECUTOR_ARGUMENT_REPLACEMENT = /(\$\{(\d+)\})/
+
   TEST_STDOUT_STATISTICS  = /\n-+\s*(\d+)\s+Tests\s+(\d+)\s+Failures\s+(\d+)\s+Ignored\s+(OK|FAIL)\s*/i
+
+  USER_INCLUDE_DIRECTIVE_FILENAME = /#\s*include\s+\"\s*([\/\w\.\-]+)\s*\"/
+  SYSTEM_INCLUDE_DIRECTIVE_FILENAME = /#\s*include\s+<\s*([\/\w\.\-]+)\s*>/
+
   TEST_SOURCE_FILE  = /TEST_SOURCE_FILE\s*\(\s*\"\s*([^"]+)\s*\"\s*\)/
   TEST_INCLUDE_PATH = /TEST_INCLUDE_PATH\s*\(\s*\"\s*([^"]+)\s*\"\s*\)/
+
+  # Unity's TEST_CASE()/TEST_RANGE()/TEST_MATRIX() are positional marker macros.
+  # Unity's runner generator only honors one when it sits (whitespace only in between) 
+  # directly ahead of the `void test_Foo(...)` it configures.
+  # Captures one or more stacked calls (group 1) plus the name of the function they 
+  # immediately precede (group 2). So, callers can re-associate the macro text with its 
+  # function after preprocessing has separated them.
+  # The non-greedy `\(.*?\)` shares Unity's own limitation of not handling nested parens
+  # in macro arguments (see generate_test_runner.rb's identical fragment) -- parity, not a gap.
+  TEST_CASE_DIRECTIVE = /((?:[ \t]*(?:TEST_CASE|TEST_RANGE|TEST_MATRIX)\s*\(.*?\)\s*)+)void\s+(\w+)\s*\(/m
+
+  PARTIAL_IMPL_FILENAME = /\A#{PARTIAL_FILENAME_PREFIX}.+_impl#{Regexp.escape(EXTENSION_CORE_SOURCE)}\z/
 end
 
 GIT_COMMIT_SHA_FILENAME = 'GIT_COMMIT_SHA'
@@ -79,15 +111,18 @@ GIT_COMMIT_SHA_FILENAME = 'GIT_COMMIT_SHA'
 # Escaped newline literal (literally double-slash-n) for "encoding" multiline strings as single string
 NEWLINE_TOKEN = '\\n'
 
+MIXIN_SIGIL_INLINE_YAML = '='
+MIXIN_SIGIL_FILEPATH    = '@'
+
 DEFAULT_PROJECT_FILENAME = 'project.yml'
 DEFAULT_BUILD_LOGS_PATH = 'logs'
 
+DOCS_SITE_LOCAL_PATH = 'site-local'
+
 GENERATED_DIR_PATH = [['vendor', 'ceedling'], 'src', "test", ['test', 'support'], 'build'].each{|p| File.join(*p)}
 
-EXTENSION_WIN_EXE     = '.exe'
-EXTENSION_NONWIN_EXE  = '.out'
-# Vendor frameworks, generated mocks, generated runners are always .c files
-EXTENSION_CORE_SOURCE = '.c' 
+# String used in generated include guards
+CEEDLING_GENERATED = 'CEEDLING_GENERATED'
 
 PREPROCESS_SYM = :preprocess
 
@@ -136,15 +171,21 @@ OPERATION_COMPILE_SYM     = :compile    unless defined?(OPERATION_COMPILE_SYM)
 OPERATION_ASSEMBLE_SYM    = :assemble   unless defined?(OPERATION_ASSEMBLE_SYM)
 OPERATION_LINK_SYM        = :link       unless defined?(OPERATION_LINK_SYM)
 
+PREPROCESS_STANDINS_DIR  = 'standins'
 PREPROCESS_FULL_EXPANSION_DIR  = 'full_expansion'
 PREPROCESS_DIRECTIVES_ONLY_DIR = 'directives_only'
+PREPROCESS_RAW_DIRECTIVES_ONLY_DIR = 'directives_only/raw'
+
+BUILD_OUT_DIR          = 'out'
+BUILD_RESULTS_DIR      = 'results'
+BUILD_DEPENDENCIES_DIR = 'dependencies'
 
 NULL_FILE_PATH = '/dev/null'
 
 TESTS_BASE_PATH   = TEST_ROOT_NAME
 RELEASE_BASE_PATH = RELEASE_ROOT_NAME
 
-VENDORS_FILES = %w(unity UnityHelper cmock CException).freeze
+VENDORS_FILES = %w(unity UnityHelper cmock CException ceedling).freeze
 
 # Ruby Here
 UNITY_TEST_RESULTS_TEMPLATE = <<~UNITY_TEST_RESULTS

data/lib/ceedling/defaults.rb

@@ -1,7 +1,7 @@
 # =========================================================================
 #   Ceedling - Test-Centered Build System for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2010-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 
@@ -73,15 +73,19 @@ DEFAULT_TEST_FIXTURE_SIMPLE_BACKTRACE_TOOL = {
     ].freeze
   }
 
-DEFAULT_TEST_SHALLOW_INCLUDES_PREPROCESSOR_TOOL = {
+
+# Extracts all dependencies as make-style rules.
+# We use this to extract a bare list includes (user + system) from files.
+DEFAULT_TEST_BARE_INCLUDES_PREPROCESSOR_TOOL = {
   :executable => FilePathUtils.os_executable_ext('gcc').freeze,
-  :name => 'default_test_shallow_includes_preprocessor'.freeze,
+  :name => 'default_test_bare_includes_preprocessor'.freeze,
   :optional => false.freeze,
   :arguments => [
     '-E'.freeze,             # Run only through preprocessor stage with its output
-    '-MM'.freeze,            # Output make rule + suppress header files found in system header directories
+    '-M'.freeze,             # Output make rule of dependencies including system includes
     '-MG'.freeze,            # Assume missing header files are generated files (do not discard)
     '-MP'.freeze,            # Create make "phony" rules for each include dependency
+    "-I\"${4}\"".freeze,     # Per-test shallow includes essential search paths (e.g. Ceedling vendor path)
     "-D\"${2}\"".freeze,     # Per-test executable defines
     "-DGNU_COMPILER".freeze, # OSX clang
     '-nostdinc'.freeze,      # Ignore standard include paths
@@ -90,40 +94,25 @@ DEFAULT_TEST_SHALLOW_INCLUDES_PREPROCESSOR_TOOL = {
     ].freeze
   }
 
-DEFAULT_TEST_NESTED_INCLUDES_PREPROCESSOR_TOOL = {
-  :executable => FilePathUtils.os_executable_ext('gcc').freeze,
-  :name => 'default_test_nested_includes_preprocessor'.freeze,
-  :optional => false.freeze,
-  :arguments => [
-    '-E'.freeze,             # Run only through preprocessor stage with its output
-    '-MM'.freeze,            # Output make rule + suppress header files found in system header directories
-    '-MG'.freeze,            # Assume missing header files are generated files (do not discard)
-    '-H'.freeze,             # Also output #include list with depth
-    "-I\"${2}\"".freeze,     # Per-test executable search paths
-    "-D\"${3}\"".freeze,     # Per-test executable defines
-    "-DGNU_COMPILER".freeze, # OSX clang
-    '-nostdinc'.freeze,      # Ignore standard include paths
-    "-x c".freeze,           # Force C language
-    "\"${1}\"".freeze
-    ].freeze
-  }
-
+# Fully expands a given file through the preprocessor
+# Processes #ifdefs, expands macros, etc.
 DEFAULT_TEST_FILE_FULL_PREPROCESSOR_TOOL = {
   :executable => FilePathUtils.os_executable_ext('gcc').freeze,
   :name => 'default_test_file_full_preprocessor'.freeze,
   :optional => false.freeze,
   :arguments => [
     '-E'.freeze,
-    "-I\"${4}\"".freeze, # Per-test executable search paths
-    "-D\"${3}\"".freeze, # Per-test executable defines
+    "-I\"${4}\"".freeze,     # Per-test executable search paths
+    "-D\"${3}\"".freeze,     # Per-test executable defines
     "-DGNU_COMPILER".freeze, # OSX clang
-    # '-nostdinc'.freeze, # disabled temporarily due to stdio access violations on OSX
     "-x c".freeze,           # Force C language
     "\"${1}\"".freeze,
     "-o \"${2}\"".freeze
     ].freeze
   }
 
+# Expands a given file through the preprocessor, preserving directives (macros, includes, etc.).
+# Can be used to extract includes (differentiating system and user indludes) and non-code directives.
 DEFAULT_TEST_FILE_DIRECTIVES_ONLY_PREPROCESSOR_TOOL = {
   :executable => FilePathUtils.os_executable_ext('gcc').freeze,
   :name => 'default_test_file_directives_only_preprocessor'.freeze,
@@ -133,7 +122,6 @@ DEFAULT_TEST_FILE_DIRECTIVES_ONLY_PREPROCESSOR_TOOL = {
     "-I\"${4}\"".freeze, # Per-test executable search paths
     "-D\"${3}\"".freeze, # Per-test executable defines
     "-DGNU_COMPILER".freeze, # OSX clang
-    # '-nostdinc'.freeze, # disabled temporarily due to stdio access violations on OSX
     "-x c".freeze,           # Force C language
     "-fdirectives-only",     # Only preprocess directives
     "\"${1}\"".freeze,
@@ -141,13 +129,6 @@ DEFAULT_TEST_FILE_DIRECTIVES_ONLY_PREPROCESSOR_TOOL = {
     ].freeze
   }
 
-# Disable the -MD flag for OSX LLVM Clang, since unsupported
-if RUBY_PLATFORM =~ /darwin/ && `gcc --version 2> /dev/null` =~ /Apple LLVM version .* \(clang/m # OSX w/LLVM Clang
-  MD_FLAG = '' # Clang doesn't support the -MD flag
-else
-  MD_FLAG = '-MD'
-end
-
 DEFAULT_RELEASE_DEPENDENCIES_GENERATOR_TOOL = {
   :executable => FilePathUtils.os_executable_ext('gcc').freeze,
   :name => 'default_release_dependencies_generator'.freeze,
@@ -161,12 +142,11 @@ DEFAULT_RELEASE_DEPENDENCIES_GENERATOR_TOOL = {
     "-DGNU_COMPILER".freeze,
     "-MT \"${3}\"".freeze,
     '-MM'.freeze,
-    MD_FLAG.freeze,
+    '-MD'.freeze,
     '-MG'.freeze,
     "-MF \"${2}\"".freeze,
     "-x c".freeze, # Force C language
     "-c \"${1}\"".freeze,
-    # '-nostdinc'.freeze,
     ].freeze
   }
 
@@ -249,10 +229,12 @@ DEFAULT_TOOLS_TEST_ASSEMBLER = {
 
 DEFAULT_TOOLS_TEST_PREPROCESSORS = {
   :tools => {
-    :test_shallow_includes_preprocessor      => DEFAULT_TEST_SHALLOW_INCLUDES_PREPROCESSOR_TOOL,
-    :test_nested_includes_preprocessor       => DEFAULT_TEST_NESTED_INCLUDES_PREPROCESSOR_TOOL,
-    :test_file_full_preprocessor             => DEFAULT_TEST_FILE_FULL_PREPROCESSOR_TOOL,
-    :test_file_directives_only_preprocessor  => DEFAULT_TEST_FILE_DIRECTIVES_ONLY_PREPROCESSOR_TOOL,
+    # Extracts include directives as make-style depenedencies
+    :test_bare_includes_preprocessor  => DEFAULT_TEST_BARE_INCLUDES_PREPROCESSOR_TOOL,
+    # Fully expands a given file through the preprocessor
+    :test_file_full_preprocessor              => DEFAULT_TEST_FILE_FULL_PREPROCESSOR_TOOL,
+    # Expands a given file through the preprocessor, preserving directives (macros, includes, etc.)
+    :test_file_directives_only_preprocessor   => DEFAULT_TEST_FILE_DIRECTIVES_ONLY_PREPROCESSOR_TOOL,
     }
   }
 
@@ -281,12 +263,13 @@ DEFAULT_RELEASE_TARGET_NAME = 'project'
 DEFAULT_CEEDLING_PROJECT_CONFIG = {
   :project => {
     # :build_root must be set by user
+    :name => '',
     :use_mocks => true,
     :use_exceptions => false,
+    :use_partials => false,
+    :use_test_preprocessor => :none,
     :compile_threads => 1,
     :test_threads => 1,
-    :use_test_preprocessor => :none,
-    :use_deep_preprocessor => :none,
     :test_file_prefix => 'test_',
     :release_build => false,
     :use_backtrace => :simple
@@ -299,8 +282,12 @@ DEFAULT_CEEDLING_PROJECT_CONFIG = {
     },
 
   :test_build => {
-    :use_assembly => false
-    },
+    :use_assembly => false,
+    # Force fallback text-based preprocessing regardless of preprocessor capability.
+    # Primarily useful for testing the fallback path and for toolchains that report
+    # false support for -fdirectives-only. Default: false (use preprocessor when available).
+    :preprocess_force_fallback => false,
+  },
 
   # Unlike other top-level entries, :environment is an array (of hashes) to preserve order
   :environment => [],
@@ -421,7 +408,7 @@ DEFAULT_TESTS_RESULTS_REPORT_TEMPLATE = %q{
 % ignored        = hash[:results][:counts][:ignored]
 % failed         = hash[:results][:counts][:failed]
 % stdout_count   = hash[:results][:counts][:stdout]
-% header_prepend = ((hash[:header].length > 0) ? "#{hash[:header]}: " : '')
+% header_prepend = ((hash[:context] != TEST_SYM) ? "#{hash[:context].to_s.upcase}: " : '')
 % banner_width   = 25 + header_prepend.length # widest message
 
 % if (stdout_count > 0)

data/lib/ceedling/defineinator.rb

@@ -1,7 +1,7 @@
 # =========================================================================
 #   Ceedling - Test-Centered Build System for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2010-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 
@@ -68,7 +68,7 @@ class Defineinator
       test_def = File.basename(filepath, '.*').strip
 
       # Replace any non-ASCII characters with underscores
-      test_def = test_def.clean_enoding('_')
+      test_def = test_def.clean_encoding('_')
 
       # Replace all non-alphanumeric characters (including spaces/punctuation but excluding underscores) with underscores
       test_def.gsub!(/[^0-9a-z_]/i, '_')

data/lib/ceedling/dependinator.rb

@@ -1,7 +1,7 @@
 # =========================================================================
 #   Ceedling - Test-Centered Build System for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2010-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================