ceedling 0.18.0 → 0.19.0

data/vendor/cmock/src/cmock.h

@@ -1,36 +1,38 @@
-/* ==========================================
-    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]
-========================================== */
-
-#ifndef CMOCK_FRAMEWORK_H
-#define CMOCK_FRAMEWORK_H
-
-//should be big enough to index full range of CMOCK_MEM_MAX
-#ifndef CMOCK_MEM_INDEX_TYPE
-#define CMOCK_MEM_INDEX_TYPE  unsigned int
-#endif
-
-#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
-//-------------------------------------------------------
-CMOCK_MEM_INDEX_TYPE  CMock_Guts_MemNew(CMOCK_MEM_INDEX_TYPE size);
-CMOCK_MEM_INDEX_TYPE  CMock_Guts_MemChain(CMOCK_MEM_INDEX_TYPE root_index, CMOCK_MEM_INDEX_TYPE obj_index);
-CMOCK_MEM_INDEX_TYPE  CMock_Guts_MemNext(CMOCK_MEM_INDEX_TYPE previous_item_index);
-CMOCK_MEM_INDEX_TYPE  CMock_Guts_MemEndOfChain(CMOCK_MEM_INDEX_TYPE root_index);
-
-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
+/* ==========================================
+    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]
+========================================== */
+
+#ifndef CMOCK_FRAMEWORK_H
+#define CMOCK_FRAMEWORK_H
+
+#include "cmock_internals.h"
+
+//should be big enough to index full range of CMOCK_MEM_MAX
+#ifndef CMOCK_MEM_INDEX_TYPE
+#define CMOCK_MEM_INDEX_TYPE  unsigned int
+#endif
+
+#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
+//-------------------------------------------------------
+CMOCK_MEM_INDEX_TYPE  CMock_Guts_MemNew(CMOCK_MEM_INDEX_TYPE size);
+CMOCK_MEM_INDEX_TYPE  CMock_Guts_MemChain(CMOCK_MEM_INDEX_TYPE root_index, CMOCK_MEM_INDEX_TYPE obj_index);
+CMOCK_MEM_INDEX_TYPE  CMock_Guts_MemNext(CMOCK_MEM_INDEX_TYPE previous_item_index);
+CMOCK_MEM_INDEX_TYPE  CMock_Guts_MemEndOfChain(CMOCK_MEM_INDEX_TYPE root_index);
+
+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

@@ -7,7 +7,17 @@
 #ifndef CMOCK_FRAMEWORK_INTERNALS_H
 #define CMOCK_FRAMEWORK_INTERNALS_H
 
-#include "cmock.h"
+//These are constants that the generated mocks have access to
+extern const char* CMockStringOutOfMemory;
+extern const char* CMockStringCalledMore;
+extern const char* CMockStringCalledLess;
+extern const char* CMockStringCalledEarly;
+extern const char* CMockStringCalledLate;
+extern const char* CMockStringCallOrder;
+extern const char* CMockStringIgnPreExp;
+extern const char* CMockStringPtrPreExp;
+extern const char* CMockStringExpNULL;
+extern const char* CMockStringMismatch;
 
 //define CMOCK_MEM_DYNAMIC to grab memory as needed with malloc
 //when you do that, CMOCK_MEM_SIZE is used for incremental size instead of total

data/vendor/cmock/targets/clang_strict.yml

@@ -1,85 +1,90 @@
----
-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
+---
+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'
+    - '-Wtautological-compare'
+    #- '-Wtautological-pointer-compare'
+    - '-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
+    - '-Wno-invalid-token-paste'
+    - '-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:
+      - CMOCK
+      - '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:
+  - out_of_memory
+  - callingconv
+
+colour: true

data/vendor/cmock/targets/gcc.yml

@@ -1,55 +1,58 @@
----
-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'
-    - '-Wall'
-    - '-Wextra'
-    - '-Wunused-parameter'
-    - '-Wno-address'
-    - '-std=c99'
-    - '-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'
-  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:
-  - unity_64bit_support
-  - callingconv
-
-colour: true
+---
+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'
+    - '-Wall'
+    - '-Wextra'
+    - '-Wunused-parameter'
+    - '-Wno-address'
+    - '-Wno-invalid-token-paste'
+    - '-std=c99'
+    - '-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:
+      - CMOCK
+      - 'UNITY_SUPPORT_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:
+  - out_of_memory
+  - unity_64bit_support
+  - callingconv
+
+colour: true

data/vendor/cmock/targets/gcc_64.yml

@@ -1,55 +1,58 @@
----
-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
+---
+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'
+    - '-Wno-invalid-token-paste'
+    - '-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:
+      - CMOCK
+      - '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:
+  - out_of_memory
+  - callingconv
+
+colour: true