ceedling 1.1.10 → 1.2.1

data/spec/system/example_temp_sensor_spec.rb

@@ -7,6 +7,27 @@
 
 require 'spec_system_helper'
 
+##
+## temp_sensor Example Project
+## =============================
+##
+## `files:*`/`paths:*` reporting, previously checked here too, now lives
+## solely in files_paths_reporting_spec.rb, built against this same fixture --
+## nothing about that output is temp_sensor-specific, so repeating it here
+## added nothing. `test:TemperatureCalculator` (single-module test) and
+## `test:pattern[Temp]` (pattern test) are dropped as redundant with
+## example_wondrous_forest_spec.rb's `test:SoilMoisture` and
+## pinned_thread_count_spec.rb/delta_builds_spec.rb's own pattern-test
+## coverage -- what's kept below is what's unique to this project: the
+## examples-listing check (kept only here, dropped from the other two example
+## specs), `test:all`, `test:path[]` and its `--test-case=` combination (the
+## suite's sole coverage of `test:path[]` anywhere), and one mixin-loading
+## smoke proving a real mixin's content reaches a real 86-test build --
+## simple-named form only, since the relative-path and CEEDLING_MIXIN_1
+## variants are now covered as *mechanisms* by
+## spec/integration/mixin_loading_spec.rb and mixin_ordering_spec.rb.
+##
+
 ceedling_system_tests do
   include CommonSystemTestCases
 
@@ -39,6 +60,15 @@ ceedling_system_tests do
         @c.with_context do
           output = @c.ceedling_appcmd_exec("example temp_sensor")
           expect(output).to match(/created/)
+
+          # `ceedling example` only overwrites src/, test/, mixin/, and project.yml --
+          # it never touches build/. Without clobbering it here, a dependency cache
+          # populated by an earlier example in this describe block would carry over
+          # and make delta-build staleness tracking correctly (but unhelpfully, for
+          # these tests) treat this "fresh" example as already fully built.
+          Dir.chdir "temp_sensor" do
+            @c.ceedling_build_exec("clobber")
+          end
         end
       end
 
@@ -52,31 +82,6 @@ ceedling_system_tests do
         end
       end
 
-      it "should be able to test a single module (it includes file-specific flags)" do
-        @c.with_context do
-          Dir.chdir "temp_sensor" do
-            @output = @c.ceedling_build_exec("test:TemperatureCalculator")
-            expect(@output).to match(/TESTED:\s+2/)
-            expect(@output).to match(/PASSED:\s+2/)
-
-            expect(@output).to match(/TemperatureCalculator\.out/i)
-          end
-        end
-      end
-
-      it "should be able to test multiple files matching a pattern" do
-        @c.with_context do
-          Dir.chdir "temp_sensor" do
-            @output = @c.ceedling_build_exec("test:pattern[Temp]")
-            expect(@output).to match(/TESTED:\s+6/)
-            expect(@output).to match(/PASSED:\s+6/)
-
-            expect(@output).to match(/TemperatureCalculator\.out/i)
-            expect(@output).to match(/TemperatureFilter\.out/i)
-          end
-        end
-      end
-
       it "should be able to test all files matching in a path" do
         @c.with_context do
           Dir.chdir "temp_sensor" do
@@ -107,17 +112,6 @@ ceedling_system_tests do
         end
       end
 
-      it "should be able to test when using a custom Unity Helper file added by relative-path mixin" do
-        @c.with_context do
-          Dir.chdir "temp_sensor" do
-            @output = @c.ceedling_build_exec("test:all --verbosity=obnoxious --mixin=mixin/add_unity_helper.yml")
-            expect(@output).to match(/Merging command line mixin using mixin\/add_unity_helper\.yml/)
-            expect(@output).to match(/TESTED:\s+86/)
-            expect(@output).to match(/PASSED:\s+86/)
-          end
-        end
-      end
-
       it "should be able to test when using a custom Unity Helper file added by simple-named mixin" do
         @c.with_context do
           Dir.chdir "temp_sensor" do
@@ -129,142 +123,6 @@ ceedling_system_tests do
         end
       end
 
-      it "should be able to test when using a custom Unity Helper file added by env-named mixin" do
-        @c.with_context do
-          ENV['CEEDLING_MIXIN_1'] = 'mixin/add_unity_helper.yml'
-          Dir.chdir "temp_sensor" do
-            @output = @c.ceedling_build_exec("test:all --verbosity=obnoxious")
-            expect(@output).to match(/Merging CEEDLING_MIXIN_1 mixin using mixin\/add_unity_helper\.yml/)
-            expect(@output).to match(/TESTED:\s+86/)
-            expect(@output).to match(/PASSED:\s+86/)
-          end
-        end
-      end
-
-      it "should be able to report the assembly files found in paths" do
-        @c.with_context do
-          Dir.chdir "temp_sensor" do
-            @output = @c.ceedling_build_exec("files:assembly")
-
-            expect(@output).to match(/Assembly files: None/i)
-          end
-        end
-      end
-
-      it "should be able to report the header files found in paths" do
-        @c.with_context do
-          Dir.chdir "temp_sensor" do
-            @output = @c.ceedling_build_exec("files:header")
-
-            # Incomplete (i.e. spot check) of header files
-            expect(@output).to match(/Header files:/i)
-            expect(@output).to match(/src\/AdcModel\.h/i)
-            expect(@output).to match(/src\/AdcHardware\.h/i)
-            expect(@output).to match(/src\/AdcConductor\.h/i)
-            expect(@output).to match(/src\/Main\.h/i)
-            expect(@output).to match(/src\/UsartTransmitBufferStatus\.h/i)
-            #and many more
-
-            expect(@output).to match(/test\/support\/UnityHelper\.h/i)
-          end
-        end
-      end
-
-      it "should be able to report the source files found in paths" do
-        @c.with_context do
-          Dir.chdir "temp_sensor" do
-            @output = @c.ceedling_build_exec("files:source")
-
-            # Incomplete (i.e. spot check) of source files
-            expect(@output).to match(/Source files:/i)
-            expect(@output).to match(/src\/AdcModel\.c/i)
-            expect(@output).to match(/src\/AdcHardware\.c/i)
-            expect(@output).to match(/src\/AdcConductor\.c/i)
-            expect(@output).to match(/src\/Main\.c/i)
-            expect(@output).to match(/src\/UsartTransmitBufferStatus\.c/i)
-            #and many more
-
-            expect(@output).not_to match(/test\/support\/UnityHelper\.c/i)
-          end
-        end
-      end
-
-      it "should be able to report the support files found in paths" do
-        @c.with_context do
-          Dir.chdir "temp_sensor" do
-            @output = @c.ceedling_build_exec("files:support")
-
-            expect(@output).to match(/Support files:/i)
-            expect(@output).to match(/test\/support\/UnityHelper\.c/i)
-            expect(@output).to match(/test\/platform\/at91sam7s256\.c/i)
-          end
-        end
-      end
-
-      it "should be able to report the test files found in paths" do
-        @c.with_context do
-          Dir.chdir "temp_sensor" do
-            @output = @c.ceedling_build_exec("files:test")
-
-            # Incomplete (i.e. spot check) of test files
-            expect(@output).to match(/Test files:/i)
-            expect(@output).to match(/test\/adc\/TestAdcModel\.c/i)
-            expect(@output).to match(/test\/adc\/TestAdcHardware\.c/i)
-            expect(@output).to match(/test\/adc\/TestAdcConductor\.c/i)
-            expect(@output).to match(/test\/TestMain\.c/i)
-            expect(@output).to match(/test\/TestUsartBaudRateRegisterCalculator.c/i)
-          end
-        end
-      end
-
-      it "should be able to report the header paths found in paths" do
-        @c.with_context do
-          Dir.chdir "temp_sensor" do
-            @output = @c.ceedling_build_exec("paths:include")
-
-            expect(@output).to match(/Include paths:/i)
-            expect(@output).to match(/src/i)
-          end
-        end
-      end
-
-      it "should be able to report the source paths found in paths" do
-        @c.with_context do
-          Dir.chdir "temp_sensor" do
-            @output = @c.ceedling_build_exec("paths:source")
-
-            expect(@output).to match(/Source paths:/i)
-            expect(@output).to match(/src/i)
-          end
-        end
-      end
-
-      it "should be able to report the support paths found in paths" do
-        @c.with_context do
-          Dir.chdir "temp_sensor" do
-            @output = @c.ceedling_build_exec("paths:support")
-
-            expect(@output).to match(/Support paths:/i)
-            expect(@output).to match(/test\/support/i)
-            expect(@output).to match(/test\/platform/i)
-          end
-        end
-      end
-
-      it "should be able to report the test paths found in paths" do
-        @c.with_context do
-          Dir.chdir "temp_sensor" do
-            @output = @c.ceedling_build_exec("paths:test")
-
-            expect(@output).to match(/Test paths:/i)
-            expect(@output).to match(/test/i)
-            expect(@output).to match(/test\/adc/i)
-
-            expect(@output).not_to match(/test\/support/i)
-          end
-        end
-      end
-
     end
   end
 end

data/spec/system/example_wondrous_forest_spec.rb

@@ -7,6 +7,20 @@
 
 require 'spec_system_helper'
 
+##
+## wondrous_forest Example Project
+## ==================================
+##
+## `files:*`/`paths:*` reporting, previously checked here too, now lives
+## solely in files_paths_reporting_spec.rb. The examples-listing check is
+## dropped as redundant (kept only in example_temp_sensor_spec.rb), and
+## `test:pattern[Sensor]` is dropped as redundant with
+## pinned_thread_count_spec.rb/delta_builds_spec.rb's own pattern-test
+## coverage. What's left: `test:all`, and `test:SoilMoisture`, which becomes
+## the suite's sole remaining single-module-test example (a promotion, not a
+## loss -- temp_sensor's equivalent was trimmed in favor of this one).
+##
+
 ceedling_system_tests do
   include CommonSystemTestCases
 
@@ -21,24 +35,21 @@ ceedling_system_tests do
 
   before { @proj_name = "wondrous_forest" }
 
-  describe "Command: `ceedling examples`" do
-    before do
-      @c.with_context do
-        @output = @c.ceedling_appcmd_exec("examples")
-      end
-    end
-
-    it "should list wondrous_forest as an available example" do
-      expect(@output).to match(/wondrous_forest/)
-    end
-  end
-
   describe "Command: `ceedling example wondrous_forest`" do
     describe "wondrous_forest" do
       before do
         @c.with_context do
           output = @c.ceedling_appcmd_exec("example wondrous_forest")
           expect(output).to match(/created/)
+
+          # `ceedling example` only overwrites src/, test/, mixin/, and project.yml --
+          # it never touches build/. Without clobbering it here, a dependency cache
+          # populated by an earlier example in this describe block would carry over
+          # and make delta-build staleness tracking correctly (but unhelpfully, for
+          # these tests) treat this "fresh" example as already fully built.
+          Dir.chdir "wondrous_forest" do
+            @c.ceedling_build_exec("clobber")
+          end
         end
       end
 
@@ -46,8 +57,8 @@ ceedling_system_tests do
         @c.with_context do
           Dir.chdir "wondrous_forest" do
             @output = @c.ceedling_build_exec("test:all")
-            expect(@output).to match(/TESTED:\s+68/)
-            expect(@output).to match(/PASSED:\s+68/)
+            expect(@output).to match(/TESTED:\s+71/)
+            expect(@output).to match(/PASSED:\s+71/)
             expect(@output).to match(/FAILED:\s+0/)
           end
         end
@@ -64,54 +75,6 @@ ceedling_system_tests do
         end
       end
 
-      it "should be able to test multiple modules matching a pattern" do
-        @c.with_context do
-          Dir.chdir "wondrous_forest" do
-            @output = @c.ceedling_build_exec("test:pattern[Sensor]")
-            expect(@output).to match(/PASSED/)
-            expect(@output).to match(/TemperatureSensor\.out/i)
-            expect(@output).to match(/HumiditySensor\.out/i)
-            expect(@output).to match(/LightSensor\.out/i)
-          end
-        end
-      end
-
-      it "should be able to report header files" do
-        @c.with_context do
-          Dir.chdir "wondrous_forest" do
-            @output = @c.ceedling_build_exec("files:header")
-            expect(@output).to match(/Header files:/i)
-            expect(@output).to match(/TemperatureSensor\.h/i)
-            expect(@output).to match(/AlertManager\.h/i)
-            expect(@output).to match(/EventQueue\.h/i)
-            expect(@output).to match(/ForestMonitor\.h/i)
-          end
-        end
-      end
-
-      it "should be able to report source files" do
-        @c.with_context do
-          Dir.chdir "wondrous_forest" do
-            @output = @c.ceedling_build_exec("files:source")
-            expect(@output).to match(/Source files:/i)
-            expect(@output).to match(/TemperatureSensor\.c/i)
-            expect(@output).to match(/SensorHal\.c/i)
-            expect(@output).to match(/ForestMonitor\.c/i)
-          end
-        end
-      end
-
-      it "should be able to report test files" do
-        @c.with_context do
-          Dir.chdir "wondrous_forest" do
-            @output = @c.ceedling_build_exec("files:test")
-            expect(@output).to match(/Test files:/i)
-            expect(@output).to match(/TestTemperatureSensor\.c/i)
-            expect(@output).to match(/TestAlertManager\.c/i)
-            expect(@output).to match(/TestForestMonitor\.c/i)
-          end
-        end
-      end
     end
   end
 end

data/spec/system/extension_multiple_values_spec.rb

@@ -0,0 +1,75 @@
+# =========================================================================
+#   Ceedling - Test-Centered Build System for C
+#   ThrowTheSwitch.org
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   SPDX-License-Identifier: MIT
+# =========================================================================
+
+require 'spec_system_helper'
+
+##
+## Multiple Filename Extensions Per File Type
+## ===========================================
+##
+## A project may name a single file type -- assembly, in this case -- with more
+## than one extension at once (e.g. both `.s` and `.S`, as GitHub issue #947
+## describes for projects like ThreadX). These tests confirm that when
+## :extension -> :assembly is configured as a list, Ceedling finds, compiles,
+## and links files under every extension in that list within the same project,
+## not just whichever extension happens to be listed first.
+##
+## Test assets: assets/fixtures/tests_with_multiple_assembly_extensions/
+##   - counter_module.c/.h: an ordinary C module with one function
+##   - asm_helper_lower.s / asm_helper_upper.S: two assembly files, deliberately
+##     empty of real instructions (portable across architectures), one under
+##     each of the two configured extensions
+##   - test_counter_module.c: exercises the C module only; the assembly files'
+##     role here is purely to prove the build discovers and compiles both
+##
+
+ceedling_system_tests do
+  include_context "a fresh ceedling gem project", "multi_ext_asm"
+
+  describe "Deployed as a gem" do
+
+    # =========================================================================
+    describe "A project configured with a list of assembly extensions" do
+    # =========================================================================
+
+      before do
+        in_project do
+          copy_fixture("tests_with_multiple_assembly_extensions/src/counter_module.h", 'src')
+          copy_fixture("tests_with_multiple_assembly_extensions/src/counter_module.c", 'src')
+          copy_fixture("tests_with_multiple_assembly_extensions/src/asm_helper_lower.s", 'src')
+          copy_fixture("tests_with_multiple_assembly_extensions/src/asm_helper_upper.S", 'src')
+          copy_fixture("tests_with_multiple_assembly_extensions/test/test_counter_module.c", 'test')
+        end
+      end
+
+      it "discovers, reports, and compiles assembly files under every configured extension" do
+        in_project do
+          settings = {
+            :extension  => { :assembly => ['.s', '.S'] },
+            :test_build => { :use_assembly => true }
+          }
+          @c.merge_project_yml_for_test(settings)
+
+          files_output = @c.ceedling_build_exec("files:assembly")
+          expect(files_output).to match(/asm_helper_lower\.s/)
+          expect(files_output).to match(/asm_helper_upper\.S/)
+
+          build_output = @c.ceedling_build_exec("test:all")
+          expect(@c.last_exit_status).to eq(0)
+          expect(build_output).to match(/Assembling.*asm_helper_lower\.s/)
+          expect(build_output).to match(/Assembling.*asm_helper_upper\.S/)
+          expect(build_output).to match(/TESTED:\s+1/)
+          expect(build_output).to match(/PASSED:\s+1/)
+          expect(build_output).to match(/FAILED:\s+0/)
+        end
+      end
+
+    end
+
+  end
+
+end

data/spec/system/files_paths_reporting_spec.rb

@@ -0,0 +1,154 @@
+# =========================================================================
+#   Ceedling - Test-Centered Build System for C
+#   ThrowTheSwitch.org
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   SPDX-License-Identifier: MIT
+# =========================================================================
+
+require 'spec_system_helper'
+
+##
+## `files:*` / `paths:*` task reporting
+## =======================================
+##
+## Before this file, this output was proven three times over -- once each in
+## example_temp_sensor_spec.rb, example_cipher_quest_spec.rb, and
+## example_wondrous_forest_spec.rb -- always as an incidental side effect of
+## those files' own project-specific coverage, never as its own concern.
+## Consolidated here against a single canonical fixture (temp_sensor -- already
+## the suite's de facto standard, with the richest src/test/support/paths
+## layout of the three example projects) so this reporting logic has one real
+## home instead of three redundant echoes.
+##
+## `files:assembly` gets its own example (asserting "None") because it's a
+## genuinely distinct check -- does the task run cleanly and report correctly
+## on a project with no assembly sources at all -- separate from any project
+## that has assembly files to discover in the first place (none of the three
+## example projects do).
+##
+
+ceedling_system_tests do
+  before :all do
+    @c = SystemContext.new
+    @c.deploy_gem
+  end
+
+  after :all do
+    @c.done!
+  end
+
+  before { @proj_name = "temp_sensor" }
+
+  before do
+    @c.with_context do
+      output = @c.ceedling_appcmd_exec("example temp_sensor")
+      expect(output).to match(/created/)
+    end
+  end
+
+  describe "Command: `ceedling files:*`" do
+    it "reports no assembly files for a project with none" do
+      in_project do
+        @output = @c.ceedling_build_exec("files:assembly")
+        expect(@output).to match(/Assembly files: None/i)
+      end
+    end
+
+    it "reports the header files found in paths" do
+      in_project do
+        @output = @c.ceedling_build_exec("files:header")
+
+        # Incomplete (i.e. spot check) of header files
+        expect(@output).to match(/Header files:/i)
+        expect(@output).to match(/src\/AdcModel\.h/i)
+        expect(@output).to match(/src\/AdcHardware\.h/i)
+        expect(@output).to match(/src\/AdcConductor\.h/i)
+        expect(@output).to match(/src\/Main\.h/i)
+        expect(@output).to match(/src\/UsartTransmitBufferStatus\.h/i)
+        expect(@output).to match(/test\/support\/UnityHelper\.h/i)
+      end
+    end
+
+    it "reports the source files found in paths" do
+      in_project do
+        @output = @c.ceedling_build_exec("files:source")
+
+        # Incomplete (i.e. spot check) of source files
+        expect(@output).to match(/Source files:/i)
+        expect(@output).to match(/src\/AdcModel\.c/i)
+        expect(@output).to match(/src\/AdcHardware\.c/i)
+        expect(@output).to match(/src\/AdcConductor\.c/i)
+        expect(@output).to match(/src\/Main\.c/i)
+        expect(@output).to match(/src\/UsartTransmitBufferStatus\.c/i)
+
+        expect(@output).not_to match(/test\/support\/UnityHelper\.c/i)
+      end
+    end
+
+    it "reports the support files found in paths" do
+      in_project do
+        @output = @c.ceedling_build_exec("files:support")
+
+        expect(@output).to match(/Support files:/i)
+        expect(@output).to match(/test\/support\/UnityHelper\.c/i)
+        expect(@output).to match(/test\/platform\/at91sam7s256\.c/i)
+      end
+    end
+
+    it "reports the test files found in paths" do
+      in_project do
+        @output = @c.ceedling_build_exec("files:test")
+
+        # Incomplete (i.e. spot check) of test files
+        expect(@output).to match(/Test files:/i)
+        expect(@output).to match(/test\/adc\/TestAdcModel\.c/i)
+        expect(@output).to match(/test\/adc\/TestAdcHardware\.c/i)
+        expect(@output).to match(/test\/adc\/TestAdcConductor\.c/i)
+        expect(@output).to match(/test\/TestMain\.c/i)
+        expect(@output).to match(/test\/TestUsartBaudRateRegisterCalculator.c/i)
+      end
+    end
+  end
+
+  describe "Command: `ceedling paths:*`" do
+    it "reports the include paths found in paths" do
+      in_project do
+        @output = @c.ceedling_build_exec("paths:include")
+
+        expect(@output).to match(/Include paths:/i)
+        expect(@output).to match(/src/i)
+      end
+    end
+
+    it "reports the source paths found in paths" do
+      in_project do
+        @output = @c.ceedling_build_exec("paths:source")
+
+        expect(@output).to match(/Source paths:/i)
+        expect(@output).to match(/src/i)
+      end
+    end
+
+    it "reports the support paths found in paths" do
+      in_project do
+        @output = @c.ceedling_build_exec("paths:support")
+
+        expect(@output).to match(/Support paths:/i)
+        expect(@output).to match(/test\/support/i)
+        expect(@output).to match(/test\/platform/i)
+      end
+    end
+
+    it "reports the test paths found in paths" do
+      in_project do
+        @output = @c.ceedling_build_exec("paths:test")
+
+        expect(@output).to match(/Test paths:/i)
+        expect(@output).to match(/test/i)
+        expect(@output).to match(/test\/adc/i)
+
+        expect(@output).not_to match(/test\/support/i)
+      end
+    end
+  end
+end

data/spec/system/gcov_deployment_spec.rb

@@ -14,6 +14,11 @@ ceedling_system_tests do
     include CommonSystemTestCases
     include GcovCommonTestCases
     include GcovPartialsTestCases
+
+    # Coverage instrumentation alongside exact line- and branch-count
+    # assertions. See the shared context for why opting out is mandatory --
+    # :test flags reach the :gcov context whether or not that was intended.
+    include_context "cannot be sanitized"
     before :all do
       determine_reports_to_test
       @c = SystemContext.new
@@ -36,8 +41,6 @@ ceedling_system_tests do
       test_case :project_with_gcov_enabled_test_all_does_not_require_gcovr
       test_case :project_with_gcov_success
       test_case :project_with_gcov_fail
-      test_case :project_with_gcov_fail_under_decision
-      test_case :project_with_gcov_fail_under_line_rejects_zero
       test_case :gcov_console_report_with_system_header
       test_case :gcov_console_report_with_partial
       # TODO: Restore these tests when the :abort_on_uncovered option is restored in the Gcov plugin
@@ -49,12 +52,77 @@ ceedling_system_tests do
       test_case :project_with_gcov_untested_sources_list
       test_case :project_with_gcov_untested_sources_compile_failure
       test_case :project_with_gcov_untested_sources_standalone_task
+      test_case :project_with_gcov_untested_sources_compiled_with_matched_defines
       test_case :help_tasks_include_gcov
       test_case :create_html_report
-      test_case :create_html_report_with_gcovr_config_file_overrides_default
+      test_case :create_html_report_with_gcovr_custom_args
       test_case :create_html_report_100_coverage_excluding_crashing_test_case
     end
 
+    # Version-gated gcov features, each in its own group so one unavailable tool version
+    # skips only the cases that actually need it.
+    describe "Decision coverage thresholds" do
+      # :fail_under_decision passes --fail-under-decision to gcovr, which rejects it
+      # outright before 7.0. The plugin gates the option and breaks the build by design on
+      # an older gcovr, so this asserts a successful build only where the option exists.
+      include_context "requires gcovr", [7, 0]
+
+      before do
+        @c.with_context do
+          @c.ceedling_appcmd_exec("new --local #{@proj_name}")
+        end
+      end
+
+      test_case :project_with_gcov_fail_under_decision
+    end
+
+    describe "JaCoCo and LCOV reports" do
+      # gcovr gained JaCoCo XML and LCOV output in 7.0. The plugin stops the build when either
+      # report is configured against an older gcovr, so these assert generation only where it exists.
+      include_context "requires gcovr", [7, 0]
+
+      before do
+        @c.with_context do
+          @c.ceedling_appcmd_exec("new --local #{@proj_name}")
+        end
+      end
+
+      test_case :create_gcovr_jacoco_report
+      test_case :create_gcovr_lcov_report
+    end
+
+    describe "Function merge mode" do
+      # Ceedling injects --merge-mode-functions, which gcovr gained in 6.0. Below that the
+      # plugin omits the flag silently rather than breaking the build, so these cases would
+      # pass on an older gcovr while proving nothing about the behavior they name.
+      include_context "requires gcovr", [6, 0]
+
+      before do
+        @c.with_context do
+          @c.ceedling_appcmd_exec("new --local #{@proj_name}")
+        end
+      end
+
+      test_case :create_html_report_with_gcovr_config_file_overrides_default
+      test_case :gcovr_merge_mode_functions_reaches_the_command_line
+    end
+
+    describe "Modified condition/decision coverage" do
+      # Gated on both tools, each raising on its own account: gcovr reports MC/DC from 8.0,
+      # GCC emits it from 14.0. Most toolchains satisfy neither, which is why this skips far
+      # more often than it runs.
+      include_context "requires gcovr", [8, 0]
+      include_context "requires gcc", [14, 0]
+
+      before do
+        @c.with_context do
+          @c.ceedling_appcmd_exec("new --local #{@proj_name}")
+        end
+      end
+
+      test_case :project_with_gcov_mcdc_coverage
+    end
+
     describe "Coverage reporting with Partials" do
       before do
         @c.with_context do
@@ -65,6 +133,7 @@ ceedling_system_tests do
       test_case :gcov_partials_coverage_blank_lines_in_function_body
       test_case :gcov_partials_coverage_decorators_on_own_lines
       test_case :gcov_partials_coverage_function_scope_static_promotion
+      test_case :gcov_partials_coverage_same_named_modules
     end
 
     describe "Backtrace with GDB" do