ceedling 1.1.9 → 1.2.0

data/spec/system/bullseye_deployment_spec.rb

@@ -0,0 +1,102 @@
+# =========================================================================
+#   Ceedling - Test-Centered Build System for C
+#   ThrowTheSwitch.org
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   SPDX-License-Identifier: MIT
+# =========================================================================
+#
+# Gated by the "requires bullseye" shared context (see spec_system_helper.rb).
+# Auto-skips everywhere without a real, licensed Bullseye installation.
+# See docs/mkdocs/plugins/bullseye/licensing.md for installing Bullseye into the
+# madsciencelab-plugins container to run these locally.
+
+require 'spec_system_helper'
+require_relative 'support/bullseye_common_test_cases'
+
+ceedling_system_tests do
+  describe "Bullseye" do
+    include CommonSystemTestCases
+    include BullseyeCommonTestCases
+    include_context "requires bullseye"
+
+    # As with Gcov: coverage instrumentation plus exact-figure assertions.
+    include_context "cannot be sanitized"
+
+    before :all do
+      @c = SystemContext.new
+      @c.deploy_gem
+    end
+
+    after :all do
+      @c.done!
+    end
+
+    before { @proj_name = unique_proj_name("bullseye") }
+
+    describe "Basic operations" do
+      before do
+        @c.with_context do
+          @c.ceedling_appcmd_exec("new --local #{@proj_name}")
+        end
+      end
+
+      test_case :bullseye_success
+      test_case :bullseye_fail
+      test_case :bullseye_license_status_task
+    end
+
+    describe "Branch coverage detail" do
+      before do
+        @c.with_context do
+          @c.ceedling_appcmd_exec("new --local #{@proj_name}")
+        end
+      end
+
+      test_case :bullseye_branch_detail_disabled_by_default
+      test_case :bullseye_branch_detail_uncovered
+      test_case :bullseye_branch_detail_all
+      test_case :bullseye_branch_detail_rejects_unknown_value
+    end
+
+    describe "XML reporting" do
+      before do
+        @c.with_context do
+          @c.ceedling_appcmd_exec("new --local #{@proj_name}")
+        end
+      end
+
+      test_case :bullseye_xml_report_disabled_by_default
+      test_case :bullseye_xml_report_cobertura
+      test_case :bullseye_xml_report_native
+    end
+
+    describe "Coverage thresholds" do
+      before do
+        @c.with_context do
+          @c.ceedling_appcmd_exec("new --local #{@proj_name}")
+        end
+      end
+
+      test_case :bullseye_fail_under_met
+      test_case :bullseye_fail_under_unmet
+    end
+
+    describe "Command: `ceedling example temp_sensor`" do
+      before do
+        @c.with_context do
+          FileUtils.rm_rf('temp_sensor')
+          output = @c.ceedling_appcmd_exec("example temp_sensor")
+          expect(output).to match(/created/)
+        end
+      end
+
+      test_case :temp_sensor_full_suite
+      test_case :temp_sensor_single_module
+      test_case :temp_sensor_pattern
+      test_case :temp_sensor_path
+      test_case :temp_sensor_untested_sources_list
+      test_case :temp_sensor_untested_sources_compile
+      test_case :temp_sensor_report_task
+    end
+  end
+end

data/spec/system/cli_surface_spec.rb

@@ -0,0 +1,245 @@
+# =========================================================================
+#   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'
+
+# Covers CLI surface area with no prior system-test coverage: the naked-task
+# backwards-compatibility retry, the bare -T/-v/--version ARGV hacks in
+# bin/ceedling, and several commands/flags exercised nowhere else.
+ceedling_system_tests do
+  before :all do
+    @c = SystemContext.new
+    @c.deploy_gem
+  end
+
+  after :all do
+    @c.done!
+  end
+
+  before { @proj_name = unique_proj_name("cli_surface") }
+
+  describe "Fresh project" do
+    before do
+      @c.with_context do
+        @c.ceedling_appcmd_exec("new #{@proj_name}")
+      end
+    end
+
+    it "runs build tasks with no `build` keyword (PermissiveCLI retry)" do
+      @c.with_context do
+        Dir.chdir @proj_name do
+          FileUtils.cp test_asset_path("example_file.h"), 'src/'
+          FileUtils.cp test_asset_path("example_file.c"), 'src/'
+          FileUtils.cp test_asset_path("test_example_file_success.c"), 'test/'
+
+          # No leading `build` -- Thor raises Thor::UndefinedCommandError for
+          # `test:all`, and bin/ceedling retries with `build` unshifted on.
+          output = @c.ceedling_appcmd_exec("test:all")
+
+          expect(@c.last_exit_status).to eq(0)
+          expect(output).to match(/TESTED:\s+\d/)
+          expect(output).to match(/PASSED:\s+\d/)
+        end
+      end
+    end
+
+    it "lists build tasks with bare -T, without `build` or `help`" do
+      @c.with_context do
+        Dir.chdir @proj_name do
+          output = @c.ceedling_appcmd_exec("-T")
+
+          expect(@c.last_exit_status).to eq(0)
+          expect(output).to match(/ceedling test:all/i)
+        end
+      end
+    end
+
+    it "processes configuration with `check` and runs no build tasks" do
+      @c.with_context do
+        Dir.chdir @proj_name do
+          output = @c.ceedling_appcmd_exec("check")
+
+          expect(@c.last_exit_status).to eq(0)
+          expect(output).to match(/Project configuration processed/i)
+          # Configuration validation vendors Unity/CMock sources into build/ as
+          # scaffolding, but `check` compiles nothing and runs no tests -- no
+          # generated test runners or results, unlike an actual build.
+          expect(Dir.glob('build/test/runners/*')).to be_empty
+          expect(Dir.glob('build/artifacts/**/*').select { |path| File.file?(path) }).to be_empty
+        end
+      end
+    end
+
+    it "loads a project file from a non-default path via --project" do
+      @c.with_context do
+        Dir.chdir @proj_name do
+          FileUtils.mv('project.yml', 'custom_project.yml')
+
+          output = @c.ceedling_appcmd_exec("check --project=custom_project.yml")
+
+          expect(@c.last_exit_status).to eq(0)
+          expect(output).to match(/Project configuration processed/i)
+        end
+      end
+    end
+
+    it "surfaces obnoxious-verbosity diagnostics only when --debug is given" do
+      @c.with_context do
+        Dir.chdir @proj_name do
+          quiet_output = @c.ceedling_appcmd_exec("check")
+          expect(quiet_output).to_not match(/Launching Ceedling from/)
+
+          debug_output = @c.ceedling_appcmd_exec("check --debug")
+          expect(debug_output).to match(/Launching Ceedling from/)
+        end
+      end
+    end
+
+    it "writes to the explicit --logfile path" do
+      @c.with_context do
+        Dir.chdir @proj_name do
+          FileUtils.cp test_asset_path("example_file.h"), 'src/'
+          FileUtils.cp test_asset_path("example_file.c"), 'src/'
+          FileUtils.cp test_asset_path("test_example_file_success.c"), 'test/'
+
+          @c.ceedling_build_exec("test:all --logfile=custom.log")
+
+          expect(@c.last_exit_status).to eq(0)
+          expect(File.exist?('custom.log')).to eq(true)
+        end
+      end
+    end
+
+    it "writes to the default log path under --log" do
+      @c.with_context do
+        Dir.chdir @proj_name do
+          FileUtils.cp test_asset_path("example_file.h"), 'src/'
+          FileUtils.cp test_asset_path("example_file.c"), 'src/'
+          FileUtils.cp test_asset_path("test_example_file_success.c"), 'test/'
+
+          @c.ceedling_build_exec("test:all --log")
+
+          expect(@c.last_exit_status).to eq(0)
+          expect(Dir.glob('**/ceedling.log')).to_not be_empty
+        end
+      end
+    end
+
+    it "forces a success exit code under --graceful-fail even when tests fail" do
+      @c.with_context do
+        Dir.chdir @proj_name do
+          FileUtils.cp test_asset_path("example_file.h"), 'src/'
+          FileUtils.cp test_asset_path("example_file.c"), 'src/'
+          FileUtils.cp test_asset_path("test_example_file.c"), 'test/'
+
+          output = @c.ceedling_build_exec("test:all --graceful-fail")
+
+          expect(@c.last_exit_status).to eq(0)
+          expect(output).to match(/FAILED:\s+[1-9]/)
+        end
+      end
+    end
+
+    it "refuses to overwrite an existing project without --force" do
+      @c.with_context do
+        output = @c.ceedling_appcmd_exec("new #{@proj_name}")
+
+        expect(@c.last_exit_status).to eq(1)
+        expect(output).to match(/already exists/i)
+      end
+    end
+
+    it "destroys and recreates the project with --force" do
+      @c.with_context do
+        Dir.chdir(@proj_name) { File.write('marker.txt', 'should be wiped by --force') }
+
+        @c.ceedling_appcmd_exec("new #{@proj_name} --force")
+
+        expect(@c.last_exit_status).to eq(0)
+        expect(File.exist?(File.join(@proj_name, 'marker.txt'))).to eq(false)
+      end
+    end
+
+    # #1250 -- `--ceedling-yml` names the generated starter file ceedling.yml
+    # instead of project.yml; the default (no flag, exercised by every other
+    # example in this block via the outer `before`) is unchanged.
+    it "generates ceedling.yml instead of project.yml under --ceedling-yml" do
+      @c.with_context do
+        alt_proj_name = "#{@proj_name}_ceedling_yml"
+        @c.ceedling_appcmd_exec("new #{alt_proj_name} --ceedling-yml")
+
+        expect(@c.last_exit_status).to eq(0)
+        Dir.chdir alt_proj_name do
+          expect(File.exist?("ceedling.yml")).to eq true
+          expect(File.exist?("project.yml")).to eq false
+        end
+      end
+    end
+
+    # Actionator replaced Thor::Actions and reproduces its status lines verbatim, so
+    # upgrading Ceedling does not change how these commands look. Nothing else in the
+    # suite pins that format. One real invocation covers the twelve column verb
+    # justification, the two space gutter, and the path shortened against the
+    # destination root.
+    #
+    # Output is captured through a pipe, so the child's stdout is not a terminal and
+    # the lines must arrive uncolored. That makes this an assertion about the terminal
+    # check too, which is what keeps redirected output free of escape sequences.
+    it "reports created paths with Thor-compatible status lines" do
+      @c.with_context do
+        status_proj_name = "#{@proj_name}_status"
+        output = @c.ceedling_appcmd_exec("new #{status_proj_name}")
+
+        expect(@c.last_exit_status).to eq(0)
+        expect(output).to include("      create  #{status_proj_name}/src")
+        expect(output).to include("      create  #{status_proj_name}/test/support")
+        expect(output).to_not match(/\e\[/)
+      end
+    end
+  end
+
+  describe "No project required" do
+    it "reports version via bare -v, without the `version` keyword" do
+      @c.with_context do
+        output = @c.ceedling_appcmd_exec("-v")
+
+        expect(@c.last_exit_status).to eq(0)
+        expect(output).to match(/Welcome to Ceedling!/)
+        expect(output).to match(/Ceedling => \d\.\d\.\d/)
+      end
+    end
+
+    it "reports version via bare --version, without the `version` keyword" do
+      @c.with_context do
+        output = @c.ceedling_appcmd_exec("--version")
+
+        expect(@c.last_exit_status).to eq(0)
+        expect(output).to match(/Welcome to Ceedling!/)
+      end
+    end
+
+    it "exports documentation with `docs`" do
+      @c.with_context do
+        @c.ceedling_appcmd_exec("docs docs_dest")
+
+        expect(@c.last_exit_status).to eq(0)
+        expect(Dir.exist?('docs_dest/unity')).to eq(true)
+        expect(Dir.exist?('docs_dest/cmock')).to eq(true)
+        expect(Dir.exist?('docs_dest/c_exception')).to eq(true)
+      end
+    end
+
+    it "shows detailed help content specific to a named command" do
+      @c.with_context do
+        output = @c.ceedling_appcmd_exec("help build")
+
+        expect(@c.last_exit_status).to eq(0)
+        expect(output).to match(/force-test-rerun/i)
+      end
+    end
+  end
+end

data/spec/system/command_hooks_spec.rb

@@ -0,0 +1,117 @@
+# =========================================================================
+#   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'
+
+# The Command Hooks plugin through a real test build. Every test build hook runs a script
+# that records the hook's name and arguments, which shows each hook fires with the
+# argument its documentation promises. This is the one place the contract between
+# Ceedling's build steps and the plugin's argument handling is exercised end to end.
+ceedling_system_tests do
+  describe 'Command Hooks' do
+
+    # Appends a line naming the hook and each argument it received
+    COMMAND_HOOKS_SYSTEM_RECORDER = "File.open( 'hooks.log', 'a' ) { |log| log.puts ARGV.join( ' | ' ) }\n".freeze
+
+    COMMAND_HOOKS_SYSTEM_HOOKS = %i[
+      pre_mock_preprocess post_mock_preprocess pre_test_preprocess post_test_preprocess
+      pre_mock_generate post_mock_generate pre_runner_generate post_runner_generate
+      pre_compile_execute post_compile_execute pre_link_execute post_link_execute
+      pre_test_fixture_execute post_test_fixture_execute pre_test post_test
+      pre_test_build post_test_build pre_build post_build
+    ].freeze
+
+    # The first argument each hook should record
+    COMMAND_HOOKS_SYSTEM_EXPECTED = {
+      pre_mock_preprocess:       %r{\Asrc/example_file\.h\z},
+      post_mock_preprocess:      %r{\Asrc/example_file\.h\z},
+      pre_test_preprocess:       %r{\Atest/test_example_file_with_mock\.c\z},
+      post_test_preprocess:      %r{\Atest/test_example_file_with_mock\.c\z},
+      pre_mock_generate:         %r{example_file\.h\z},
+      post_mock_generate:        %r{example_file\.h\z},
+      pre_runner_generate:       %r{\Atest/test_example_file_with_mock\.c\z},
+      post_runner_generate:      %r{test_example_file_with_mock_runner\.c\z},
+      pre_compile_execute:       /\.c\z/,
+      post_compile_execute:      /\.c\z/,
+      pre_link_execute:          /test_example_file_with_mock\.out\z/,
+      post_link_execute:         /test_example_file_with_mock\.out\z/,
+      pre_test_fixture_execute:  /test_example_file_with_mock\.out\z/,
+      post_test_fixture_execute: /test_example_file_with_mock\.out\z/,
+      pre_test:                  %r{\Atest/test_example_file_with_mock\.c\z},
+      post_test:                 %r{\Atest/test_example_file_with_mock\.c\z},
+      pre_test_build:            /\Atest\z/,
+      post_test_build:           /\Atest\z/,
+      pre_build:                 /\A\d+(\.\d+)?\z/,
+      post_build:                /\A\d+(\.\d+)?\z/
+    }.freeze
+
+    before :all do
+      @c = SystemContext.new
+      @c.deploy_gem
+    end
+
+    after :all do
+      @c.done!
+    end
+
+    before { @proj_name = unique_proj_name( 'command_hooks' ) }
+
+    def recording_hook(hook)
+      arguments = ['record.rb', hook.to_s, '"${1}"']
+      arguments << '"${2}"' if %i[pre_compile_execute post_compile_execute].include?( hook )
+      return { executable: 'ruby', arguments: arguments }
+    end
+
+    def prep_project
+      FileUtils.cp feature_asset_path( 'project.yml' ), 'project.yml'
+      @c.uncomment_project_yml_option_for_test( '- command_hooks' )
+      @c.merge_project_yml_for_test(
+        project:       { use_test_preprocessor: :all },
+        command_hooks: COMMAND_HOOKS_SYSTEM_HOOKS.to_h { |hook| [hook, recording_hook( hook )] }
+      )
+      File.write( 'record.rb', COMMAND_HOOKS_SYSTEM_RECORDER )
+      FileUtils.cp test_asset_path( 'example_file.h' ), 'src/'
+      FileUtils.cp test_asset_path( 'example_file.c' ), 'src/'
+      FileUtils.cp test_asset_path( 'example_file_call.h' ), 'src/'
+      FileUtils.cp test_asset_path( 'example_file_call.c' ), 'src/'
+      FileUtils.cp test_asset_path( 'test_example_file_with_mock.c' ), 'test/'
+    end
+
+    # Each hook's recorded calls, as lists of the arguments it received
+    def recorded
+      return File.readlines( 'hooks.log', chomp: true ).map { |line| line.split( ' | ', -1 ) }
+                 .group_by( &:first ).transform_values { |calls| calls.map { |call| call.drop( 1 ) } }
+    end
+
+    it 'runs every test build hook with its documented argument, and no build hook for clobber' do
+      @c.with_context do
+        @c.ceedling_appcmd_exec( "new --local #{@proj_name}" )
+
+        Dir.chdir @proj_name do
+          prep_project
+          output = @c.ceedling_build_exec( 'test:all' )
+          expect(@c.last_exit_status).to eq( 0 ), output
+
+          calls = recorded
+          COMMAND_HOOKS_SYSTEM_HOOKS.each do |hook|
+            expect(calls).to have_key( hook.to_s ), "expected :#{hook} to run"
+            expect(calls[hook.to_s].map( &:first )).to all( match( COMMAND_HOOKS_SYSTEM_EXPECTED[hook] ) ), ":#{hook} received #{calls[hook.to_s].inspect}"
+          end
+
+          # Compile hooks also receive the object file
+          expect(calls['post_compile_execute'].map( &:last )).to all( match( /\.o\z/ ) )
+
+          # Build hooks fire only for build tasks (#194)
+          File.delete( 'hooks.log' )
+          @c.ceedling_build_exec( 'clobber' )
+          expect(File.exist?( 'hooks.log' )).to be false
+        end
+      end
+    end
+
+  end
+end

data/spec/system/conditional_include_macro_visibility_spec.rb

@@ -8,145 +8,53 @@
 require 'spec_system_helper'
 
 ##
-## Conditional-#include Macro-Visibility Tests (directives-only preprocessing)
-## =============================================================================
+## Conditional-#include Macro-Visibility -- end-to-end smoke
+## =======================================================
 ##
-## Ceedling discovers a file's #includes via two preprocessor passes reconciled
-## into one list: a "bare" pass and an accurate pass (gcc -E -fdirectives-only
-## against the real file with real search paths -- genuinely opens every
-## header). Reconciliation keeps an accurate-pass entry only if bare also found
-## it, to filter out headers reached only via a deeper, nested path.
+## The detail of how Ceedling reconciles a file's #includes across its bare and
+## accurate preprocessor passes -- project-:defines guards, same-file #define
+## guards, sibling-header-macro guards (issue #1223), a sibling-header-macro-guarded
+## *computed* include split across a backslash continuation (issue #1267),
+## transitive headers not promoted to spurious top-level entries -- is characterized
+## directly against real GCC in spec/integration/includes_extraction_spec.rb. This
+## spec keeps one full `ceedling` build over all of those shapes at once, to prove
+## the pieces still fit together through a real Partials build.
 ##
-## "Bare" is itself two things unioned together: a gcc -M -MG -MP pass against
-## an isolated, sibling-free copy of the file (so it never actually opens any
-## header the file #includes, but can still resolve an #include whose own
-## target is a macro, since command-line -D defines are visible even in
-## isolation), and a plain literal text scan of the file's own #include lines
-## (no conditional evaluation at all, so it sees past a guard the isolated gcc
-## pass can't evaluate -- but also can't resolve a macro-computed #include
-## target, since there's no literal filename in the source text to find).
-## Neither replaces the other; each catches what the other structurally can't.
-##
-## These tests characterize that reconciliation's behavior for #include
-## directives guarded by an #if/#ifdef, across the different places the
-## guarding macro can come from -- some already handled correctly, one
-## (issue #1223) fixed by adding the text-scan half of "bare" above.
-##
-## Test assets: assets/tests_with_conditional_includes/
-##   - widget.c/.h: three scenarios that already work correctly:
-##     (a) conditional include gated on a project :defines macro
-##     (b) conditional include gated on a same-file #define
-##     (c) a header reached only transitively (nested_wrapper.h's own
-##         #include, never itself directly #include'd by widget.c) --
-##         must not appear duplicated in as a false top-level entry
-##   - widget_feature.c/.h + feature_config.h + feature_extra.h: issue #1223
-##     itself -- a conditional include gated on a macro defined by an
-##     *earlier #include in the same file* (feature_config.h's FEATURE_LEVEL),
-##     which the isolated bare pass can never see, silently dropping
-##     feature_extra.h and leaving FEATURE_EXTRA_MACRO undeclared.
+## Assets: assets/fixtures/tests_with_conditional_includes/
 ##
 
 ceedling_system_tests do
-
-  before :all do
-    @c = SystemContext.new
-    @c.deploy_gem
-  end
-
-  after :all do
-    @c.done!
-  end
-
-  before { @proj_name = unique_proj_name("cond_inc") }
+  include_context "a fresh ceedling gem project", "cond_inc"
 
   describe "Deployed as a gem" do
     before do
-      @c.with_context do
-        @c.ceedling_appcmd_exec("new #{@proj_name}")
-      end
-    end
-
-    # =========================================================================
-    describe "Conditional includes that already resolve correctly today" do
-    # =========================================================================
-
-      before do
-        @c.with_context do
-          Dir.chdir @proj_name do
-            FileUtils.cp test_asset_path("tests_with_conditional_includes/src/widget.h"), 'src/'
-            FileUtils.cp test_asset_path("tests_with_conditional_includes/src/widget.c"), 'src/'
-            FileUtils.cp test_asset_path("tests_with_conditional_includes/src/project_flag_extra.h"), 'src/'
-            FileUtils.cp test_asset_path("tests_with_conditional_includes/src/local_flag_extra.h"), 'src/'
-            FileUtils.cp test_asset_path("tests_with_conditional_includes/src/nested_wrapper.h"), 'src/'
-            FileUtils.cp test_asset_path("tests_with_conditional_includes/src/nested_extra.h"), 'src/'
-            FileUtils.cp test_asset_path("tests_with_conditional_includes/test/test_widget.c"), 'test/'
-
-            settings = {
-              :project => { :use_partials => true },
-              :defines => { :test => ['PROJECT_FLAG'] }
-            }
-            @c.merge_project_yml_for_test(settings)
-          end
+      in_project do
+        %w[
+          widget.h widget.c project_flag_extra.h local_flag_extra.h
+          nested_wrapper.h nested_extra.h macro_target_extra.h
+          widget_feature.h widget_feature.c feature_config.h feature_extra.h
+          feature_extra2.h
+        ].each { |f| copy_fixture("tests_with_conditional_includes/src/#{f}", 'src') }
+        %w[test_widget.c test_widget_feature.c].each do |f|
+          copy_fixture("tests_with_conditional_includes/test/#{f}", 'test')
         end
-      end
-
-      it "resolves a project-:defines-gated include, a same-file-#define-gated include, and correctly excludes a transitively-nested header from duplication" do
-        @c.with_context do
-          Dir.chdir @proj_name do
-            output = @c.ceedling_build_exec("test:widget")
-            expect(@c.last_exit_status).to eq(0)
-            expect(output).to match(/TESTED:\s+3/)
-            expect(output).to match(/PASSED:\s+3/)
-            expect(output).to match(/FAILED:\s+0/)
 
-            # (c) nested_extra.h is reached only transitively, through
-            # nested_wrapper.h's own #include -- confirm it is not promoted
-            # into a spurious, duplicated top-level #include in the generated
-            # Partial implementation (the exact filtering property the #1223
-            # fix must not break).
-            generated = Dir.glob('build/test/partials/**/*_impl.c').first
-            expect(generated).not_to be_nil
-            contents = File.read(generated)
-            expect(contents.scan(/#include\s+"nested_extra\.h"/).length).to eq(0)
-          end
-        end
+        @c.merge_project_yml_for_test(
+          :project => { :use_partials => true },
+          :defines => { :test => ['PROJECT_FLAG'] }
+        )
       end
-
     end
 
-    # =========================================================================
-    describe "Conditional include gated on a macro from an earlier #include in the same file (issue #1223)" do
-    # =========================================================================
-
-      before do
-        @c.with_context do
-          Dir.chdir @proj_name do
-            FileUtils.cp test_asset_path("tests_with_conditional_includes/src/widget_feature.h"), 'src/'
-            FileUtils.cp test_asset_path("tests_with_conditional_includes/src/widget_feature.c"), 'src/'
-            FileUtils.cp test_asset_path("tests_with_conditional_includes/src/feature_config.h"), 'src/'
-            FileUtils.cp test_asset_path("tests_with_conditional_includes/src/feature_extra.h"), 'src/'
-            FileUtils.cp test_asset_path("tests_with_conditional_includes/test/test_widget_feature.c"), 'test/'
-
-            settings = { :project => { :use_partials => true } }
-            @c.merge_project_yml_for_test(settings)
-          end
-        end
-      end
-
-      it "keeps FEATURE_EXTRA_MACRO visible in the generated Partial so the build compiles" do
-        @c.with_context do
-          Dir.chdir @proj_name do
-            output = @c.ceedling_build_exec("test:widget_feature")
-            expect(@c.last_exit_status).to eq(0)
-            expect(output).to match(/TESTED:\s+1/)
-            expect(output).to match(/PASSED:\s+1/)
-            expect(output).to match(/FAILED:\s+0/)
-          end
-        end
+    it "builds and passes every conditional-#include Partials scenario in one run" do
+      in_project do
+        output = @c.ceedling_build_exec("test:all")
+        expect(@c.last_exit_status).to eq(0)
+        expect(output).to match(/TESTED:\s+5/)
+        expect(output).to match(/PASSED:\s+5/)
+        expect(output).to match(/FAILED:\s+0/)
       end
-
     end
-
   end
 
 end