ceedling 0.25.0 → 0.27.0

data/vendor/cmock/release/version.info

@@ -1,2 +1,2 @@
-2.4.3
+2.4.4
 

data/vendor/cmock/scripts/create_makefile.rb

@@ -27,6 +27,8 @@ end
 
 all_headers_to_mock = []
 
+suppress_error = !ARGV.nil? && !ARGV.empty? && (ARGV[0].upcase == "--SILENT")
+
 File.open(TEST_MAKEFILE, "w") do |mkfile|
 
   # Define make variables
@@ -103,7 +105,7 @@ File.open(TEST_MAKEFILE, "w") do |mkfile|
         end
       end
       raise "Module header '#{name}' not found to mock!" unless header_to_mock
-      headers_to_mock << header_to_mock 
+      headers_to_mock << header_to_mock
     end
     all_headers_to_mock += headers_to_mock
     mock_objs = headers_to_mock.map do |hdr|
@@ -149,7 +151,7 @@ File.open(TEST_MAKEFILE, "w") do |mkfile|
 
   # Create test summary task
   mkfile.puts "test_summary:"
-  mkfile.puts "\t@UNITY_DIR=${UNITY_DIR} ruby ${CMOCK_DIR}/scripts/test_summary.rb"
+  mkfile.puts "\t@UNITY_DIR=${UNITY_DIR} ruby ${CMOCK_DIR}/scripts/test_summary.rb #{suppress_error ? '--silent' : ''}"
   mkfile.puts ""
   mkfile.puts ".PHONY: test_summary"
   mkfile.puts ""

data/vendor/cmock/scripts/test_summary.rb

@@ -1,11 +1,19 @@
-require "#{ENV['UNITY_DIR']}/auto/unity_test_summary.rb"
 
-build_dir = ENV.fetch('BUILD_DIR', './build')
-test_build_dir = ENV.fetch('TEST_BUILD_DIR', File.join(build_dir, 'test'))
+suppress_error = !ARGV.nil? && !ARGV.empty? && (ARGV[0].upcase == "--SILENT")
 
-results = Dir["#{test_build_dir}/*.result"]
-parser = UnityTestSummary.new
-parser.set_targets(results)
-parser.run
-puts parser.report
-exit(parser.failures)
+begin
+  require "#{ENV['UNITY_DIR']}/auto/unity_test_summary.rb"
+
+  build_dir = ENV.fetch('BUILD_DIR', './build')
+  test_build_dir = ENV.fetch('TEST_BUILD_DIR', File.join(build_dir, 'test'))
+
+  results = Dir["#{test_build_dir}/*.result"]
+  parser = UnityTestSummary.new
+  parser.targets = results
+  parser.run
+  puts parser.report
+rescue StandardError => e
+  raise e unless suppress_error
+end
+
+exit(parser.failures) unless suppress_error

data/vendor/cmock/src/cmock.c

@@ -16,6 +16,7 @@ const char* CMockStringCalledLate  = "Called later than expected.";
 const char* CMockStringCallOrder   = "Called out of order.";
 const char* CMockStringIgnPreExp   = "IgnoreArg called before Expect.";
 const char* CMockStringPtrPreExp   = "ReturnThruPtr called before Expect.";
+const char* CMockStringPtrIsNULL   = "Pointer is NULL.";
 const char* CMockStringExpNULL     = "Expected NULL.";
 const char* CMockStringMismatch    = "Function called with unexpected argument value.";
 

data/vendor/cmock/src/cmock.h

@@ -18,7 +18,7 @@
 
 #define CMOCK_ARG_MODE    CMOCK_MEM_INDEX_TYPE
 #define CMOCK_ARG_ALL     0
-#define CMOCK_ARG_NONE    ((CMOCK_MEM_INDEX_TYPE)(~0))
+#define CMOCK_ARG_NONE    ((CMOCK_MEM_INDEX_TYPE)(~0U))
 
 //-------------------------------------------------------
 // Memory API

data/vendor/cmock/src/cmock_internals.h

@@ -16,6 +16,7 @@ extern const char* CMockStringCalledLate;
 extern const char* CMockStringCallOrder;
 extern const char* CMockStringIgnPreExp;
 extern const char* CMockStringPtrPreExp;
+extern const char* CMockStringPtrIsNULL;
 extern const char* CMockStringExpNULL;
 extern const char* CMockStringMismatch;
 
@@ -59,7 +60,19 @@ extern const char* CMockStringMismatch;
 
 //0 for no alignment, 1 for 16-bit, 2 for 32-bit, 3 for 64-bit
 #ifndef CMOCK_MEM_ALIGN
-#define CMOCK_MEM_ALIGN (2)
+  #ifdef UNITY_LONG_WIDTH
+    #if (UNITY_LONG_WIDTH == 16)
+      #define CMOCK_MEM_ALIGN (1)
+    #elif (UNITY_LONG_WIDTH == 32)
+      #define CMOCK_MEM_ALIGN (2)
+    #elif (UNITY_LONG_WIDTH == 64)
+      #define CMOCK_MEM_ALIGN (3)
+    #else
+      #define CMOCK_MEM_ALIGN (2)
+    #endif
+  #else
+    #define CMOCK_MEM_ALIGN (2)
+  #endif
 #endif
 
 //amount of memory to allow cmock to use in its internal heap

data/vendor/cmock/test/c/TestCMockC.yml

@@ -1,9 +1,9 @@
 ---
 :files:
-  - 'src/cmock.c'
-  - 'test/c/TestCMockC.c'
-  - 'test/c/TestCMockC_Runner.c'
-  - 'vendor/unity/src/unity.c'
+  - '../src/cmock.c'
+  - './c/TestCMockC.c'
+  - './c/TestCMockC_Runner.c'
+  - '../vendor/unity/src/unity.c'
 :options:
   - 'TEST'
   - 'CMOCK_MEM_STATIC'

data/vendor/cmock/test/c/TestCMockCDynamic.yml

@@ -1,9 +1,9 @@
 ---
 :files:
-  - 'src/cmock.c'
-  - 'test/c/TestCMockCDynamic.c'
-  - 'test/c/TestCMockCDynamic_Runner.c'
-  - 'vendor/unity/src/unity.c'
+  - '../src/cmock.c'
+  - './c/TestCMockCDynamic.c'
+  - './c/TestCMockCDynamic_Runner.c'
+  - '../vendor/unity/src/unity.c'
 :options:
   - 'TEST'
   - 'CMOCK_MEM_DYNAMIC'

data/vendor/cmock/{Rakefile → test/rakefile}

@@ -4,7 +4,7 @@
 #   [Released under MIT License. Please refer to license.txt for details]
 # ==============================================================================
 
-require './config/test_environment'
+require '../config/test_environment'
 require 'rake'
 require 'rake/clean'
 require 'rake/testtask'
@@ -13,11 +13,11 @@ require './rakefile_helper'
 include RakefileHelpers
 
 DEFAULT_CONFIG_FILE = 'gcc.yml'
-CMOCK_ROOT = File.expand_path(File.dirname(__FILE__))
+CMOCK_TEST_ROOT = File.expand_path(File.dirname(__FILE__))
 
 SYSTEM_TEST_SUPPORT_DIRS = [
-  File.join(CMOCK_ROOT, 'test/system/generated'),
-  File.join(CMOCK_ROOT, 'test/system/build')
+  File.join(CMOCK_TEST_ROOT, 'system/generated'),
+  File.join(CMOCK_TEST_ROOT, 'system/build')
 ]
 
 SYSTEM_TEST_SUPPORT_DIRS.each do |dir|
@@ -48,12 +48,12 @@ task :test => [:clobber, :prep_system_tests, 'test:units', 'test:c', 'test:syste
 namespace :test do
   desc "Run Unit Tests"
   Rake::TestTask.new('units') do |t|
-    t.pattern = 'test/unit/*_test.rb'
+    t.pattern = 'unit/*_test.rb'
     t.verbose = true
   end
 
   #individual unit tests
-  FileList['test/unit/*_test.rb'].each do |test|
+  FileList['unit/*_test.rb'].each do |test|
     Rake::TestTask.new(File.basename(test,'.*').sub('_test','')) do |t|
       t.pattern = test
       t.verbose = true
@@ -70,8 +70,8 @@ namespace :test do
   desc "Run System Tests"
   task :system => [:clobber, :prep_system_tests] do
     #get a list of all system tests, removing unsupported tests for this compiler
-    sys_unsupported  = $cfg['unsupported'].map {|a| 'test/system/test_interactions/'+a+'.yml'}
-    sys_tests_to_run = FileList['test/system/test_interactions/*.yml'] - sys_unsupported
+    sys_unsupported  = $cfg['unsupported'].map {|a| 'system/test_interactions/'+a+'.yml'}
+    sys_tests_to_run = FileList['system/test_interactions/*.yml'] - sys_unsupported
     compile_unsupported  = $cfg['unsupported'].map {|a| SYSTEST_COMPILE_MOCKABLES_PATH+a+'.h'}
     compile_tests_to_run = FileList[SYSTEST_COMPILE_MOCKABLES_PATH + '*.h'] - compile_unsupported
     unless (sys_unsupported.empty? and compile_unsupported.empty?)
@@ -87,7 +87,7 @@ namespace :test do
   end
 
   #individual system tests
-  FileList['test/system/test_interactions/*.yml'].each do |test|
+  FileList['system/test_interactions/*.yml'].each do |test|
     basename = File.basename(test,'.*')
     desc "Run system test #{basename}"
     task basename do

data/vendor/cmock/{rakefile_helper.rb → test/rakefile_helper.rb}

@@ -6,16 +6,16 @@
 
 require 'yaml'
 require 'fileutils'
-require './vendor/unity/auto/generate_test_runner'
-require './vendor/unity/auto/unity_test_summary'
-require './test/system/systest_generator'
-require './vendor/unity/auto/colour_reporter.rb'
+require '../vendor/unity/auto/generate_test_runner'
+require '../vendor/unity/auto/unity_test_summary'
+require '../vendor/unity/auto/colour_reporter.rb'
+require './system/systest_generator'
 
 module RakefileHelpers
 
-  SYSTEST_GENERATED_FILES_PATH   = 'test/system/generated/'
-  SYSTEST_BUILD_FILES_PATH       = 'test/system/build/'
-  SYSTEST_COMPILE_MOCKABLES_PATH = 'test/system/test_compilation/'
+  SYSTEST_GENERATED_FILES_PATH   = './system/generated/'
+  SYSTEST_BUILD_FILES_PATH       = './system/build/'
+  SYSTEST_COMPILE_MOCKABLES_PATH = './system/test_compilation/'
   C_EXTENSION = '.c'
   RESULT_EXTENSION = '.result'
 
@@ -162,17 +162,17 @@ module RakefileHelpers
 
   def report_summary
     summary = UnityTestSummary.new
-    summary.set_root_path(File.expand_path(File.dirname(__FILE__)) + '/')
+    summary.root = File.expand_path(File.dirname(__FILE__)) + '/'
     results_glob = "#{$cfg['compiler']['build_path']}*.test*"
     results_glob.gsub!(/\\/, '/')
     results = Dir[results_glob]
-    summary.set_targets(results)
+    summary.targets = results
     summary.run
     fail_out "FAIL: There were failures" if (summary.failures > 0)
   end
 
   def run_system_test_interactions(test_case_files)
-    load './lib/cmock.rb'
+    load '../lib/cmock.rb'
 
     SystemTestGenerator.new.generate_files(test_case_files)
     test_files = FileList.new(SYSTEST_GENERATED_FILES_PATH + 'test*.c')
@@ -308,7 +308,7 @@ module RakefileHelpers
   end
 
   def run_system_test_compilations(mockables)
-    load './lib/cmock.rb'
+    load '../lib/cmock.rb'
 
     load_configuration($cfg_file)
     $cfg['compiler']['defines']['items'] = [] if $cfg['compiler']['defines']['items'].nil?
@@ -326,7 +326,7 @@ module RakefileHelpers
   end
 
   def run_system_test_profiles(mockables)
-    load './lib/cmock.rb'
+    load '../lib/cmock.rb'
 
     load_configuration($cfg_file)
     $cfg['compiler']['defines']['items'] = [] if $cfg['compiler']['defines']['items'].nil?
@@ -353,7 +353,7 @@ module RakefileHelpers
     report "UNIT TEST C CODE\n"
     report "----------------\n"
     errors = false
-    FileList.new("test/c/*.yml").each do |yaml_file|
+    FileList.new("c/*.yml").each do |yaml_file|
       test = YAML.load(File.read(yaml_file))
       report "\nTesting #{yaml_file.sub('.yml','')}"
       report "(#{test[:options].join(', ')})"

data/vendor/cmock/test/system/test_compilation/config.yml

@@ -1,9 +1,9 @@
---- 
-:cmock: 
+---
+:cmock:
   :plugins: []
   :includes: []
-  :mock_path: test/system/generated/
+  :mock_path: ./system/generated/
   :mock_prefix: mock_
-  :treat_as_void: 
+  :treat_as_void:
   - OSEK_TASK
   - VOID_TYPE_CRAZINESS

data/vendor/cmock/test/system/test_interactions/parsing_challenges.yml

@@ -64,6 +64,8 @@
 
     void oh_brackets1(int fudge[5]);
     void oh_brackets2(int caramel[]);
+    void oh_brackets3(int toffee[(32)]);
+    void oh_brackets4(int taffy[ (64) ]);
     #ifdef __cplusplus
     }
     #endif

data/vendor/cmock/{targets → test/targets}/clang_strict.yml

@@ -1,16 +1,16 @@
 ---
 compiler:
   path: clang
-  source_path:     &systest_generated_path 'test/system/generated/'
-  unit_tests_path: &unit_tests_path 'examples/test/'
-  mocks_path:      &systest_mocks_path 'test/system/generated/'
-  build_path:      &systest_build_path 'test/system/build/'
+  source_path:     &systest_generated_path './system/generated/'
+  unit_tests_path: &unit_tests_path '../examples/test/'
+  mocks_path:      &systest_mocks_path './system/generated/'
+  build_path:      &systest_build_path './system/build/'
   options:
     - '-c'
     - '-Wall'
     - '-Wextra'
     - '-Werror'
-    - '-Wcast-qual'
+    #- '-Wcast-qual'
     - '-Wconversion'
     - '-Wtautological-compare'
     #- '-Wtautological-pointer-compare'
@@ -41,7 +41,7 @@ compiler:
     - '-Wno-invalid-token-paste'
     - '-fms-extensions'
     - '-fno-omit-frame-pointer'
-    - '-ffloat-store'
+    #- '-ffloat-store'
     - '-fno-common'
     - '-fstrict-aliasing'
     - '-std=gnu99'
@@ -53,11 +53,11 @@ compiler:
       - *systest_generated_path
       - *unit_tests_path
       - *systest_mocks_path
-      - 'src/'
-      - 'vendor/unity/src/'
-      - 'vendor/c_exception/lib/'
-      - 'test/system/test_compilation/'
-      - 'test/'
+      - '../src/'
+      - '../vendor/unity/src/'
+      - '../vendor/c_exception/lib/'
+      - './system/test_compilation/'
+      - './'
   defines:
     prefix: '-D'
     items:

data/vendor/cmock/{targets → test/targets}/gcc.yml

@@ -1,10 +1,10 @@
 ---
 compiler:
   path: gcc
-  source_path:     &systest_generated_path 'test/system/generated/'
-  unit_tests_path: &unit_tests_path 'examples/test/'
-  mocks_path:      &systest_mocks_path 'test/system/generated/'
-  build_path:      &systest_build_path 'test/system/build/'
+  source_path:     &systest_generated_path './system/generated/'
+  unit_tests_path: &unit_tests_path '../examples/test/'
+  mocks_path:      &systest_mocks_path './system/generated/'
+  build_path:      &systest_build_path './system/build/'
   options:
     - '-c'
     - '-Wall'
@@ -21,11 +21,11 @@ compiler:
       - *systest_generated_path
       - *unit_tests_path
       - *systest_mocks_path
-      - 'src/'
-      - 'vendor/unity/src/'
-      - 'vendor/c_exception/lib/'
-      - 'test/system/test_compilation/'
-      - 'test/'
+      - '../src/'
+      - '../vendor/unity/src/'
+      - '../vendor/c_exception/lib/'
+      - './system/test_compilation/'
+      - './'
   defines:
     prefix: '-D'
     items: