ceedling 0.15.2 → 0.15.3

data/vendor/cmock/examples/src/TimerInterruptConfigurator.h

@@ -1,5 +1,5 @@
 #ifndef _TIMERINTERRUPTCONFIGURATOR_H
-#define _TIMERINTERRUPCONFIGURATOR_H
+#define _TIMERINTERRUPTCONFIGURATOR_H
 
 #include "Types.h"
 

data/vendor/cmock/release/build.info

@@ -1,2 +1,2 @@
-212
+213
 

data/vendor/unity/auto/generate_test_runner.rb

@@ -130,7 +130,7 @@ class UnityTestRunnerGenerator
     return mock_headers
   end
 
-  def create_header(output, mocks, testfile_includes)
+  def create_header(output, mocks, testfile_includes=[])
     output.puts('/* AUTOGENERATED FILE. DO NOT EDIT. */')
     create_runtest(output, mocks)
     output.puts("\n//=======Automagically Detected Files To Include=====")
@@ -142,9 +142,9 @@ class UnityTestRunnerGenerator
     output.puts('#include <setjmp.h>')
     output.puts('#include <stdio.h>')
     output.puts('#include "CException.h"') if @options[:plugins].include?(:cexception)
-  testfile_includes.delete("unity").delete("cmock")
-  testrunner_includes = testfile_includes - mocks
-  testrunner_includes.each do |inc|
+    testfile_includes.delete_if{|inc| inc =~ /(unity|cmock)/}
+    testrunner_includes = testfile_includes - mocks
+    testrunner_includes.each do |inc|
     output.puts("#include #{inc.include?('<') ? inc : "\"#{inc.gsub('.h','')}.h\""}")
   end
     mocks.each do |mock|

data/vendor/unity/examples/example_3/rakefile.rb

@@ -3,7 +3,6 @@ UNITY_ROOT = File.expand_path(File.dirname(__FILE__)) + '/../..'
 
 require 'rake'
 require 'rake/clean'
-require 'rake/testtask'
 require HERE+'rakefile_helper'
 
 TEMP_DIRS = [

data/vendor/unity/src/unity.c

@@ -5,8 +5,6 @@
 ============================================================================ */
 
 #include "unity.h"
-#include <stdio.h>
-#include <string.h>
 
 #define UNITY_FAIL_AND_BAIL   { Unity.CurrentTestFailed  = 1; longjmp(Unity.AbortFrame, 1); }
 #define UNITY_IGNORE_AND_BAIL { Unity.CurrentTestIgnored = 1; longjmp(Unity.AbortFrame, 1); }
@@ -231,6 +229,7 @@ void UnityPrintMask(const _U_UINT mask, const _U_UINT number)
 
 //-----------------------------------------------
 #ifdef UNITY_FLOAT_VERBOSE
+#include <string.h>
 void UnityPrintFloat(_UF number)
 {
     char TempBuffer[32];

data/vendor/unity/src/unity.h

@@ -1,12 +1,11 @@
 /* ==========================================
     Unity Project - A Test Framework for C
-    Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
+    Copyright (c) 2007-14 Mike Karlesky, Mark VanderVoord, Greg Williams
     [Released under MIT License. Please refer to license.txt for details]
 ========================================== */
 
 #ifndef UNITY_FRAMEWORK_H
 #define UNITY_FRAMEWORK_H
-
 #define UNITY
 
 #include "unity_internals.h"
@@ -17,10 +16,15 @@
 // All options described below should be passed as a compiler flag to all files using Unity. If you must add #defines, place them BEFORE the #include above.
 
 // Integers/longs/pointers
-//     - Unity assumes 32 bit integers, longs, and pointers by default
-//     - If your compiler treats ints of a different size, options are:
-//       - define UNITY_USE_LIMITS_H to use limits.h to determine sizes
-//       - define UNITY_INT_WIDTH, UNITY_LONG_WIDTH, nand UNITY_POINTER_WIDTH
+//     - Unity attempts to automatically discover your integer sizes
+//       - define UNITY_EXCLUDE_STDINT_H to stop attempting to look in <stdint.h>
+//       - define UNITY_EXCLUDE_LIMITS_H to stop attempting to look in <limits.h>
+//       - define UNITY_EXCLUDE_SIZEOF to stop attempting to use sizeof in macros
+//     - If you cannot use the automatic methods above, you can force Unity by using these options:
+//       - define UNITY_SUPPORT_64
+//       - define UNITY_INT_WIDTH
+//       - UNITY_LONG_WIDTH
+//       - UNITY_POINTER_WIDTH
 
 // Floats
 //     - define UNITY_EXCLUDE_FLOAT to disallow floating point comparisons
@@ -46,47 +50,6 @@
 // Parameterized Tests
 //     - you'll want to create a define of TEST_CASE(...) which basically evaluates to nothing
 
-//-------------------------------------------------------
-// Test Running Macros
-//-------------------------------------------------------
-
-#define TEST_PROTECT() (setjmp(Unity.AbortFrame) == 0)
-
-#define TEST_ABORT() {longjmp(Unity.AbortFrame, 1);}
-
-//This tricky series of macros gives us an optional line argument to treat it as RUN_TEST(func, num=__LINE__)
-#ifndef RUN_TEST
-#ifdef __STDC_VERSION__
-#if __STDC_VERSION__ >= 199901L
-#define RUN_TEST(...) UnityDefaultTestRun(RUN_TEST_FIRST(__VA_ARGS__), RUN_TEST_SECOND(__VA_ARGS__))
-#define RUN_TEST_FIRST(...) RUN_TEST_FIRST_HELPER(__VA_ARGS__, throwaway)
-#define RUN_TEST_FIRST_HELPER(first,...) first, #first
-#define RUN_TEST_SECOND(...) RUN_TEST_SECOND_HELPER(__VA_ARGS__, __LINE__, throwaway)
-#define RUN_TEST_SECOND_HELPER(first,second,...) second
-#endif
-#endif
-#endif
-
-//If we can't do the tricky version, we'll just have to require them to always include the line number
-#ifndef RUN_TEST
-#ifdef CMOCK
-#define RUN_TEST(func, num) UnityDefaultTestRun(func, #func, num)
-#else
-#define RUN_TEST(func) UnityDefaultTestRun(func, #func, __LINE__)
-#endif
-#endif
-
-#define TEST_LINE_NUM (Unity.CurrentTestLineNumber)
-#define TEST_IS_IGNORED (Unity.CurrentTestIgnored)
-
-#ifndef UNITY_BEGIN
-#define UNITY_BEGIN() {UnityBegin(); Unity.TestFile = __FILE__;}
-#endif
-
-#ifndef UNITY_END
-#define UNITY_END() UnityEnd()
-#endif
-
 //-------------------------------------------------------
 // Basic Fail and Ignore
 //-------------------------------------------------------
@@ -304,4 +267,6 @@
 #define TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF_MESSAGE(actual, message)                                 UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF(actual, __LINE__, message)
 #define TEST_ASSERT_DOUBLE_IS_NOT_NAN_MESSAGE(actual, message)                                     UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NAN(actual, __LINE__, message)
 #define TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE_MESSAGE(actual, message)                             UNITY_TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE(actual, __LINE__, message)
+
+//end of UNITY_FRAMEWORK_H
 #endif

data/vendor/unity/src/unity_internals.h

@@ -1,13 +1,16 @@
 /* ==========================================
     Unity Project - A Test Framework for C
-    Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
+    Copyright (c) 2007-14 Mike Karlesky, Mark VanderVoord, Greg Williams
     [Released under MIT License. Please refer to license.txt for details]
 ========================================== */
 
 #ifndef UNITY_INTERNALS_H
 #define UNITY_INTERNALS_H
 
-#include <stdio.h>
+#ifdef UNITY_INCLUDE_CONFIG_H
+#include "unity_config.h"
+#endif
+
 #include <setjmp.h>
 
 // Unity Attempts to Auto-Detect Integer Types
@@ -237,7 +240,7 @@ typedef UNITY_FLOAT_TYPE _UF;
 
 #else
 
-//Floating Point Support
+//Double Floating Point Support
 #ifndef UNITY_DOUBLE_PRECISION
 #define UNITY_DOUBLE_PRECISION (1e-12f)
 #endif
@@ -248,16 +251,27 @@ typedef UNITY_DOUBLE_TYPE _UD;
 
 #endif
 
+#ifdef UNITY_DOUBLE_VERBOSE
+#ifndef UNITY_FLOAT_VERBOSE
+#define UNITY_FLOAT_VERBOSE
+#endif
+#endif
+
 //-------------------------------------------------------
 // Output Method
 //-------------------------------------------------------
 
 #ifndef UNITY_OUTPUT_CHAR
-//Default to using putchar, which is defined in stdio.h above
+
+//Default to using putchar, which is defined in stdio.h
+#include <stdio.h>
 #define UNITY_OUTPUT_CHAR(a) putchar(a)
+
 #else
+
 //If defined as something else, make sure we declare it here so it's ready for use
 extern int UNITY_OUTPUT_CHAR(int);
+
 #endif
 
 //-------------------------------------------------------
@@ -496,6 +510,47 @@ extern const char* UnityStrErrFloat;
 extern const char* UnityStrErrDouble;
 extern const char* UnityStrErr64;
 
+//-------------------------------------------------------
+// Test Running Macros
+//-------------------------------------------------------
+
+#define TEST_PROTECT() (setjmp(Unity.AbortFrame) == 0)
+
+#define TEST_ABORT() {longjmp(Unity.AbortFrame, 1);}
+
+//This tricky series of macros gives us an optional line argument to treat it as RUN_TEST(func, num=__LINE__)
+#ifndef RUN_TEST
+#ifdef __STDC_VERSION__
+#if __STDC_VERSION__ >= 199901L
+#define RUN_TEST(...) UnityDefaultTestRun(RUN_TEST_FIRST(__VA_ARGS__), RUN_TEST_SECOND(__VA_ARGS__))
+#define RUN_TEST_FIRST(...) RUN_TEST_FIRST_HELPER(__VA_ARGS__, throwaway)
+#define RUN_TEST_FIRST_HELPER(first,...) first, #first
+#define RUN_TEST_SECOND(...) RUN_TEST_SECOND_HELPER(__VA_ARGS__, __LINE__, throwaway)
+#define RUN_TEST_SECOND_HELPER(first,second,...) second
+#endif
+#endif
+#endif
+
+//If we can't do the tricky version, we'll just have to require them to always include the line number
+#ifndef RUN_TEST
+#ifdef CMOCK
+#define RUN_TEST(func, num) UnityDefaultTestRun(func, #func, num)
+#else
+#define RUN_TEST(func) UnityDefaultTestRun(func, #func, __LINE__)
+#endif
+#endif
+
+#define TEST_LINE_NUM (Unity.CurrentTestLineNumber)
+#define TEST_IS_IGNORED (Unity.CurrentTestIgnored)
+
+#ifndef UNITY_BEGIN
+#define UNITY_BEGIN() {UnityBegin(); Unity.TestFile = __FILE__;}
+#endif
+
+#ifndef UNITY_END
+#define UNITY_END() UnityEnd()
+#endif
+
 //-------------------------------------------------------
 // Basic Fail and Ignore
 //-------------------------------------------------------
@@ -629,4 +684,5 @@ extern const char* UnityStrErr64;
 #define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE(actual, line, message)                       UnityAssertDoubleSpecial((_UD)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_FLOAT_IS_NOT_DET)
 #endif
 
+//End of UNITY_INTERNALS_H
 #endif

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

@@ -8,7 +8,6 @@ UNITY_ROOT = File.expand_path(File.dirname(__FILE__)) + '/'
 
 require 'rake'
 require 'rake/clean'
-require 'rake/testtask'
 require UNITY_ROOT + 'rakefile_helper'
 
 TEMP_DIRS = [
@@ -25,12 +24,7 @@ task :prepare_for_tests => TEMP_DIRS
 include RakefileHelpers
 
 # Load proper GCC as defult configuration
-if 1.size == 8 # 8 bytes => 64-bits
-  DEFAULT_CONFIG_FILE = 'gcc_64.yml'
-else # Assume 32-bit otherwise
-  DEFAULT_CONFIG_FILE = 'gcc_32.yml'
-end
-
+DEFAULT_CONFIG_FILE = 'gcc_auto_stdint.yml'
 configure_toolchain(DEFAULT_CONFIG_FILE)
 
 desc "Test unity with its own unit tests"

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

@@ -6,9 +6,9 @@
 
 require 'yaml'
 require 'fileutils'
-require UNITY_ROOT + 'auto/unity_test_summary'
-require UNITY_ROOT + 'auto/generate_test_runner'
-require UNITY_ROOT + 'auto/colour_reporter'
+require UNITY_ROOT + '../auto/unity_test_summary'
+require UNITY_ROOT + '../auto/generate_test_runner'
+require UNITY_ROOT + '../auto/colour_reporter'
 
 module RakefileHelpers
 

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

@@ -1,8 +1,8 @@
 ---
 compiler:
   path: clang
-  source_path:     'src/'
-  unit_tests_path: &unit_tests_path 'test/'
+  source_path:     '../src/'
+  unit_tests_path: &unit_tests_path 'tests/'
   build_path:      &build_path 'build/'
   options:
     - '-c'

data/vendor/unity/{targets → test/targets}/gcc_32.yml

@@ -1,7 +1,7 @@
 compiler:
   path: gcc
-  source_path:     'src/'
-  unit_tests_path: &unit_tests_path 'test/'
+  source_path:     '../src/'
+  unit_tests_path: &unit_tests_path 'tests/'
   build_path:      &build_path 'build/'
   options:
     - '-c'

data/vendor/unity/{targets → test/targets}/gcc_64.yml

@@ -1,7 +1,7 @@
 compiler:
   path: gcc
-  source_path:     'src/'
-  unit_tests_path: &unit_tests_path 'test/'
+  source_path:     '../src/'
+  unit_tests_path: &unit_tests_path 'tests/'
   build_path:      &build_path 'build/'
   options:
     - '-c'

data/vendor/unity/{targets → test/targets}/gcc_auto_limits.yml

@@ -1,7 +1,7 @@
 compiler:
   path: gcc
-  source_path:     'src/'
-  unit_tests_path: &unit_tests_path 'test/'
+  source_path:     '../src/'
+  unit_tests_path: &unit_tests_path 'tests/'
   build_path:      &build_path 'build/'
   options:
     - '-c'

data/vendor/unity/{targets → test/targets}/gcc_auto_sizeof.yml

@@ -1,7 +1,7 @@
 compiler:
   path: gcc
-  source_path:     'src/'
-  unit_tests_path: &unit_tests_path 'test/'
+  source_path:     '../src/'
+  unit_tests_path: &unit_tests_path 'tests/'
   build_path:      &build_path 'build/'
   options:
     - '-c'

data/vendor/unity/{targets → test/targets}/gcc_auto_stdint.yml

@@ -1,7 +1,7 @@
 compiler:
   path: gcc
-  source_path:     'src/'
-  unit_tests_path: &unit_tests_path 'test/'
+  source_path:     '../src/'
+  unit_tests_path: &unit_tests_path 'tests/'
   build_path:      &build_path 'build/'
   options:
     - '-c'

data/vendor/unity/{targets → test/targets}/hitech_picc18.yml

@@ -1,11 +1,11 @@
-# rumor has it that this yaml file works for the standard edition of the 
+# rumor has it that this yaml file works for the standard edition of the
 # hitech PICC18 compiler, but not the pro version.
 #
 compiler:
   path: cd build && picc18
-  source_path: 'c:\Projects\NexGen\Prototypes\CMockTest\src\'
-  unit_tests_path: &unit_tests_path 'c:\Projects\NexGen\Prototypes\CMockTest\test\'
-  build_path: &build_path 'c:\Projects\NexGen\Prototypes\CMockTest\build\'
+  source_path: '..\src\'
+  unit_tests_path: &unit_tests_path 'tests\'
+  build_path: &build_path 'build\'
   options:
     - --chip=18F87J10
     - --ide=hitide
@@ -19,7 +19,7 @@ compiler:
     - -Bl # Large memory model
     - -G # generate symbol file
     - --cp=16 # 16-bit pointers
-    - --double=24 
+    - --double=24
     - -N255 # 255-char symbol names
     - --opt=none # Do not use any compiler optimziations
     - -c # compile only
@@ -35,62 +35,62 @@ compiler:
       - 'c:/CMock/vendor/unity/examples/helper/'
       - *unit_tests_path
   defines:
-    prefix: '-D' 
-    items: 
-      - UNITY_INT_WIDTH=16 
+    prefix: '-D'
+    items:
+      - UNITY_INT_WIDTH=16
       - UNITY_POINTER_WIDTH=16
-      - CMOCK_MEM_STATIC 
+      - CMOCK_MEM_STATIC
       - CMOCK_MEM_SIZE=3000
-      - UNITY_SUPPORT_TEST_CASES 
+      - UNITY_SUPPORT_TEST_CASES
       - _PICC18
-  object_files: 
-    # prefix: '-O' # Hi-Tech doesn't want a prefix. They key off of filename .extensions, instead 
-    extension: '.obj' 
-    destination: *build_path 
+  object_files:
+    # prefix: '-O' # Hi-Tech doesn't want a prefix. They key off of filename .extensions, instead
+    extension: '.obj'
+    destination: *build_path
 
-linker: 
-  path: cd build && picc18 
-  options: 
-    - --chip=18F87J10 
-    - --ide=hitide 
-    - --cp=24 # 24-bit pointers. Is this needed for linker?? 
-    - --double=24 # Is this needed for linker?? 
+linker:
+  path: cd build && picc18
+  options:
+    - --chip=18F87J10
+    - --ide=hitide
+    - --cp=24 # 24-bit pointers. Is this needed for linker??
+    - --double=24 # Is this needed for linker??
     - -Lw # Scan the pic87*w.lib in the lib/ of the compiler installation directory
-    - --summary=mem,file # info listing 
-    - --summary=+psect 
-    - --summary=+hex 
-    - --output=+intel 
-    - --output=+mcof 
-    - --runtime=+init # Directs startup code to copy idata, ibigdata and ifardata psects from ROM to RAM. 
-    - --runtime=+clear # Directs startup code to clear bss, bigbss, rbss and farbss psects 
-    - --runtime=+clib # link in the c-runtime 
-    - --runtime=+keep # Keep the generated startup src after its obj is linked 
-    - -G # Generate src-level symbol file 
-    - -MIWasTheLastToBuild.map 
-    - --warn=0 # allow all normal warning messages 
-    - -Bl # Large memory model (probably not needed for linking) 
-  includes: 
-    prefix: '-I' 
-    object_files: 
-      path: *build_path 
-      extension: '.obj' 
-    bin_files: 
-      prefix: '-O' 
-      extension: '.hex' 
-      destination: *build_path 
+    - --summary=mem,file # info listing
+    - --summary=+psect
+    - --summary=+hex
+    - --output=+intel
+    - --output=+mcof
+    - --runtime=+init # Directs startup code to copy idata, ibigdata and ifardata psects from ROM to RAM.
+    - --runtime=+clear # Directs startup code to clear bss, bigbss, rbss and farbss psects
+    - --runtime=+clib # link in the c-runtime
+    - --runtime=+keep # Keep the generated startup src after its obj is linked
+    - -G # Generate src-level symbol file
+    - -MIWasTheLastToBuild.map
+    - --warn=0 # allow all normal warning messages
+    - -Bl # Large memory model (probably not needed for linking)
+  includes:
+    prefix: '-I'
+    object_files:
+      path: *build_path
+      extension: '.obj'
+    bin_files:
+      prefix: '-O'
+      extension: '.hex'
+      destination: *build_path
 
-simulator: 
-  path: 
-  pre_support: 
-    - 'java -client -jar ' # note space 
-    - ['C:\Program Files\HI-TECH Software\HI-TIDE\3.15\lib\', 'simpic18.jar'] 
-    - 18F87J10 
-  post_support: 
+simulator:
+  path:
+  pre_support:
+    - 'java -client -jar ' # note space
+    - ['C:\Program Files\HI-TECH Software\HI-TIDE\3.15\lib\', 'simpic18.jar']
+    - 18F87J10
+  post_support:
 
-:cmock: 
-  :plugins: [] 
-  :includes: 
-    - Types.h 
+:cmock:
+  :plugins: []
+  :includes:
+    - Types.h
   :suite_teardown: |
     if (num_failures)
       _FAILED_TEST();
@@ -98,4 +98,4 @@ simulator:
       _PASSED_TESTS();
     return 0;
 
-colour: true 
+colour: true