ceedling 0.15.1 → 0.15.2

data/vendor/cmock/src/cmock.c

@@ -38,7 +38,7 @@ CMOCK_MEM_INDEX_TYPE CMock_Guts_MemNew(CMOCK_MEM_INDEX_TYPE size)
   {
 #ifdef CMOCK_MEM_DYNAMIC
     CMock_Guts_BufferSize += CMOCK_MEM_SIZE + size;
-    CMock_Guts_Buffer = realloc(CMock_Guts_Buffer, CMock_Guts_BufferSize);
+    CMock_Guts_Buffer = realloc(CMock_Guts_Buffer, (size_t)CMock_Guts_BufferSize);
     if (CMock_Guts_Buffer == NULL)
 #endif //yes that if will continue to the return below if TRUE
       return CMOCK_GUTS_NONE;
@@ -78,7 +78,7 @@ CMOCK_MEM_INDEX_TYPE CMock_Guts_MemChain(CMOCK_MEM_INDEX_TYPE root_index, CMOCK_
     {
       return CMOCK_GUTS_NONE;
     }
-    
+
     root = (void*)(&CMock_Guts_Buffer[root_index]);
     obj  = (void*)(&CMock_Guts_Buffer[obj_index]);
 
@@ -91,7 +91,7 @@ CMOCK_MEM_INDEX_TYPE CMock_Guts_MemChain(CMOCK_MEM_INDEX_TYPE root_index, CMOCK_
       if (index > 0)
         next = (void*)(&CMock_Guts_Buffer[index]);
     } while (index > 0);
-    *(CMOCK_MEM_INDEX_TYPE*)((CMOCK_MEM_PTR_AS_INT)next - CMOCK_MEM_INDEX_SIZE) = ((CMOCK_MEM_PTR_AS_INT)obj - (CMOCK_MEM_PTR_AS_INT)CMock_Guts_Buffer);
+    *(CMOCK_MEM_INDEX_TYPE*)((CMOCK_MEM_PTR_AS_INT)next - CMOCK_MEM_INDEX_SIZE) = (CMOCK_MEM_INDEX_TYPE)((CMOCK_MEM_PTR_AS_INT)obj - (CMOCK_MEM_PTR_AS_INT)CMock_Guts_Buffer);
     return root_index;
   }
 }
@@ -125,7 +125,7 @@ CMOCK_MEM_INDEX_TYPE CMock_Guts_MemEndOfChain(CMOCK_MEM_INDEX_TYPE root_index)
 {
   CMOCK_MEM_INDEX_TYPE index = root_index;
   CMOCK_MEM_INDEX_TYPE next_index;
-        
+
   for (next_index = root_index;
        next_index != CMOCK_GUTS_NONE;
        next_index = CMock_Guts_MemNext(index))
@@ -174,3 +174,19 @@ void CMock_Guts_MemFreeAll(void)
 {
   CMock_Guts_FreePtr = CMOCK_MEM_ALIGN_SIZE; //skip the very beginning
 }
+
+//-------------------------------------------------------
+// CMock_Guts_MemFreeFinal
+//-------------------------------------------------------
+void CMock_Guts_MemFreeFinal(void)
+{
+  CMock_Guts_FreePtr = CMOCK_MEM_ALIGN_SIZE;
+#ifdef CMOCK_MEM_DYNAMIC
+  if (CMock_Guts_Buffer)
+  {
+    free(CMock_Guts_Buffer);
+    CMock_Guts_Buffer = NULL;
+  }
+#endif
+}
+

data/vendor/cmock/src/cmock.h

@@ -12,7 +12,11 @@
 #define CMOCK_MEM_INDEX_TYPE  unsigned int
 #endif
 
-#define CMOCK_GUTS_NONE (0)
+#define CMOCK_GUTS_NONE   (0)
+
+#define CMOCK_ARG_MODE    CMOCK_MEM_INDEX_TYPE
+#define CMOCK_ARG_ALL     0
+#define CMOCK_ARG_NONE    ((CMOCK_MEM_INDEX_TYPE)(~0))
 
 //-------------------------------------------------------
 // Memory API
@@ -27,5 +31,6 @@ void*                 CMock_Guts_GetAddressFor(CMOCK_MEM_INDEX_TYPE index);
 CMOCK_MEM_INDEX_TYPE  CMock_Guts_MemBytesFree(void);
 CMOCK_MEM_INDEX_TYPE  CMock_Guts_MemBytesUsed(void);
 void                  CMock_Guts_MemFreeAll(void);
+void                  CMock_Guts_MemFreeFinal(void);
 
 #endif //CMOCK_FRAMEWORK

data/vendor/cmock/src/cmock_internals.h

@@ -20,6 +20,29 @@
 #endif
 
 //this is used internally during pointer arithmetic. make sure this type is the same size as the target's pointer type
+#ifndef CMOCK_MEM_PTR_AS_INT
+#ifdef UNITY_POINTER_WIDTH
+#ifdef UNITY_INT_WIDTH
+#if UNITY_POINTER_WIDTH == UNITY_INT_WIDTH
+#define CMOCK_MEM_PTR_AS_INT unsigned int
+#endif
+#endif
+#endif
+#endif
+
+#ifndef CMOCK_MEM_PTR_AS_INT
+#ifdef UNITY_POINTER_WIDTH
+#ifdef UNITY_LONG_WIDTH
+#if UNITY_POINTER_WIDTH == UNITY_LONG_WIDTH
+#define CMOCK_MEM_PTR_AS_INT unsigned long
+#endif
+#if UNITY_POINTER_WIDTH > UNITY_LONG_WIDTH
+#define CMOCK_MEM_PTR_AS_INT unsigned long long
+#endif
+#endif
+#endif
+#endif
+
 #ifndef CMOCK_MEM_PTR_AS_INT
 #define CMOCK_MEM_PTR_AS_INT unsigned long
 #endif
@@ -35,9 +58,9 @@
 #endif
 
 //automatically calculated defs for easier reading
-#define CMOCK_MEM_ALIGN_SIZE  (1u << CMOCK_MEM_ALIGN)
-#define CMOCK_MEM_ALIGN_MASK  (CMOCK_MEM_ALIGN_SIZE - 1)
-#define CMOCK_MEM_INDEX_SIZE  (CMOCK_MEM_PTR_AS_INT)((sizeof(CMOCK_MEM_INDEX_TYPE) > CMOCK_MEM_ALIGN_SIZE) ? sizeof(CMOCK_MEM_INDEX_TYPE) : CMOCK_MEM_ALIGN_SIZE)
+#define CMOCK_MEM_ALIGN_SIZE  (CMOCK_MEM_INDEX_TYPE)(1u << CMOCK_MEM_ALIGN)
+#define CMOCK_MEM_ALIGN_MASK  (CMOCK_MEM_INDEX_TYPE)(CMOCK_MEM_ALIGN_SIZE - 1)
+#define CMOCK_MEM_INDEX_SIZE  (CMOCK_MEM_INDEX_TYPE)(CMOCK_MEM_PTR_AS_INT)((sizeof(CMOCK_MEM_INDEX_TYPE) > CMOCK_MEM_ALIGN_SIZE) ? sizeof(CMOCK_MEM_INDEX_TYPE) : CMOCK_MEM_ALIGN_SIZE)
 
 
 #endif //CMOCK_FRAMEWORK_INTERNALS

data/vendor/cmock/targets/clang_strict.yml

@@ -0,0 +1,85 @@
+---
+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/'
+  options:
+    - '-c'
+    - '-Wall'
+    - '-Wextra'
+    - '-Werror'
+    - '-Wcast-qual'
+    - '-Wconversion'
+    - '-Wdisabled-optimization'
+    - '-Wformat=2'
+    - '-Winit-self'
+    - '-Winline'
+    - '-Winvalid-pch'
+    - '-Wmissing-declarations'
+    - '-Wmissing-include-dirs'
+    - '-Wmissing-prototypes'
+    - '-Wnonnull'
+    - '-Wpacked'
+    - '-Wpointer-arith'
+    - '-Wredundant-decls'
+    - '-Wswitch-default'
+    - '-Wstrict-aliasing=2'
+    - '-Wstrict-overflow=5'
+    - '-Wuninitialized'
+    - '-Wunused'
+    - '-Wunreachable-code'
+    - '-Wreturn-type'
+    - '-Wshadow'
+    - '-Wundef'
+    - '-Wwrite-strings'
+    - '-Wbad-function-cast'
+    - '-Wno-missing-prototypes' #we've been lazy about things like setUp and tearDown
+    - '-fms-extensions'
+    - '-fno-omit-frame-pointer'
+    - '-ffloat-store'
+    - '-fno-common'
+    - '-fstrict-aliasing'
+    - '-std=gnu99'
+    - '-pedantic'
+    - '-O0'
+  includes:
+    prefix: '-I'
+    items:
+      - *systest_generated_path
+      - *unit_tests_path
+      - *systest_mocks_path
+      - 'src/'
+      - 'vendor/unity/src/'
+      - 'vendor/c_exception/lib/'
+      - 'test/system/test_compilation/'
+      - 'test/'
+  defines:
+    prefix: '-D'
+    items:
+      - 'UNITY_SUPPORT_64'
+      - 'UNITY_POINTER_WIDTH=64'
+  object_files:
+    prefix: '-o'
+    extension: '.o'
+    destination: *systest_build_path
+
+linker:
+  path: gcc
+  options:
+    - -lm
+  includes:
+    prefix: '-I'
+  object_files:
+    path: *systest_build_path
+    extension: '.o'
+  bin_files:
+    prefix: '-o'
+    extension: '.exe'
+    destination: *systest_build_path
+
+unsupported:
+  - callingconv
+
+colour: true

data/vendor/cmock/targets/gcc.yml

@@ -8,10 +8,12 @@ compiler:
   options:
     - '-c'
     - '-Wall'
+    - '-Wextra'
     - '-Wunused-parameter'
     - '-Wno-address'
     - '-std=c99'
     - '-pedantic'
+    - '-O0'
   includes:
     prefix: '-I'
     items:
@@ -31,7 +33,7 @@ compiler:
     prefix: '-o'
     extension: '.o'
     destination: *systest_build_path
-    
+
 linker:
   path: gcc
   options:
@@ -46,7 +48,7 @@ linker:
     extension: '.exe'
     destination: *systest_build_path
 
-unsupported: 
+unsupported:
   - unity_64bit_support
   - callingconv
 

data/vendor/cmock/targets/gcc_64.yml

@@ -0,0 +1,55 @@
+---
+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/'
+  options:
+    - '-c'
+    - '-m64'
+    - '-Wall'
+    - '-Wunused-parameter'
+    - '-Wno-address'
+    - '-std=c99'
+    - '-pedantic'
+  includes:
+    prefix: '-I'
+    items:
+      - *systest_generated_path
+      - *unit_tests_path
+      - *systest_mocks_path
+      - 'src/'
+      - 'vendor/unity/src/'
+      - 'vendor/c_exception/lib/'
+      - 'test/system/test_compilation/'
+      - 'test/'
+  defines:
+    prefix: '-D'
+    items:
+      - 'UNITY_SUPPORT_64'
+      - 'UNITY_POINTER_WIDTH=64'
+  object_files:
+    prefix: '-o'
+    extension: '.o'
+    destination: *systest_build_path
+
+linker:
+  path: gcc
+  options:
+    - -lm
+    - '-m64'
+  includes:
+    prefix: '-I'
+  object_files:
+    path: *systest_build_path
+    extension: '.o'
+  bin_files:
+    prefix: '-o'
+    extension: '.exe'
+    destination: *systest_build_path
+
+unsupported:
+  - callingconv
+
+colour: true

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

@@ -240,9 +240,9 @@ void test_ThatWeCanAskForAllSortsOfSizes(void)
   unsigned int  i;
   CMOCK_MEM_INDEX_TYPE first = CMOCK_GUTS_NONE;
   CMOCK_MEM_INDEX_TYPE next;
-  unsigned int  sizes[5] = {3, 1, 80, 5, 4};
-  unsigned int  sizes_buffered[5] = {4, 4, 80, 8, 4};
-  unsigned int  sum = 0;
+  CMOCK_MEM_INDEX_TYPE sizes[5] = {3, 1, 80, 5, 4};
+  CMOCK_MEM_INDEX_TYPE sizes_buffered[5] = {4, 4, 80, 8, 4};
+  CMOCK_MEM_INDEX_TYPE sum = 0;
 
   for (i = 0; i < 5; i++)
   {

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

@@ -7,10 +7,10 @@
 #include "unity.h"
 #include "cmock.h"
 
-#define TEST_MEM_INDEX_SIZE  (sizeof(CMOCK_MEM_INDEX_TYPE)) 
-#define TEST_MEM_INDEX_PAD   ((sizeof(CMOCK_MEM_INDEX_TYPE) + 7) & ~7) //round up to nearest 4 byte boundary
+#define TEST_MEM_INDEX_SIZE  (CMOCK_MEM_INDEX_TYPE)(sizeof(CMOCK_MEM_INDEX_TYPE))
+#define TEST_MEM_INDEX_PAD   (CMOCK_MEM_INDEX_TYPE)(((CMOCK_MEM_INDEX_TYPE)sizeof(CMOCK_MEM_INDEX_TYPE) + 7) & ~7) //round up to nearest 4 byte boundary
 
-unsigned int StartingSize;
+CMOCK_MEM_INDEX_TYPE StartingSize;
 
 void setUp(void)
 {
@@ -35,11 +35,11 @@ void test_MemNewWillReturnNullIfGivenIllegalSizes(void)
 void test_MemNewWillNowSupportSizesGreaterThanTheDefinesCMockSize(void)
 {
     TEST_ASSERT_EQUAL(0, CMock_Guts_MemBytesFree());
-	
+
     TEST_ASSERT_MESSAGE(CMock_Guts_MemNew(CMOCK_MEM_SIZE - TEST_MEM_INDEX_SIZE + 1) != CMOCK_GUTS_NONE, "Should Not Have Returned CMOCK_GUTS_NONE");
 
-    TEST_ASSERT_EQUAL(CMOCK_MEM_SIZE + TEST_MEM_INDEX_PAD, CMock_Guts_MemBytesUsed());
-    TEST_ASSERT_EQUAL(CMOCK_MEM_SIZE, CMock_Guts_MemBytesFree());
+    TEST_ASSERT_EQUAL(((CMOCK_MEM_INDEX_TYPE)CMOCK_MEM_SIZE + TEST_MEM_INDEX_PAD), CMock_Guts_MemBytesUsed());
+    TEST_ASSERT_EQUAL((CMOCK_MEM_INDEX_TYPE)CMOCK_MEM_SIZE, CMock_Guts_MemBytesFree());
 }
 
 void test_MemChainWillReturnNullAndDoNothingIfGivenIllegalInformation(void)
@@ -151,13 +151,13 @@ void test_ThatWeCanClaimAndChainAFewElementsTogether(void)
 
 void test_ThatWeCanAskForAllSortsOfSizes(void)
 {
-  unsigned int  i;
+  CMOCK_MEM_INDEX_TYPE i;
   CMOCK_MEM_INDEX_TYPE first = CMOCK_GUTS_NONE;
   CMOCK_MEM_INDEX_TYPE next;
-  unsigned int  sizes[10]          = {3,  1,  80,  5,  8,  31, 7,  911, 2,  80};
-  unsigned int  sizes_buffered[10] = {16, 16, 88,  16, 16, 40, 16, 920, 16, 88}; //includes counter
-  unsigned int  sum = 0;
-  unsigned int  cap;
+  CMOCK_MEM_INDEX_TYPE sizes[10]          = {3,  1,  80,  5,  8,  31, 7,  911, 2,  80};
+  CMOCK_MEM_INDEX_TYPE sizes_buffered[10] = {16, 16, 88,  16, 16, 40, 16, 920, 16, 88}; //includes counter
+  CMOCK_MEM_INDEX_TYPE sum = 0;
+  CMOCK_MEM_INDEX_TYPE cap;
 
   for (i = 0; i < 10; i++)
   {

data/vendor/cmock/test/c/TestCMockCDynamic_Runner.c

@@ -5,6 +5,7 @@
 ========================================== */
 
 #include "unity.h"
+#include "cmock.h"
 #include <setjmp.h>
 #include <stdio.h>
 
@@ -20,9 +21,9 @@ extern void test_ThatWeCanAskForAllSortsOfSizes(void);
 
 int main(void)
 {
-  Unity.TestFile = "TestCMockDynamic.c";
   UnityBegin();
-  
+  Unity.TestFile = "TestCMockDynamic.c";
+
   RUN_TEST(test_MemNewWillReturnNullIfGivenIllegalSizes, 26);
   RUN_TEST(test_MemNewWillNowSupportSizesGreaterThanTheDefinesCMockSize, 35);
   RUN_TEST(test_MemChainWillReturnNullAndDoNothingIfGivenIllegalInformation, 45);
@@ -31,5 +32,6 @@ int main(void)
   RUN_TEST(test_ThatWeCanAskForAllSortsOfSizes, 152);
 
   UnityEnd();
+  CMock_Guts_MemFreeFinal();
   return 0;
 }

data/vendor/cmock/test/c/TestCMockC_Runner.c

@@ -22,8 +22,8 @@ extern void test_ThatWeCanAskForAllSortsOfSizes(void);
 
 int main(void)
 {
-  Unity.TestFile = "TestCMock.c";
   UnityBegin();
+  Unity.TestFile = "TestCMock.c";
 
   RUN_TEST(test_MemNewWillReturnNullIfGivenIllegalSizes, 21);
   RUN_TEST(test_MemChainWillReturnNullAndDoNothingIfGivenIllegalInformation, 32);

data/vendor/cmock/test/system/systest_generator.rb

@@ -2,7 +2,7 @@
 #   CMock Project - Automatic Mock Generation for C
 #   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
 #   [Released under MIT License. Please refer to license.txt for details]
-# ========================================== 
+# ==========================================
 
 require 'yaml'
 
@@ -26,31 +26,31 @@ C_EXTENSION    = '.c'
 
 
 class SystemTestGenerator
-  
+
   def generate_files(test_cases)
     test_cases.each do |filename|
       yaml_hash = YAML.load_file(filename)
-      
+
       name = File.basename(filename, YAML_EXTENSION)
       namix = "#{name}_"
-      
+
       generate_cmock_config(yaml_hash, namix)
       generate_code(yaml_hash, namix, name)
     end
   end
 
   private
-  
+
   def generate_cmock_config(yaml_hash, namix)
     cmock_yaml = yaml_hash.clone
     cmock_yaml.delete(:systest)
     cmock = cmock_yaml[:cmock]
-    
+
     cmock[:mock_path]   = GENERATED_PATH
     cmock[:includes]    = (cmock[:includes] || []) + [namix + TYPES_H]
     cmock[:mock_prefix] = MOCK_PREFIX
     if not yaml_hash[:systest][:unity_helper].nil?
-      cmock[:includes]     << namix + UNITY_HELPER_H 
+      cmock[:includes]     << namix + UNITY_HELPER_H
       cmock[:unity_helper_path]  = GENERATED_PATH + namix + UNITY_HELPER_H
     end
 
@@ -58,29 +58,29 @@ class SystemTestGenerator
       YAML.dump(cmock_yaml, out)
     end
   end
-  
-  def generate_code(yaml_hash, namix, name)    
+
+  def generate_code(yaml_hash, namix, name)
     generate_types_file(yaml_hash, namix)
     generate_mockable_file(yaml_hash, namix)
     generate_unity_helper_files(yaml_hash, namix)
-    
+
     generate_test_file(yaml_hash, namix, name)
     generate_source_file(yaml_hash, namix, name)
   end
-  
+
   def generate_types_file(yaml_hash, namix)
     types = yaml_hash[:systest][:types]
     return if types.nil?
-    
+
     write_header_file(GENERATED_PATH + namix + TYPES_H, namix.upcase + 'TYPES_H') do |out|
       out.puts(types)
     end
   end
-  
+
   def generate_mockable_file(yaml_hash, namix)
     mockable = yaml_hash[:systest][:mockable]
     return if mockable.nil?
-    
+
     write_header_file(GENERATED_PATH + namix + MOCKABLE_H, namix.upcase + 'MOCKABLE_H', [namix + TYPES_H]) do |out|
       out.puts(mockable)
     end
@@ -89,7 +89,7 @@ class SystemTestGenerator
   def generate_unity_helper_files(yaml_hash, namix)
     unity_helper = yaml_hash[:systest][:unity_helper]
     return if unity_helper.nil?
-    
+
     write_header_file(GENERATED_PATH + namix + UNITY_HELPER_H, namix.upcase + 'UNITY_HELPER_H', [namix + TYPES_H]) do |out|
       out.puts(unity_helper[:header])
     end
@@ -102,12 +102,12 @@ class SystemTestGenerator
   def generate_test_file(yaml_hash, namix, name)
     tests = yaml_hash[:systest][:tests]
     return if tests.nil?
-    
+
     includes = [UNITY_H, CMOCK_H]
     includes << (namix + UNITY_HELPER_H) if not yaml_hash[:systest][:unity_helper].nil?
     includes << [MOCK_PREFIX + namix + MOCKABLE_H]
     includes << [name + H_EXTENSION]
-    
+
     write_source_file(GENERATED_PATH + TEST_PREFIX + name + C_EXTENSION, includes.flatten) do |out|
       out.puts(tests[:common])
       out.puts('')
@@ -117,29 +117,29 @@ class SystemTestGenerator
         out.puts(test[:code].gsub!(/test\(\)/, "void test#{index+1}(void)"))
         out.puts('')
       end
-    end    
+    end
   end
 
   def generate_source_file(yaml_hash, namix, name)
     source = yaml_hash[:systest][:source]
     return if source.nil?
-    
+
     header_file = name + H_EXTENSION
-    
+
     includes = yaml_hash[:systest][:types].nil? ? [] : [(namix + TYPES_H)]
 
     write_header_file(GENERATED_PATH + header_file, name.upcase, includes) do |out|
       out.puts(source[:header])
-    end    
+    end
 
     includes = []
     includes << (namix + TYPES_H) if not yaml_hash[:systest][:types].nil?
     includes << (namix + MOCKABLE_H) if not yaml_hash[:systest][:mockable].nil?
     includes << header_file
-    
+
     write_source_file(GENERATED_PATH + name + C_EXTENSION, includes.flatten) do |out|
       out.puts(source[:code])
-    end    
+    end
   end
 
   def write_header_file(filename, upcase_name, include_list=[])
@@ -151,11 +151,17 @@ class SystemTestGenerator
         out.puts("#include \"#{include}\"")
       end
       out.puts('')
+      out.puts("#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)")
+      out.puts("#pragma GCC diagnostic ignored \"-Wpragmas\"")
+      out.puts("#endif")
+      out.puts('#pragma GCC diagnostic ignored "-Wunknown-pragmas"')
+      out.puts('#pragma GCC diagnostic ignored "-Wduplicate-decl-specifier"')
+      out.puts('')
       yield(out)
       out.puts('')
       out.puts("#endif // _#{upcase_name}")
       out.puts('')
-    end    
+    end
   end
 
   def write_source_file(filename, include_list=[])
@@ -164,11 +170,17 @@ class SystemTestGenerator
         out.puts("#include \"#{include}\"")
       end
       out.puts('')
+      out.puts("#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)")
+      out.puts("#pragma GCC diagnostic ignored \"-Wpragmas\"")
+      out.puts("#endif")
+      out.puts('#pragma GCC diagnostic ignored "-Wunknown-pragmas"')
+      out.puts('#pragma GCC diagnostic ignored "-Wduplicate-decl-specifier"')
+      out.puts('')
       yield(out)
       out.puts('')
-    end    
+    end
   end
-  
+
 end