ceedling 1.1.4 → 1.1.6

data/spec/units/generators/generator_test_runner_spec.rb

@@ -8,6 +8,7 @@
 require 'spec_helper'
 require 'ceedling/generators/generator_test_runner'
 require 'ceedling/parsing_parcels'
+require 'ceedling/includes/includes'
 
 describe GeneratorTestRunner do
   before(:each) do
@@ -141,4 +142,72 @@ describe GeneratorTestRunner do
       )
     end
   end
+
+  # ===========================================================================
+  describe '#generate' do
+  # ===========================================================================
+    # Regression coverage for https://github.com/ThrowTheSwitch/Ceedling/issues/1236:
+    # a system #include with a directory component (e.g. <sys/stat.h>) was rendered
+    # into the generated runner as a bare, unbracketed basename ("stat.h"), losing
+    # both the directory and the user/system distinction, breaking runner compilation.
+    #
+    # @unity_runner_generator is a real UnityTestRunnerGenerator, constructed directly
+    # inside #initialize rather than injected -- swapped out for a double here so these
+    # specs assert on exactly what GeneratorTestRunner itself hands off, independent of
+    # Unity's own generated file formatting.
+    def build_and_capture_includes(includes:, mocks: [])
+      runner = build_runner( test_file_contents: "void test_Thing(void) {}\n" )
+
+      captured = nil
+      fake_generator = double('unity_runner_generator')
+      allow(fake_generator).to receive(:generate) do |*args|
+        captured = args[4]
+      end
+      runner.instance_variable_set(:@unity_runner_generator, fake_generator)
+
+      runner.generate(
+        module_name: 'test_thing',
+        runner_filepath: '/build/test/runners/test_thing_runner.c',
+        mocks: mocks,
+        includes: includes
+      )
+
+      return captured
+    end
+
+    it 'renders a system include with a directory component in angle brackets, directory intact' do
+      captured = build_and_capture_includes( includes: [ SystemInclude.new('sys/stat.h') ] )
+
+      expect( captured ).to eq( ['<sys/stat.h>'] )
+    end
+
+    it 'prefers a reconciled system include\'s include_path over its resolved filepath' do
+      # Mirrors what Includes.reconcile actually produces: filepath is the real,
+      # resolved (possibly absolute) location; include_path is the original,
+      # as-written directive text that must be what's rendered.
+      reconciled = SystemInclude.new('/usr/include/sys/stat.h', include_path: 'sys/stat.h')
+
+      captured = build_and_capture_includes( includes: [ reconciled ] )
+
+      expect( captured ).to eq( ['<sys/stat.h>'] )
+    end
+
+    it 'renders a user include with a directory component down to its bare filename, unchanged from prior behavior' do
+      # Unlike a system header, a project's own directories are exposed to the
+      # compiler as a flat list of -I search paths -- rendering a user include's
+      # own directory component here breaks resolution rather than fixing anything,
+      # so this behavior is intentionally unchanged by the issue #1236 fix.
+      captured = build_and_capture_includes( includes: [ UserInclude.new('sub/header.h') ] )
+
+      expect( captured ).to eq( ['header.h'] )
+    end
+
+    it 'renders a mixed list of system and user includes each in their own correct form' do
+      captured = build_and_capture_includes(
+        includes: [ SystemInclude.new('sys/stat.h'), UserInclude.new('sub/header.h') ]
+      )
+
+      expect( captured ).to eq( ['<sys/stat.h>', 'header.h'] )
+    end
+  end
 end

data/spec/units/partials/partializer_spec.rb

@@ -871,6 +871,75 @@ describe Partializer do
       expect(result).not_to include(UserInclude.new('partial_module.h'))
     end
 
+    # Regression test for #1215: PUBLIC/PRIVATE were once the only mock modes that existed,
+    # so this method's own "does this module have a mock to redirect to" check only ever
+    # listed those two. DEDUCT (MOCK_PARTIAL_ALL_MODULE) was added later without updating
+    # this check, so a module mocked via MOCK_PARTIAL_ALL_MODULE -- e.g. a vendor header
+    # whose only mockable functions are static inline, which requires DEDUCT to select at
+    # all -- was silently never redirected to its mock interface header.
+    it "remaps mockable deduct (ALL_MODULE) partial to interface header" do
+      includes = [UserInclude.new('header1.h'), UserInclude.new('partial_module.h'), UserInclude.new('header2.h')]
+      partials = {
+        'partial_module' => make_partial_config(mocks_type: Partials::DEDUCT)
+      }
+      impl_filename = 'module_impl.h'
+      interface_filename = 'partial_module_interface.h'
+      impl_header = UserInclude.new(impl_filename)
+      interface_header = UserInclude.new(interface_filename)
+
+      allow(@file_path_utils).to receive(:form_partial_implementation_header_filename)
+        .with('module')
+        .and_return(impl_filename)
+
+      allow(@file_path_utils).to receive(:form_partial_interface_header_filename)
+        .with('partial_module')
+        .and_return(interface_filename)
+
+      result = @partializer.remap_implementation_source_includes(
+        name: 'module',
+        includes: includes,
+        partials: partials
+      )
+
+      expect(result).to include(impl_header)
+      expect(result).to include(interface_header)
+      expect(result).to include(UserInclude.new('header1.h'))
+      expect(result).to include(UserInclude.new('header2.h'))
+      expect(result).not_to include(UserInclude.new('partial_module.h'))
+    end
+
+    # Same regression as the DEDUCT case above, for ACCUMULATE (MOCK_PARTIAL_MODULE).
+    it "remaps mockable accumulate partial to interface header" do
+      includes = [UserInclude.new('header1.h'), UserInclude.new('partial_module.h'), UserInclude.new('header2.h')]
+      partials = {
+        'partial_module' => make_partial_config(mocks_type: Partials::ACCUMULATE)
+      }
+      impl_filename = 'module_impl.h'
+      interface_filename = 'partial_module_interface.h'
+      impl_header = UserInclude.new(impl_filename)
+      interface_header = UserInclude.new(interface_filename)
+
+      allow(@file_path_utils).to receive(:form_partial_implementation_header_filename)
+        .with('module')
+        .and_return(impl_filename)
+
+      allow(@file_path_utils).to receive(:form_partial_interface_header_filename)
+        .with('partial_module')
+        .and_return(interface_filename)
+
+      result = @partializer.remap_implementation_source_includes(
+        name: 'module',
+        includes: includes,
+        partials: partials
+      )
+
+      expect(result).to include(impl_header)
+      expect(result).to include(interface_header)
+      expect(result).to include(UserInclude.new('header1.h'))
+      expect(result).to include(UserInclude.new('header2.h'))
+      expect(result).not_to include(UserInclude.new('partial_module.h'))
+    end
+
     it "remaps multiple mockable partials to interface headers" do
       includes = [
         UserInclude.new('header1.h'),

data/spec/units/preprocess/preprocessinator_includes_handler_spec.rb

@@ -339,6 +339,67 @@ RSpec.describe PreprocessinatorIncludesHandler do
   end
 
 
+  # ===========================================================================
+  describe '#extract_bare_includes_from_text' do
+  # ===========================================================================
+
+    let(:filepath) { '/src/module.c' }
+
+    it 'extracts a simple user include' do
+      stub_file_open(filepath, "#include \"foo.h\"\n")
+      result = subject.extract_bare_includes_from_text(filepath: filepath)
+      expect(result.map(&:filename)).to include('foo.h')
+    end
+
+    it 'extracts a system include too, unlike extract_user_includes_from_text' do
+      stub_file_open(filepath, "#include <stdio.h>\n")
+      result = subject.extract_bare_includes_from_text(filepath: filepath)
+      expect(result.map(&:filename)).to include('stdio.h')
+    end
+
+    it 'returns plain Include objects, not UserInclude/SystemInclude' do
+      stub_file_open(filepath, "#include \"foo.h\"\n#include <stdio.h>\n")
+      result = subject.extract_bare_includes_from_text(filepath: filepath)
+      expect(result).to all( be_an_instance_of(Include) )
+    end
+
+    it 'ignores includes inside line comments' do
+      stub_file_open(filepath, "// #include \"commented_out.h\"\n")
+      result = subject.extract_bare_includes_from_text(filepath: filepath)
+      expect(result).to be_empty
+    end
+
+    it 'ignores includes inside block comments' do
+      content = "/* #include \"in_block.h\" */\n#include \"real.h\"\n"
+      stub_file_open(filepath, content)
+      result = subject.extract_bare_includes_from_text(filepath: filepath)
+      expect(result.map(&:filename)).to contain_exactly('real.h')
+    end
+
+    # The defining difference from extract_user_includes_from_text: no conditional
+    # tracking at all -- an #include inside an #ifdef for an undefined macro is
+    # still captured, since this method's whole purpose is to see past a guard
+    # whose condition can't be evaluated without opening another header (issue #1223).
+    it 'captures a conditionally-guarded include regardless of whether the guard could be evaluated true' do
+      content = <<~C
+        #ifdef UNDEFINED_MACRO
+        #include "conditional.h"
+        #endif
+      C
+      stub_file_open(filepath, content)
+      result = subject.extract_bare_includes_from_text(filepath: filepath)
+      expect(result.map(&:filename)).to include('conditional.h')
+    end
+
+    it 'removes a self-referential include matching the file being scanned' do
+      stub_file_open(filepath, "#include \"#{filepath}\"\n#include \"foo.h\"\n")
+      result = subject.extract_bare_includes_from_text(filepath: filepath)
+      expect(result.map(&:filename)).to contain_exactly('foo.h')
+    end
+
+  end
+
+
   # ===========================================================================
   describe '#extract_system_includes_from_text' do
   # ===========================================================================

data/spec/units/preprocess/preprocessinator_spec.rb

@@ -0,0 +1,136 @@
+# =========================================================================
+#   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_helper'
+require 'ceedling/preprocess/preprocessinator'
+require 'ceedling/includes/includes'
+
+RSpec.describe Preprocessinator do
+
+  before :each do
+    @includes_handler  = double('preprocessinator_includes_handler')
+    @comment_stripper  = double('preprocessinator_comment_stripper')
+    @file_assembler    = double('preprocessinator_file_assembler')
+    @reconstructor     = double('preprocessinator_reconstructor')
+    @file_path_utils   = double('file_path_utils')
+    @tool_executor     = double('tool_executor')
+    @file_wrapper      = double('file_wrapper')
+    @plugin_manager    = double('plugin_manager')
+    @configurator      = double('configurator')
+    @loginator         = double('loginator')
+    @reportinator      = double('reportinator')
+
+    allow(@loginator).to receive(:log)
+    allow(@loginator).to receive(:log_list)
+    allow(@reportinator).to receive(:generate_module_progress).and_return('')
+    allow(@configurator).to receive(:cmock_mock_prefix).and_return('Mock')
+  end
+
+  subject do
+    Preprocessinator.new(
+      preprocessinator_includes_handler: @includes_handler,
+      preprocessinator_comment_stripper: @comment_stripper,
+      preprocessinator_file_assembler:   @file_assembler,
+      preprocessinator_reconstructor:    @reconstructor,
+      file_path_utils:                   @file_path_utils,
+      tool_executor:                     @tool_executor,
+      file_wrapper:                      @file_wrapper,
+      plugin_manager:                    @plugin_manager,
+      configurator:                      @configurator,
+      loginator:                         @loginator,
+      reportinator:                      @reportinator
+    )
+  end
+
+  # ===========================================================================
+  describe '#preprocess_file_includes_common' do
+  # ===========================================================================
+
+    let(:filepath) { '/src/module.c' }
+
+    def call_it(defines: [])
+      subject.send(
+        :preprocess_file_includes_common,
+        test:                      'test',
+        filepath:                  filepath,
+        directives_only_filepath:  '/build/directives_only/module.c',
+        fallback:                  false,
+        flags:                     [],
+        include_paths:             [],
+        vendor_paths:              [],
+        defines:                   defines
+      )
+    end
+
+    before do
+      # Force the cache-miss path so real extraction runs every time.
+      allow(@file_path_utils).to receive(:form_preprocessed_includes_list_filepath).and_return('/build/includes/module.c.yml')
+      allow(@file_wrapper).to receive(:newer?).and_return(false)
+      allow(@includes_handler).to receive(:write_includes_list)
+
+      allow(@includes_handler).to receive(:extract_system_includes_preprocess).and_return([])
+    end
+
+    # Regression coverage for #1223: the gcc-based bare pass runs against an
+    # isolated copy that can never open another header, so a conditional
+    # #include guarded by a macro defined by an earlier #include in the same
+    # file evaluates false there and is silently dropped from that pass's own
+    # result. extract_bare_includes_from_text (a plain literal-text scan, no
+    # conditional evaluation at all) still sees it. Reconciliation should keep
+    # it once the accurate pass (user_includes here) also confirms it's real.
+    it "keeps an entry the gcc bare pass missed but the text-scan bare pass and the accurate pass both found" do
+      allow(@includes_handler).to receive(:extract_bare_includes).and_return(
+        [ Include.new('Types.h') ]
+      )
+      allow(@includes_handler).to receive(:extract_bare_includes_from_text).and_return(
+        [ Include.new('Types.h'), Include.new('types2.h') ]
+      )
+      allow(@includes_handler).to receive(:extract_user_includes_preprocess).and_return(
+        [ UserInclude.new('Types.h'), UserInclude.new('types2.h') ]
+      )
+
+      result = call_it()
+
+      expect(result.map(&:filename)).to include('types2.h')
+    end
+
+    # The union only ever adds candidates for reconcile to match against the
+    # accurate pass -- it must never single-handedly promote an entry neither
+    # gcc's bare pass nor the accurate pass itself ever reported.
+    it "does not introduce an entry the text-scan bare pass found but the accurate pass never confirms" do
+      allow(@includes_handler).to receive(:extract_bare_includes).and_return([])
+      allow(@includes_handler).to receive(:extract_bare_includes_from_text).and_return(
+        [ Include.new('phantom.h') ]
+      )
+      allow(@includes_handler).to receive(:extract_user_includes_preprocess).and_return([])
+
+      result = call_it()
+
+      expect(result.map(&:filename)).not_to include('phantom.h')
+    end
+
+    # Both bare sources finding the same entry must not produce a duplicate
+    # (the union is deduplicated by filename before being handed to reconcile).
+    it "does not duplicate an entry both bare passes agree on" do
+      allow(@includes_handler).to receive(:extract_bare_includes).and_return(
+        [ Include.new('Types.h') ]
+      )
+      allow(@includes_handler).to receive(:extract_bare_includes_from_text).and_return(
+        [ Include.new('Types.h') ]
+      )
+      allow(@includes_handler).to receive(:extract_user_includes_preprocess).and_return(
+        [ UserInclude.new('Types.h') ]
+      )
+
+      result = call_it()
+
+      expect(result.map(&:filename)).to eq(['Types.h'])
+    end
+
+  end
+
+end

data/vendor/c_exception/lib/CException.h

@@ -18,7 +18,7 @@ extern "C"
 
 #define CEXCEPTION_VERSION_MAJOR    1
 #define CEXCEPTION_VERSION_MINOR    3
-#define CEXCEPTION_VERSION_BUILD    4
+#define CEXCEPTION_VERSION_BUILD    5
 #define CEXCEPTION_VERSION          ((CEXCEPTION_VERSION_MAJOR << 16) | (CEXCEPTION_VERSION_MINOR << 8) | CEXCEPTION_VERSION_BUILD)
 
 //To Use CException, you have a number of options:

data/vendor/c_exception/project.yml

@@ -231,8 +231,8 @@
     #- ReportGenerator # Use ReportGenerator to create the specified reports.
   :reports: # Specify one or more reports to generate.
     # Make an HTML summary report.
-    - HtmlBasic
-    # - HtmlDetailed
+    # - HtmlBasic
+    - HtmlDetailed
     # - Text
     # - Cobertura
     # - SonarQube

data/vendor/c_exception/test/TestException.c

@@ -13,7 +13,7 @@ volatile int TestingTheFallbackId;
 
 void setUp(void)
 {
-    CExceptionFrames[0].pFrame = NULL;
+    CExceptionFrames[0].pFrame = 0;
     TestingTheFallback = 0;
 }
 

data/vendor/c_exception/test/support/CExceptionConfig.h

@@ -20,17 +20,11 @@ extern volatile int TestingTheFallbackId;
 #define CEXCEPTION_NONE (1234)
 
 // Optionally define a special handler for unhandled exceptions
-#define CEXCEPTION_NO_CATCH_HANDLER(id)             \
-{                                                   \
-    if (!TestingTheFallback)                        \
-    {                                               \
-        TEST_FAIL_MESSAGE("Unexpected Exception!"); \
-    }                                               \
-    else                                            \
-    {                                               \
-        TestingTheFallbackId = id;                  \
-        TestingTheFallback--;                       \
-    }                                               \
+#define CEXCEPTION_NO_CATCH_HANDLER(id)                                                   \
+{                                                                                         \
+    TEST_ASSERT_GREATER_THAN_INT_MESSAGE(0, TestingTheFallback, "Unexpected Exception!"); \
+    TestingTheFallbackId = id;                                                            \
+    TestingTheFallback--;                                                                 \
 }
 
 // Multi-Tasking environments will need a couple of macros defined to make this library

data/vendor/cmock/docs/CMockChangeLog.md

@@ -18,35 +18,36 @@ Prior to 2008, the project was an internal project and not released to the publi
 New Features:
 
   - Significant improvements to array and pointer handling:
-    - Arrays are now passed as arrays. Yes, even multidimensional ones. (Fixes #69, #119, #213, #422)
-    - Array plugin now supports comparing `char*` (string) arguments as byte arrays via `_ExpectWithArray`, while still treating them as strings via `_Expect` (Fixes #262 and #177)
-    - Improved automatic detection of pointer/length argument pairs (Fixes #520)
-    - When a pointer is auto-paired with a size argument, `_ExpectWithArrayExtended` is also generated as a fallback to allow explicit depth override (Fixes #476)
-    - `void*` arguments now default to pointer comparison without the array plugin, and to byte-by-byte comparison when the array plugin is active (Fixes #400)
-    - Handles *simple* preprocessor features like #if 1 and #if 0 (Fixes #163)
-    - Ignores static assertions of various types (Fixes #128)
-    - Added option to trace all mock setup and mocked calls (Implements #403)
+    - Arrays are now passed as arrays. Yes, even multidimensional ones. (Fixes [#69](https://github.com/ThrowTheSwitch/CMock/issues/69)
+, [#119](https://github.com/ThrowTheSwitch/CMock/issues/119), [#213](https://github.com/ThrowTheSwitch/CMock/issues/213), [#422](https://github.com/ThrowTheSwitch/CMock/issues/422))
+    - Array plugin now supports comparing `char*` (string) arguments as byte arrays via `_ExpectWithArray`, while still treating them as strings via `_Expect` (Fixes [#262](https://github.com/ThrowTheSwitch/CMock/issues/262) and [#177](https://github.com/ThrowTheSwitch/CMock/issues/177))
+    - Improved automatic detection of pointer/length argument pairs (Fixes [#520](https://github.com/ThrowTheSwitch/CMock/issues/520))
+    - When a pointer is auto-paired with a size argument, `_ExpectWithArrayExtended` is also generated as a fallback to allow explicit depth override (Fixes [#476](https://github.com/ThrowTheSwitch/CMock/issues/476))
+    - `void*` arguments now default to pointer comparison without the array plugin, and to byte-by-byte comparison when the array plugin is active (Fixes [#400](https://github.com/ThrowTheSwitch/CMock/issues/400))
+    - Handles *simple* preprocessor features like #if 1 and #if 0 (Fixes [#163](https://github.com/ThrowTheSwitch/CMock/issues/163))
+    - Ignores static assertions of various types (Fixes [#128](https://github.com/ThrowTheSwitch/CMock/issues/128))
+    - Added option to trace all mock setup and mocked calls (Implements [#403](https://github.com/ThrowTheSwitch/CMock/issues/403))
   - Significant improvements to header parsing speed
 
 Significant Bugfixes:
 
-  - Fixed matching of pointer/len argument pairs in reverse order (Fixes #479)
-  - Fixed handling of array of pointers or a pointer to an array (Fixes #450)
-  - Fixed const and pointer order handling issues (Fixes #484 and #485)
-  - Fixed handling of skeleton paths (Fixes #488)
-  - Fixed handling of memory alignment issues (Fixes #178)
-  - Fixed handling of failures in teardown (#67)
-  - Improved handling of function-looking structs (Fixes #513 and #334)
-  - Improved handling of function-looking macros (Fixes #502)
-  - Improved handling of volatiles (Fixes #110 and #135)
-  - Improved handling of stub and callback counters (Fixes #132)
-  - Improved handling and testing of Windows (Fixes #435)
+  - Fixed matching of pointer/len argument pairs in reverse order (Fixes [#479](https://github.com/ThrowTheSwitch/CMock/issues/479))
+  - Fixed handling of array of pointers or a pointer to an array (Fixes [#450](https://github.com/ThrowTheSwitch/CMock/issues/450))
+  - Fixed const and pointer order handling issues (Fixes [#484](https://github.com/ThrowTheSwitch/CMock/issues/484) and [#485](https://github.com/ThrowTheSwitch/CMock/issues/485))
+  - Fixed handling of skeleton paths (Fixes [#488](https://github.com/ThrowTheSwitch/CMock/issues/488))
+  - Fixed handling of memory alignment issues (Fixes [#178](https://github.com/ThrowTheSwitch/CMock/issues/178))
+  - Fixed handling of failures in teardown ([#67](https://github.com/ThrowTheSwitch/CMock/issues/67))
+  - Improved handling of function-looking structs (Fixes [#513](https://github.com/ThrowTheSwitch/CMock/issues/513) and [#334](https://github.com/ThrowTheSwitch/CMock/issues/334))
+  - Improved handling of function-looking macros (Fixes [#502](https://github.com/ThrowTheSwitch/CMock/issues/502))
+  - Improved handling of volatiles (Fixes #110 and [#135](https://github.com/ThrowTheSwitch/CMock/issues/135))
+  - Improved handling of stub and callback counters (Fixes [#132](https://github.com/ThrowTheSwitch/CMock/issues/132))
+  - Improved handling and testing of Windows (Fixes [#435](https://github.com/ThrowTheSwitch/CMock/issues/435))
 
 Other:
 
-  - Added verification that memory errors are reported and stop tests (Verifies #463)
-  - Added verification that CMock features pass Valgrind (Verifies #506)
-  - Documented custom type support (#124)
+  - Added verification that memory errors are reported and stop tests (Verifies [#463](https://github.com/ThrowTheSwitch/CMock/issues/463))
+  - Added verification that CMock features pass Valgrind (Verifies [#506](https://github.com/ThrowTheSwitch/CMock/issues/506))
+  - Documented custom type support ([#124](https://github.com/ThrowTheSwitch/CMock/issues/124))
 
 #### Major Code/Doc Contributors
 

data/vendor/cmock/scripts/create_makefile.rb

@@ -137,10 +137,11 @@ File.open(TEST_MAKEFILE, 'w') do |mkfile|
     mkfile.puts ''
 
     # Collect mocks to generate
-    system_mocks = cfg[:includes][:system].select { |name| name =~ MOCK_MATCHER }
-    raise 'Mocking of system headers is not yet supported!' unless system_mocks.empty?
+    local_mocks = cfg[:includes][:headers].select do |name|
+      raise 'Mocking of system headers is not yet supported!' if name =~ /^</
 
-    local_mocks = cfg[:includes][:local].select { |name| name =~ MOCK_MATCHER }
+      (name =~ MOCK_MATCHER)
+    end
 
     module_names_to_mock = local_mocks.map { |name| name.sub(/#{MOCK_PREFIX}/, '').to_s }
     headers_to_mock = []

data/vendor/cmock/src/cmock.h

@@ -12,7 +12,7 @@
 
 #define CMOCK_VERSION_MAJOR    2
 #define CMOCK_VERSION_MINOR    7
-#define CMOCK_VERSION_BUILD    0
+#define CMOCK_VERSION_BUILD    2
 #define CMOCK_VERSION          ((CMOCK_VERSION_MAJOR << 16) | (CMOCK_VERSION_MINOR << 8) | CMOCK_VERSION_BUILD)
 
 /* should be big enough to index full range of CMOCK_MEM_MAX */

data/vendor/cmock/vendor/c_exception/lib/CException.h

@@ -18,7 +18,7 @@ extern "C"
 
 #define CEXCEPTION_VERSION_MAJOR    1
 #define CEXCEPTION_VERSION_MINOR    3
-#define CEXCEPTION_VERSION_BUILD    4
+#define CEXCEPTION_VERSION_BUILD    5
 #define CEXCEPTION_VERSION          ((CEXCEPTION_VERSION_MAJOR << 16) | (CEXCEPTION_VERSION_MINOR << 8) | CEXCEPTION_VERSION_BUILD)
 
 //To Use CException, you have a number of options:

data/vendor/cmock/vendor/c_exception/project.yml

@@ -231,8 +231,8 @@
     #- ReportGenerator # Use ReportGenerator to create the specified reports.
   :reports: # Specify one or more reports to generate.
     # Make an HTML summary report.
-    - HtmlBasic
-    # - HtmlDetailed
+    # - HtmlBasic
+    - HtmlDetailed
     # - Text
     # - Cobertura
     # - SonarQube

data/vendor/cmock/vendor/c_exception/test/TestException.c

@@ -13,7 +13,7 @@ volatile int TestingTheFallbackId;
 
 void setUp(void)
 {
-    CExceptionFrames[0].pFrame = NULL;
+    CExceptionFrames[0].pFrame = 0;
     TestingTheFallback = 0;
 }
 

data/vendor/cmock/vendor/c_exception/test/support/CExceptionConfig.h

@@ -20,17 +20,11 @@ extern volatile int TestingTheFallbackId;
 #define CEXCEPTION_NONE (1234)
 
 // Optionally define a special handler for unhandled exceptions
-#define CEXCEPTION_NO_CATCH_HANDLER(id)             \
-{                                                   \
-    if (!TestingTheFallback)                        \
-    {                                               \
-        TEST_FAIL_MESSAGE("Unexpected Exception!"); \
-    }                                               \
-    else                                            \
-    {                                               \
-        TestingTheFallbackId = id;                  \
-        TestingTheFallback--;                       \
-    }                                               \
+#define CEXCEPTION_NO_CATCH_HANDLER(id)                                                   \
+{                                                                                         \
+    TEST_ASSERT_GREATER_THAN_INT_MESSAGE(0, TestingTheFallback, "Unexpected Exception!"); \
+    TestingTheFallbackId = id;                                                            \
+    TestingTheFallback--;                                                                 \
 }
 
 // Multi-Tasking environments will need a couple of macros defined to make this library