ceedling 1.1.5 → 1.1.6

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

data/vendor/cmock/vendor/unity/auto/generate_test_runner.rb

@@ -71,24 +71,30 @@ class UnityTestRunnerGenerator
     source = File.read(input_file)
     source = source.force_encoding('ISO-8859-1').encode('utf-8', replace: nil)
     tests = find_tests(source)
-    headers = find_includes(source)
-    testfile_includes = @options[:use_system_files] ? (headers[:local] + headers[:system]) : headers[:local]
-    used_mocks = find_mocks(testfile_includes)
-    testfile_includes = (testfile_includes - used_mocks)
-    testfile_includes.delete_if { |inc| inc =~ /(unity|cmock)/ }
+    includes = find_includes(source)
+    headers = includes[:headers]
+    used_mocks = find_mocks(headers)
+    headers = (headers - used_mocks)
+    headers.delete_if { |inc| inc =~ /(unity|cmock)/ }
     find_setup_and_teardown(source)
 
     # build runner file
-    generate(input_file, output_file, tests, used_mocks, testfile_includes)
+    generate(input_file, output_file, tests, used_mocks, headers)
 
     # determine which files were used to return them
     all_files_used = [input_file, output_file]
-    all_files_used += testfile_includes.map { |filename| "#{filename}.c" } unless testfile_includes.empty?
+    all_files_used += headers.reject { |filename| filename =~ /^</ }.map { |filename| "#{filename}.c" } unless headers.empty?
     all_files_used += @options[:includes] unless @options[:includes].empty?
-    all_files_used += headers[:linkonly] unless headers[:linkonly].empty?
+    all_files_used += includes[:linkonly] unless includes[:linkonly].empty?
     all_files_used.uniq
   end
 
+  # Generate a test file for the given features:
+  #   input_file        - the name of the test file this is based on
+  #   output_file       - the name of the test runner file to generate
+  #   tests             - an array of all the tests which can be run from this test runner
+  #   used_mocks        - an array of all mock files which are used by this test runner
+  #   testfile_includes - an array of all included headers, in order, where system headers still have their <> attached
   def generate(input_file, output_file, tests, used_mocks, testfile_includes)
     File.open(output_file, 'w') do |output|
       create_header(output, used_mocks, testfile_includes)
@@ -100,16 +106,17 @@ class UnityTestRunnerGenerator
       create_suite_setup(output)
       create_suite_teardown(output)
       create_reset(output)
-      create_run_test(output) unless tests.empty?
+      create_run_test(output)
       create_args_wrappers(output, tests)
       create_shuffle_tests(output) if @options[:shuffle_tests]
+      tests = create_warning_test(output, input_file, tests)
       create_main(output, input_file, tests, used_mocks)
     end
 
     return unless @options[:header_file] && !@options[:header_file].empty?
 
     File.open(@options[:header_file], 'w') do |output|
-      create_h_file(output, @options[:header_file], tests, testfile_includes, used_mocks)
+      create_h_file(output, @options[:header_file], tests, headers, used_mocks)
     end
   end
 
@@ -211,10 +218,14 @@ class UnityTestRunnerGenerator
     source.gsub!(/\/\*.*?\*\//m, '')                     # remove block comments
     source.gsub!(/\/\/.*$/, '')                          # remove line comments (all that remain)
 
-    # parse out includes
+    # parse out includes (NOTICE: system includes KEEP the angle-brackets in the string, to preserve this information)
+    headers = if @options[:use_system_files]
+                source.scan(/^\s*#include\s+(?:(<)|")\s*(.+\.#{@options[:include_extensions]})\s*(?:(>)|")/).map(&:join).flatten
+              else
+                source.scan(/^\s*#include\s+"\s*(.+\.#{@options[:include_extensions]})\s*"/).flatten
+              end
     {
-      local: source.scan(/^\s*#include\s+"\s*(.+\.#{@options[:include_extensions]})\s*"/).flatten,
-      system: source.scan(/^\s*#include\s+<\s*(.+)\s*>/).flatten.map { |inc| "<#{inc}>" },
+      headers: headers,
       linkonly: source.scan(/^TEST_SOURCE_FILE\(\s*"\s*(.+\.#{@options[:source_extensions]})\s*"/).flatten
     }
   end
@@ -251,7 +262,7 @@ class UnityTestRunnerGenerator
     end
   end
 
-  def create_header(output, mocks, testfile_includes = [])
+  def create_header(output, mocks, headers = [])
     output.puts('/* AUTOGENERATED FILE. DO NOT EDIT. */')
     output.puts("\n/*=======Automagically Detected Files To Include=====*/")
     output.puts('extern "C" {') if @options[:externcincludes]
@@ -274,10 +285,7 @@ class UnityTestRunnerGenerator
     if @options[:header_file] && !@options[:header_file].empty?
       output.puts("#include \"#{File.basename(@options[:header_file])}\"")
     else
-      @options[:includes].flatten.uniq.compact.each do |inc|
-        output.puts("#include #{inc.include?('<') ? inc : "\"#{inc}\""}")
-      end
-      testfile_includes.each do |inc|
+      [@options[:includes], headers].flatten.uniq.compact.each do |inc|
         output.puts("#include #{inc.include?('<') ? inc : "\"#{inc}\""}")
       end
     end
@@ -406,10 +414,43 @@ class UnityTestRunnerGenerator
   end
 
   def create_run_test(output)
-    require 'erb'
-    file = File.read(File.join(__dir__, 'run_test.erb'))
-    template = ERB.new(file, trim_mode: '<>')
-    output.puts("\n#{template.result(binding)}")
+    output.puts('/*=======Test Runner Used To Run Each Test=====*/')
+    output.puts('static void run_test(UnityTestFunction func, const char* name, UNITY_LINE_TYPE line_num)')
+    output.puts('{')
+    output.puts('    Unity.CurrentTestName = name;')
+    output.puts('    Unity.CurrentTestLineNumber = (UNITY_UINT) line_num;')
+    output.puts('#ifdef UNITY_USE_COMMAND_LINE_ARGS')
+    output.puts('    if (!UnityTestMatches())')
+    output.puts('        return;')
+    output.puts('#endif')
+    output.puts('    Unity.NumberOfTests++;')
+    output.puts('    UNITY_CLR_DETAILS();')
+    output.puts('    UNITY_EXEC_TIME_START();')
+    output.puts('    CMock_Init();')
+    output.puts('    if (TEST_PROTECT())')
+    output.puts('    {')
+    if @options[:plugins].include?(:cexception)
+      output.puts('        volatile CEXCEPTION_T e;')
+      output.puts('        Try {')
+      output.puts("            #{@options[:setup_name]}();")
+      output.puts('            func();')
+      output.puts('        } Catch(e) {')
+      output.puts('            TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!");')
+      output.puts('        }')
+    else
+      output.puts("        #{@options[:setup_name]}();")
+      output.puts('        func();')
+    end
+    output.puts('    }')
+    output.puts('    if (TEST_PROTECT())')
+    output.puts('    {')
+    output.puts("        #{@options[:teardown_name]}();")
+    output.puts('        CMock_Verify();')
+    output.puts('    }')
+    output.puts('    CMock_Destroy();')
+    output.puts('    UNITY_EXEC_TIME_STOP();')
+    output.puts('    UnityConcludeTest();')
+    output.puts('}')
   end
 
   def create_args_wrappers(output, tests)
@@ -428,6 +469,22 @@ class UnityTestRunnerGenerator
     end
   end
 
+  def create_warning_test(output, filename, tests)
+    if count_tests(tests) == 0
+      warning_test = {
+        :test => 'test_empty_warning',
+        :line_number => 0
+      }
+      output.puts("\n/*=======Warning Test=====*/")
+      output.puts("static void #{warning_test[:test]}(void)")
+      output.puts('{')
+      output.puts("    TEST_IGNORE_MESSAGE(\"Test file '#{filename.gsub(/\\/, '\\\\\\')}' contains no tests.\");")
+      output.puts("}\n")
+      tests = [warning_test]
+    end
+    tests
+  end
+
   def create_shuffle_tests(output)
     output.puts("\n/*=======Shuffle Test Order=====*/")
     output.puts('static void shuffleTests(struct UnityRunTestParameters run_test_params_arr[], int num_of_tests)')
@@ -453,13 +510,15 @@ class UnityTestRunnerGenerator
       end
       output.puts("#{@options[:main_export_decl]} int #{main_name}(int argc, char** argv)")
       output.puts('{')
+      output.puts('(void)argc;')
+      output.puts('(void)argv;')
       output.puts('#ifdef UNITY_USE_COMMAND_LINE_ARGS')
       output.puts('  int parse_status = UnityParseOptions(argc, argv);')
       output.puts('  if (parse_status != 0)')
       output.puts('  {')
       output.puts('    if (parse_status < 0)')
       output.puts('    {')
-      output.puts("      UnityPrint(\"#{filename.gsub('.c', '').gsub(/\\/, '\\\\\\')}.\");")
+      output.puts("      UnityPrint(\"#{filename.gsub(/\\/, '\\\\\\')}\");")
       output.puts('      UNITY_PRINT_EOL();')
       tests.each do |test|
         if !@options[:use_param_tests] || test[:args].nil? || test[:args].empty?
@@ -533,7 +592,7 @@ class UnityTestRunnerGenerator
     output.puts('  CMock_Guts_MemFreeFinal();') unless used_mocks.empty?
     if @options[:has_suite_teardown]
       if @options[:omit_begin_end]
-        output.puts('  (void) suite_teardown(0);')
+        output.puts('  (void) suiteTearDown(0);')
       else
         output.puts('  return suiteTearDown(UNITY_END());')
       end
@@ -543,17 +602,14 @@ class UnityTestRunnerGenerator
     output.puts('}')
   end
 
-  def create_h_file(output, filename, tests, testfile_includes, used_mocks)
+  def create_h_file(output, filename, tests, headers, used_mocks)
     filename = File.basename(filename).gsub(/[-\/\\.,\s]/, '_').upcase
     output.puts('/* AUTOGENERATED FILE. DO NOT EDIT. */')
     output.puts("#ifndef _#{filename}")
     output.puts("#define _#{filename}\n\n")
     output.puts("#include \"#{@options[:framework]}.h\"")
     output.puts('#include "cmock.h"') unless used_mocks.empty?
-    @options[:includes].flatten.uniq.compact.each do |inc|
-      output.puts("#include #{inc.include?('<') ? inc : "\"#{inc}\""}")
-    end
-    testfile_includes.each do |inc|
+    [@options[:includes], headers].flatten.uniq.compact.each do |inc|
       output.puts("#include #{inc.include?('<') ? inc : "\"#{inc}\""}")
     end
     output.puts "\n"

data/vendor/cmock/vendor/unity/docs/UnityChangeLog.md

@@ -29,6 +29,7 @@ Significant Bugfixes:
   - display of failures fixed on ARM processors, particularly with arrays (#807)
   - fixed each-equal assertion for memory (#797)
   - fix many warnings.
+  - Test runner generator calls custom suite teardown when begin/end calls are omitted. @94xhn
 
 Other:
 

data/vendor/cmock/vendor/unity/examples/unity_config.h

@@ -250,4 +250,12 @@
  */
 /* #define UNITY_INCLUDE_EXEC_TIME */
 
+/* Define this macro to redefine what the UnityPrintChar() function considers
+ * a printable character.
+ *
+ * Example, for printing UTF-8:
+ * #define UNITY_IS_PRINTABLE_CHAR(c) ((128 <= (c)) && ((c) <= 255))
+*/
+/* #define UNITY_IS_PRINTABLE_CHAR(c) ((32 <= (c)) && ((c) <= 126)) */
+
 #endif /* UNITY_CONFIG_H */

data/vendor/cmock/vendor/unity/src/unity.c

@@ -7,6 +7,8 @@
 
 #include "unity.h"
 
+#include <stdbool.h>
+
 #ifndef UNITY_PROGMEM
 #define UNITY_PROGMEM
 #endif
@@ -88,8 +90,14 @@ static const char UNITY_PROGMEM UnityStrDetail2Name[]            = " " UNITY_DET
 /* Local helper function to print characters. */
 static void UnityPrintChar(const char* pch)
 {
+#ifdef UNITY_IS_PRINTABLE_CHAR
+    const int isPrintable = UNITY_IS_PRINTABLE_CHAR(*pch);
+#else
+    const int isPrintable = ((32 <= *pch) && (*pch <= 126));
+#endif
+
     /* printable characters plus CR & LF are printed */
-    if ((*pch <= 126) && (*pch >= 32))
+    if (isPrintable)
     {
         UNITY_OUTPUT_CHAR(*pch);
     }

data/vendor/cmock/vendor/unity/src/unity.h

@@ -11,7 +11,7 @@
 
 #define UNITY_VERSION_MAJOR    2
 #define UNITY_VERSION_MINOR    7
-#define UNITY_VERSION_BUILD    0
+#define UNITY_VERSION_BUILD    2
 #define UNITY_VERSION          ((UNITY_VERSION_MAJOR << 16) | (UNITY_VERSION_MINOR << 8) | UNITY_VERSION_BUILD)
 
 #ifdef __cplusplus

data/vendor/cmock/vendor/unity/test/rakefile

@@ -19,6 +19,7 @@ TEMP_DIRS = [
 
 TEMP_DIRS.each do |dir|
   directory(dir)
+  CLEAN.include(File.join(dir, '*.*'))
   CLOBBER.include(dir)
 end
 
@@ -167,7 +168,7 @@ namespace :style do
 
   desc "Attempt to Autocorrect style"
   task :auto  => ['style:clean'] do
-    execute("rubocop ../auto ../examples ../extras --auto-correct --config .rubocop.yml")
+    execute("rubocop ../auto ../examples ../extras --autocorrect --config .rubocop.yml")
     report "Autocorrected What We Could."
   end
 

data/vendor/cmock/vendor/unity/test/testdata/testRunnerGeneratorEmpty.c

@@ -0,0 +1,13 @@
+/* =========================================================================
+    Unity - A Test Framework for C
+    ThrowTheSwitch.org
+    Copyright (c) 2007-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
+    SPDX-License-Identifier: MIT
+========================================================================= */
+
+/* This Test File Is Used To Verify The Warning When No Tests Are Found */
+
+#include "unity.h"
+
+void setUp(void) {}
+void tearDown(void) {}