ceedling 1.0.0 → 1.1.0

data/vendor/unity/test/Makefile

@@ -9,14 +9,12 @@ ifeq ($(shell uname -s), Darwin)
 CC = clang
 endif
 ifeq ($(findstring clang, $(CC)), clang)
-E = -Weverything
-CFLAGS += $E -Wno-unknown-warning-option -Wno-missing-prototypes
-CFLAGS += -Wno-unused-macros -Wno-padded -Wno-missing-noreturn
+CFLAGS += -Wno-unknown-warning-option
+CFLAGS += -Wno-unsafe-buffer-usage
 endif
 CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror
 #CFLAGS += -Wconversion #disabled because if falsely complains about the isinf and isnan macros
-CFLAGS += -Wno-switch-enum -Wno-double-promotion
-CFLAGS += -Wno-poison-system-directories
+CFLAGS += -Wno-switch-enum -Wno-double-promotion -Wno-poison-system-directories -Wno-missing-noreturn
 CFLAGS += -Wno-covered-switch-default
 CFLAGS += -Wbad-function-cast -Wcast-qual -Wold-style-definition -Wshadow -Wstrict-overflow \
           -Wstrict-prototypes -Wswitch-default -Wundef
@@ -44,7 +42,7 @@ TARGET = build/testunity-cov.exe
 
 # To generate coverage, call 'make -s', the default target runs.
 # For verbose output of all the tests, run 'make test'.
-default: coverage
+default: test
 .PHONY: default coverage test clean
 coverage: $(SRC1) $(SRC2) $(SRC3) $(SRC4) $(SRC5) $(SRC6) $(SRC7) $(SRC8)
 	cd $(BUILD_DIR) && \

data/vendor/unity/test/rakefile

@@ -1,7 +1,7 @@
 # =========================================================================
 #   Unity - A Test Framework for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2007-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 
@@ -11,7 +11,6 @@ $extra_paths = []
 require 'rake'
 require 'rake/clean'
 require_relative 'rakefile_helper'
-require 'rspec/core/rake_task'
 
 TEMP_DIRS = [
 	File.join(__dir__, 'build'),
@@ -28,61 +27,79 @@ task :prepare_for_tests => TEMP_DIRS
 include RakefileHelpers
 
 # Load proper GCC as defult configuration
-DEFAULT_CONFIG_FILE = 'gcc_auto_stdint.yml'
-configure_toolchain(DEFAULT_CONFIG_FILE)
+DEFAULT_CONFIG_FILE = 'gcc.yml'
+$unity_test_config_file = DEFAULT_CONFIG_FILE
 
 ############# ALL THE SELF-TESTS WE CAN PERFORM
 namespace :test do
   desc "Build and test Unity"
   task :all => [:clean, :prepare_for_tests, 'test:scripts', 'test:unit', :style, 'test:fixture', 'test:memory', 'test:summary']
-  task :ci => [:clean, :prepare_for_tests, 'test:scripts', 'test:unit', :style, 'test:make', 'test:fixture', 'test:memory', 'test:summary']
+  task :ci => [:clean, :prepare_for_tests, 'test:scripts', 'test:unit', :style, 'test:make', 'test:fixture', 'test:memory', 'test:examples', 'test:summary']
 
   desc "Test unity with its own unit tests"
-  task :unit => [:prepare_for_tests] do
+  task :unit => [:config_toolchain, :prepare_for_tests] do
     run_tests unit_test_files
   end
 
   namespace :unit do
     unit_test_files.each do |f|
       desc "test this unit only"
-      task File.basename(f,'.c').sub('test_unity_','') => [:prepare_for_tests] do
+      task File.basename(f,'.c').sub('test_unity_','') => [:config_toolchain, :prepare_for_tests] do
         run_tests [f]
       end
     end
   end
 
   desc "Test unity's helper scripts"
-  task :scripts => [:prepare_for_tests] do
-    Dir['tests/test_*.rb'].each do |scriptfile|
-      require "./"+scriptfile
+  task :scripts => [:config_toolchain, :prepare_for_tests] do
+    begin
+      Dir['tests/test_*.rb'].each do |scriptfile|
+        require "./"+scriptfile
+      end
+    ensure
+      total    = $generate_test_runner_tests    || 0
+      failures = $generate_test_runner_failures || 0
+      result   = "#{total} Tests #{failures} Failures 0 Ignored\n"
+      result  += failures > 0 ? "FAILED\n" : "OK\n"
+      save_test_results('scripts', result)
     end
   end
 
   desc "Test unity triggered from make"
-  task :make => [:prepare_for_tests] do
+  task :make => [:config_toolchain, :prepare_for_tests] do
     run_make_tests()
   end
 
   desc "Test unity fixture addon"
-  task :fixture => [:prepare_for_tests] do
+  task :fixture => [:config_toolchain, :prepare_for_tests] do
     test_fixtures()
   end
 
   desc "Test unity memory addon"
-  task :memory => [:prepare_for_tests] do
+  task :memory => [:config_toolchain, :prepare_for_tests] do
     test_memory()
   end
 
   desc "Test unity examples"
-  task :examples => [:prepare_for_tests] do
-    execute("cd ../examples/example_1 && make -s ci", false)
-    execute("cd ../examples/example_2 && make -s ci", false)
-    execute("cd ../examples/example_3 && rake", false)
+  task :examples => [:config_toolchain, :prepare_for_tests] do
+    run_examples
   end
 
   desc "Run all rspecs"
-  RSpec::Core::RakeTask.new(:spec) do |t|
-    t.pattern = 'spec/**/*_spec.rb'
+  task :spec => [:config_toolchain, :prepare_for_tests] do
+    output = execute("rspec spec/**/*_spec.rb", true)
+    rspec_ok = $?.exitstatus.zero?
+    report output
+    total = failures = pending = 0
+    if output =~ /(\d+) examples?, (\d+) failures?(?:, (\d+) pending)?/
+      total    = Regexp.last_match(1).to_i
+      failures = Regexp.last_match(2).to_i
+      pending  = (Regexp.last_match(3) || 0).to_i
+    end
+    result   = "#{total} Tests #{failures} Failures #{pending} Ignored\n"
+    result  += rspec_ok ? "OK\n" : "FAILED\n"
+    save_test_results('spec', result)
+    raise "Command failed." unless rspec_ok
   end
 
   desc "Generate test summary"
@@ -98,7 +115,11 @@ task :default => [:clobber, :all]
 
 desc "Load configuration"
 task :config, :config_file do |t, args|
-  configure_toolchain(args[:config_file])
+  $unity_test_config_file = args[:config_file]
+end
+
+task :config_toolchain do 
+  configure_toolchain($unity_test_config_file)
 end
 
 task :no_color do
@@ -157,7 +178,7 @@ namespace :style do
   end
 
   task :clean do
-    File.delete(".rubocop_todo.yml") if File.exists?(".rubocop_todo.yml")
+    File.delete(".rubocop_todo.yml") if File.exist?(".rubocop_todo.yml")
   end
 end
 

data/vendor/unity/test/rakefile_helper.rb

@@ -1,7 +1,7 @@
 # =========================================================================
 #   Unity - A Test Framework for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2007-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 
@@ -13,11 +13,21 @@ require_relative '../auto/yaml_helper'
 
 module RakefileHelpers
   C_EXTENSION = '.c'.freeze
+
   def load_configuration(config_file)
     return if $configured
 
-    $cfg_file = "targets/#{config_file}" unless config_file =~ /[\\|\/]/
-    $cfg = YamlHelper.load_file($cfg_file)
+    $cfg_file_base = config_file
+    cfg_file = if config_file =~ /[\\|\/]/
+      $unity_test_config_file_in_targets = false
+      config_file
+    else
+      $unity_test_config_file_in_targets = true
+      "targets/#{config_file}"
+    end
+    $cfg = YamlHelper.load_file(cfg_file)
+    $cfg[:paths] ||= {}
+    $cfg[:paths][:test] = (Array($cfg[:paths][:test]) + ['src/', '../src/', 'testdata/', 'tests/']).uniq
     $colour_output = false unless $cfg['colour']
     $configured = true if config_file != DEFAULT_CONFIG_FILE
   end
@@ -96,7 +106,14 @@ module RakefileHelpers
     args = []
     hash[:arguments].each do |arg|
       if arg.include? '$'
-        if arg.include? ': COLLECTION_PATHS_TEST_TOOLCHAIN_INCLUDE'
+        if arg.include? '${5}'
+          all_paths = [ File.join('..','src'), $extra_paths, File.join('tests'), File.join('testdata'), $cfg[:paths][:support] ].flatten.uniq.compact
+          all_paths.each { |f| args << arg.gsub('${5}', f) }
+
+        elsif arg.include? '${6}'
+          [ $cfg[:defines][:test], $cfg.dig(:unity, :defines), defines ].flatten.uniq.compact.each { |f| args << arg.gsub('${6}', f) }
+
+        elsif arg.include? ': COLLECTION_PATHS_TEST_TOOLCHAIN_INCLUDE'
           pattern = arg.gsub(': COLLECTION_PATHS_TEST_TOOLCHAIN_INCLUDE','')
           [ File.join('..','src') ].each do |f|
             args << pattern.gsub(/\$/,f)
@@ -110,7 +127,7 @@ module RakefileHelpers
 
         elsif arg.include? ': COLLECTION_DEFINES_TEST_AND_VENDOR'
           pattern = arg.gsub(': COLLECTION_DEFINES_TEST_AND_VENDOR','')
-          [ $cfg[:defines][:test], defines ].flatten.uniq.compact.each do |f|
+          [ $cfg[:defines][:test], $cfg.dig(:unity, :defines), defines ].flatten.uniq.compact.each do |f|
             args << pattern.gsub(/\$/,f)
           end
 
@@ -136,7 +153,7 @@ module RakefileHelpers
   end
 
   def compile(file, defines = [])
-    out_file = File.join('build', File.basename(file, C_EXTENSION)) + $cfg[:extension][:object]
+    out_file = File.join('build', File.basename(file, C_EXTENSION)) + ($cfg[:extension][:object] || '.o')
     cmd_str = build_command_string( $cfg[:tools][:test_compiler], [ file, out_file ], defines )
     execute(cmd_str)
     out_file
@@ -165,7 +182,7 @@ module RakefileHelpers
               "--style=allman --indent=spaces=4 --indent-switches --indent-preproc-define --indent-preproc-block " \
               "--pad-oper --pad-comma --unpad-paren --pad-header " \
               "--align-pointer=type --align-reference=name " \
-              "--add-brackets --mode=c --suffix=none " \
+              "--mode=c --suffix=none " \
               "#{style_what}"
     execute(command, false)
     report "Styling C:PASS"
@@ -189,6 +206,32 @@ module RakefileHelpers
     report summary.run
   end
 
+  # Parse all Unity summary lines from combined output (e.g. multiple executables)
+  # and produce a single synthesized result string suitable for save_test_results.
+  def collect_test_output(output)
+    total_tests    = 0
+    total_failures = 0
+    total_ignored  = 0
+    detail_lines   = []
+
+    output.each_line do |line|
+      stripped = line.chomp
+      if stripped =~ /(\d+) Tests (\d+) Failures (\d+) Ignored/
+        total_tests    += Regexp.last_match(1).to_i
+        total_failures += Regexp.last_match(2).to_i
+        total_ignored  += Regexp.last_match(3).to_i
+      elsif stripped =~ /^[^:]+:[^:]+:\w+(?:\([^)]*\))?:(?:PASS|FAIL|IGNORE)/
+        detail_lines << stripped
+      end
+    end
+
+    synthesized  = detail_lines.join("\n")
+    synthesized += "\n" unless detail_lines.empty?
+    synthesized += "#{total_tests} Tests #{total_failures} Failures #{total_ignored} Ignored\n"
+    synthesized += total_failures > 0 ? "FAILED\n" : "OK\n"
+    synthesized
+  end
+
   def save_test_results(test_base, output)
     test_results = File.join('build',test_base)
     if output.match(/OK$/m).nil?
@@ -215,7 +258,7 @@ module RakefileHelpers
     obj_list = src_files.map { |f| compile(f, ['UNITY_SKIP_DEFAULT_RUNNER', 'UNITY_FIXTURE_NO_EXTRAS']) }
 
     # Link the test executable
-    test_base = File.basename('framework_test', C_EXTENSION)
+    test_base = File.basename('fixtures_test', C_EXTENSION)
     link_it(test_base, obj_list)
 
     # Run and collect output
@@ -282,7 +325,7 @@ module RakefileHelpers
       runner_name = test_base + '_Runner.c'
       runner_path = File.join('build',runner_name)
 
-      options = $cfg[:unity]
+      options = $cfg[:unity] || {}
       options[:use_param_tests] = test =~ /parameterized/ ? true : false
       UnityTestRunnerGenerator.new(options).run(test, runner_path)
       obj_list << compile(runner_path, test_defines)
@@ -293,24 +336,120 @@ module RakefileHelpers
       # Link the test executable
       link_it(test_base, obj_list)
 
-      # Execute unit test and generate results file
+      # Execute unit test
       output = runtest(test_base)
+      
+      # This is a list of all non-string valid outputs
+      # (in order) this is the following options:
+      #     valid binary representations
+      #     valid hexadecimal representation
+      #     valid integer (signed or unsigned) or float values of any precision
+      #     valid floating point special-case verbage
+      #     valid boolean verbage
+      #     valid pointer verbage
+      #     string representations
+      #     character representations
+      valid_vals_regexes = [
+        /[01X]+/,
+        /0x[0-9A-Fa-f]+/,
+        /-?\d+(?:\.\d+)?/,
+        /(?:Not )?(?:Negative )?(?:Infinity|NaN|Determinate|Invalid Float Trait)/,
+        /TRUE|FALSE/,
+        /NULL/,
+        /"[^"]*"/,
+        /'[^']*'/
+      ]
+      valid_vals = "(?:#{valid_vals_regexes.map(&:source).join('|')})"
+
+      # Verify outputs seem to have happened
+      failures = 0
+      output = output.each_line.map do |line|
+        if (line =~ /(?:Delta.*)?(?:Element.*)?Expected.*Was/)
+          if !(line =~ /(?:Delta \d+ )?(?:Element \d+ )?Expected #{valid_vals} Was #{valid_vals}/)
+            failures += 1
+            "[FAIL] " + line.sub(/:PASS$/,":FAIL:Output Format Failure")
+          else
+            "[p   ] " + line
+          end
+        elsif (line =~ /:PASS$/)
+          "[p   ] " + line
+        elsif (line =~ /:FAIL(?:[^:])$/) || (line =~ /^FAILED$/)
+          #failure has already been counted therefore do not add
+          "[FAIL] " + line
+        elsif (line =~ /:IGNORE$/)
+          #ignore has already been counted therefore do not add
+          "[i---] " + line
+        else
+          "[    ] " + line
+        end
+      end.join
+
+      # Update the final test summary
+      if failures > 0
+        output.sub!(/^(?:\[    \] )?(\d+) Tests (\d+) Failures (\d+) Ignored/) do
+          tests = $1
+          failures = $2.to_i + failures
+          ignored = $3
+          "[    ] #{tests} Tests #{failures} Failures #{ignored} Ignored"
+        end
+        output.sub!(/\[    \] OK$/,"[FAIL] FAILED")
+        report output
+        raise "Command failed. (#{failures.to_s} Output Formatting Issues)"
+      end
+
+      # Generate results file
       save_test_results(test_base, output)
     end
   end
 
   def run_make_tests()
-    [ "make -s",                               # test with all defaults
-      #"make -s DEBUG=-m32",                    # test 32-bit architecture with 64-bit support
-      #"make -s DEBUG=-m32 UNITY_SUPPORT_64=",  # test 32-bit build without 64-bit types
-      "make -s UNITY_INCLUDE_DOUBLE= ",        # test without double
+    report "\nRunning Unity Examples with Make"
+    combined_output = ''
+    [ "make -s",                 # test with all defaults
+      "make -s coverage",        # test with coverage
       "cd #{File.join("..","extras","fixture",'test')} && make -s default noStdlibMalloc",
       "cd #{File.join("..","extras","fixture",'test')} && make -s C89",
       "cd #{File.join("..","extras","memory",'test')} && make -s default noStdlibMalloc",
       "cd #{File.join("..","extras","memory",'test')} && make -s C89",
     ].each do |cmd|
       report "Testing '#{cmd}'"
-      execute(cmd, false)
+      combined_output += "Testing '#{cmd}'\n\n#{execute(cmd, false)}\n"
+    end
+    save_test_results('make_tests', collect_test_output(combined_output))
+  end
+
+  def run_examples()
+    total_tests = total_ignored = 0
+    
+    # If we're set up to use gcc, the makefiles should work too. otherwise, just run example 3
+    examples = if $cfg_file_base.nil? || ($cfg_file_base =~ /gcc/)
+      {
+        :example_1 => "cd ../examples/example_1 && make -s ci",
+        :example_2 => "cd ../examples/example_2 && make -s ci"
+      }
+    else
+      {}
+    end
+
+    if $unity_test_config_file_in_targets
+      examples[:example_3] = "cd ../examples/example_3 && rake config[#{$cfg_file_base}] default"
+    else
+      examples[:example_3] = "cd ../examples/example_3 && rake config[\"../#{$unity_test_config_file}\"] default"
+    end
+
+    examples.each_pair do |key, cmd|
+      report "\nRunning Unity Example: #{key.to_s}"
+      execute(cmd, false).each_line do |line|
+        if line =~ /(\d+) Tests \d+ Failures (\d+) Ignored/
+          total_tests   += Regexp.last_match(1).to_i
+          total_ignored += Regexp.last_match(2).to_i
+          # Failures intentionally not counted: the examples contain tests designed
+          # to fail to demonstrate Unity's detection capability. A zero exit code
+          # from make/rake means those failures were verified as expected; if
+          # something truly broke, execute() would have raised above.
+        end
+      end
     end
+    save_test_results('examples', "#{total_tests} Tests 0 Failures #{total_ignored} Ignored\nOK\n")
   end
 end

data/vendor/unity/test/spec/generate_module_existing_file_spec.rb

@@ -1,7 +1,7 @@
 # =========================================================================
 #   Unity - A Test Framework for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2007-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 

data/vendor/unity/test/targets/clang.yml

@@ -0,0 +1,157 @@
+# =========================================================================
+#   Unity - A Test Framework for C
+#   ThrowTheSwitch.org
+#   Copyright (c) 2007-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   SPDX-License-Identifier: MIT
+# =========================================================================
+
+# This file provides a base configuration for working with the clang (llvm)
+# toolchain, targetting native compilation, using mostly default settings,
+# with many warnings enabled for self-validation. It can be modified or 
+# mixed to customize for your project needs.
+
+---
+:tools:
+  :test_compiler:
+    :name: compiler
+    :executable: clang
+    :arguments:
+    - "-c"
+    - "-Wall"
+    - "-Wextra"
+    - "-Werror"
+    - "-Wcast-qual"
+    - "-Wconversion"
+    - "-Wdisabled-optimization"
+    - "-Wformat=2"
+    - "-Winit-self"
+    - "-Winline"
+    - "-Winvalid-pch"
+    - "-Wmissing-include-dirs"
+    - "-Wnonnull"
+    - "-Wpacked"
+    - "-Wpointer-arith"
+    - "-Wswitch-default"
+    - "-Wstrict-aliasing"
+    - "-Wstrict-overflow=5"
+    - "-Wuninitialized"
+    - "-Wunused"
+    - "-Wreturn-type"
+    - "-Wshadow"
+    - "-Wundef"
+    - "-Wwrite-strings"
+    - "-Wno-nested-externs"
+    - "-Wno-unused-parameter"
+    - "-Wno-variadic-macros"
+    - "-Wbad-function-cast"
+    - "-fms-extensions"
+    - "-fno-omit-frame-pointer"
+    - "-fno-common"
+    - "-fstrict-aliasing"
+    - "-std=gnu99"
+    - "-pedantic"
+    - "-O0"
+    - '-I"${5}"'
+    - "-D${6}"
+    - "${1}"
+    - "-o ${2}"
+    :version: --version
+  :test_linker:
+    :name: linker
+    :executable: clang
+    :arguments:
+    - "${1}"
+    - "-lm"
+    - "-o ${2}"
+    :version: --version
+  :test_fixture:
+    :name: clang_fixture
+    :executable: ''
+    :version: --version
+    :optional: true
+    :arguments:
+      - ${1}
+      - ${2}
+  :gcov_compiler:
+    :name: gcov_compiler
+    :executable: clang
+    :arguments:
+    - "-fprofile-arcs"
+    - "-ftest-coverage"
+    - "-Wall"
+    - "-Wno-address"
+    - "-std=c99"
+    - "-pedantic"
+    - "-Wextra"
+    - "-Werror"
+    - "-Wpointer-arith"
+    - "-Wcast-align"
+    - "-Wwrite-strings"
+    - "-Wswitch-default"
+    - "-Wunreachable-code"
+    - "-Winit-self"
+    - "-Wmissing-field-initializers"
+    - "-Wno-unknown-pragmas"
+    - "-Wstrict-prototypes"
+    - "-Wundef"
+    - "-Wold-style-definition"
+    - '-I"${5}"'
+    - "-D${6}"
+    - "-DGCOV_COMPILER"
+    - "-DCODE_COVERAGE"
+    - "-c ${1}"
+    - "-o ${2}"
+    - "-MMD"
+    - "-MF \"${4}\""
+    :version: --version
+  :gcov_linker:
+    :name: gcov_linker
+    :executable: clang
+    :arguments:
+    - "-fprofile-arcs"
+    - "-ftest-coverage"
+    - "${1}"
+    - "${5}"
+    - "-lm"
+    - "-o ${2}"
+    - "${4}"
+    :version: --version
+  :gcov_fixture:
+    :name: gcov_fixture
+    :optional: true
+    :executable: '${1}'
+    :arguments: []
+    :version: --version
+  :gcov_summary:
+    :name: gcov_summary
+    :executable: llvm-cov
+    :arguments:
+     - "gcov"
+     - "-n"
+     - "-p"
+     - "-b"
+     - "-o \"${2}\""
+     - "\"${1}\""
+    :version: --version
+  :gcov_report:
+    :name: gcov_report
+    :executable: llvm-cov
+    :arguments:
+     - "gcov"
+     - "-b"
+     - "-c"
+     - "-r"
+     - "-s \"${2}\""
+     - "-x"
+     - "\"${1}\""
+    :version: --version
+:extension:
+  :object: ".o"
+  :executable: ".exe"
+:defines:
+  :test:
+  - UNITY_INCLUDE_DOUBLE
+  - UNITY_SUPPORT_TEST_CASES
+  - UNITY_SUPPORT_64
+  - UNITY_COMPARE_PTRS_ON_ZERO_ARRAY
+  - UNITY_POINTER_WIDTH=64