ceedling 0.20.3 → 0.21.0

data/vendor/cmock/vendor/unity/test/rakefile

@@ -5,6 +5,7 @@
 # ==========================================
 
 UNITY_ROOT = File.expand_path(File.dirname(__FILE__)) + '/'
+$verbose = false
 
 require 'rake'
 require 'rake/clean'
@@ -58,3 +59,7 @@ end
 task :no_color do
   $colour_output = false
 end
+
+task :verbose do
+  $verbose = true
+end

data/vendor/cmock/vendor/unity/test/rakefile_helper.rb

@@ -92,12 +92,12 @@ module RakefileHelpers
     end
   end
 
-  def build_compiler_fields
+  def build_compiler_fields(inject_defines)
     command  = tackit($cfg['compiler']['path'])
     if $cfg['compiler']['defines']['items'].nil?
       defines  = ''
     else
-      defines  = squash($cfg['compiler']['defines']['prefix'], $cfg['compiler']['defines']['items'] + ['UNITY_OUTPUT_CHAR=putcharSpy'])
+      defines  = squash($cfg['compiler']['defines']['prefix'], $cfg['compiler']['defines']['items'] + ['UNITY_OUTPUT_CHAR=putcharSpy'] + inject_defines)
     end
     options  = squash('', $cfg['compiler']['options'])
     includes = squash($cfg['compiler']['includes']['prefix'], $cfg['compiler']['includes']['items'])
@@ -106,7 +106,8 @@ module RakefileHelpers
   end
 
   def compile(file, defines=[])
-    compiler = build_compiler_fields
+    compiler = build_compiler_fields(defines)
+    defines  =
     cmd_str  = "#{compiler[:command]}#{compiler[:defines]}#{compiler[:options]}#{compiler[:includes]} #{file} " +
                "#{$cfg['compiler']['object_files']['prefix']}#{$cfg['compiler']['object_files']['destination']}"
     obj_file = "#{File.basename(file, C_EXTENSION)}#{$cfg['compiler']['object_files']['extension']}"
@@ -160,11 +161,11 @@ module RakefileHelpers
     return {:command => command, :pre_support => pre_support, :post_support => post_support}
   end
 
-  def execute(command_string, verbose=true)
-    report command_string
+  def execute(command_string, ok_to_fail=false)
+    report command_string if $verbose
     output = `#{command_string}`.chomp
-    report(output) if (verbose && !output.nil? && (output.length > 0))
-    if $?.exitstatus != 0
+    report(output) if ($verbose && !output.nil? && (output.length > 0))
+    if (($?.exitstatus != 0) && !ok_to_fail)
       raise "Command failed. (Returned #{$?.exitstatus})"
     end
     return output
@@ -246,6 +247,7 @@ module RakefileHelpers
       if output.match(/OK$/m).nil?
         test_results += '.testfail'
       else
+        report output if (!$verbose) #verbose already prints this line, as does a failure
         test_results += '.testpass'
       end
       File.open(test_results, 'w') { |f| f.print output }

data/vendor/cmock/vendor/unity/test/targets/clang_file.yml

@@ -53,6 +53,7 @@ compiler:
     items:
       - 'src/'
       - '../src/'
+      - 'testdata/'
       - *unit_tests_path
   defines:
     prefix: '-D'

data/vendor/cmock/vendor/unity/test/targets/clang_strict.yml

@@ -53,6 +53,7 @@ compiler:
     items:
       - 'src/'
       - '../src/'
+      - 'testdata/'
       - *unit_tests_path
   defines:
     prefix: '-D'
@@ -60,6 +61,8 @@ compiler:
       - UNITY_INCLUDE_DOUBLE
       - UNITY_SUPPORT_TEST_CASES
       - UNITY_SUPPORT_64
+      - UNITY_OUTPUT_FLUSH
+      - UNITY_OMIT_OUTPUT_FLUSH_HEADER_DECLARATION
   object_files:
     prefix: '-o'
     extension: '.o'

data/vendor/cmock/vendor/unity/test/targets/gcc_32.yml

@@ -15,6 +15,7 @@ compiler:
     items:
       - 'src/'
       - '../src/'
+      - 'testdata/'
       - *unit_tests_path
   defines:
     prefix: '-D'

data/vendor/cmock/vendor/unity/test/targets/gcc_64.yml

@@ -15,6 +15,7 @@ compiler:
     items:
       - 'src/'
       - '../src/'
+      - 'testdata/'
       - *unit_tests_path
   defines:
     prefix: '-D'

data/vendor/cmock/vendor/unity/test/targets/gcc_auto_limits.yml

@@ -15,6 +15,7 @@ compiler:
     items:
       - 'src/'
       - '../src/'
+      - 'testdata/'
       - *unit_tests_path
   defines:
     prefix: '-D'

data/vendor/cmock/vendor/unity/test/targets/gcc_auto_sizeof.yml

@@ -15,6 +15,7 @@ compiler:
     items:
       - 'src/'
       - '../src/'
+      - 'testdata/'
       - *unit_tests_path
   defines:
     prefix: '-D'

data/vendor/cmock/vendor/unity/test/targets/gcc_auto_stdint.yml

@@ -28,6 +28,7 @@ compiler:
     items:
       - 'src/'
       - '../src/'
+      - 'testdata/'
       - *unit_tests_path
   defines:
     prefix: '-D'

data/vendor/cmock/vendor/unity/test/targets/gcc_manual_math.yml

@@ -15,6 +15,7 @@ compiler:
     items:
       - 'src/'
       - '../src/'
+      - 'testdata/'
       - *unit_tests_path
   defines:
     prefix: '-D'

data/vendor/cmock/vendor/unity/test/targets/iar_arm_v4.yml

@@ -32,6 +32,7 @@ compiler:
       - [*tools_root, 'arm\inc\']
       - 'src\'
       - '..\src\'
+      - 'testdata/'
       - *unit_tests_path
       - 'vendor\unity\src\'
   defines:

data/vendor/cmock/vendor/unity/test/targets/iar_arm_v5.yml

@@ -31,6 +31,7 @@ compiler:
       - [*tools_root, 'arm\inc\']
       - 'src\'
       - '..\src\'
+      - 'testdata/'
       - *unit_tests_path
       - 'vendor\unity\src\'
       - 'iar\iar_v5\incIAR\'

data/vendor/cmock/vendor/unity/test/targets/iar_arm_v5_3.yml

@@ -31,6 +31,7 @@ compiler:
       - [*tools_root, 'arm\inc\']
       - 'src\'
       - '..\src\'
+      - 'testdata/'
       - *unit_tests_path
       - 'vendor\unity\src\'
       - 'iar\iar_v5\incIAR\'

data/vendor/cmock/vendor/unity/test/targets/iar_armcortex_LM3S9B92_v5_4.yml

@@ -35,6 +35,7 @@ compiler:
       - [*tools_root, 'arm\inc\']
       - 'src\'
       - '..\src\'
+      - 'testdata/'
       - *unit_tests_path
       - 'vendor\unity\src\'
       - 'iar\iar_v5\incIAR\'

data/vendor/cmock/vendor/unity/test/targets/iar_cortexm3_v5.yml

@@ -33,6 +33,7 @@ compiler:
      - [*tools_root, 'arm\inc\']
      - 'src\'
       - '..\src\'
+      - 'testdata/'
      - *unit_tests_path
      - 'vendor\unity\src\'
      - 'iar\iar_v5\incIAR\'

data/vendor/cmock/vendor/unity/test/targets/iar_msp430.yml

@@ -34,6 +34,7 @@ compiler:
       - [*core_lib, 'dlib']
       - 'src\'
       - '../src/'
+      - 'testdata/'
       - *unit_tests_path
       - 'vendor\unity\src'
   defines:

data/vendor/cmock/vendor/unity/test/targets/iar_sh2a_v6.yml

@@ -34,6 +34,7 @@ compiler:
       - [*tools_root, 'sh\inc\c']
       - 'src\'
       - '..\src\'
+      - 'testdata/'
       - *unit_tests_path
       - 'vendor\unity\src\'
   defines:

data/vendor/cmock/vendor/unity/test/testdata/CException.h

@@ -0,0 +1,11 @@
+#ifndef CEXCEPTION_H
+#define CEXCEPTION_H
+
+#define CEXCEPTION_BEING_USED 1
+
+#define CEXCEPTION_NONE 0
+#define CEXCEPTION_T int e = 1; (void)
+#define Try          if (e)
+#define Catch(a)     if (!a)
+
+#endif //CEXCEPTION_H

data/vendor/cmock/vendor/unity/test/testdata/Defs.h

@@ -0,0 +1,8 @@
+#ifndef DEF_H
+#define DEF_H
+
+#define EXTERN_DECL
+
+extern int CounterSuiteSetup;
+
+#endif //DEF_H

data/vendor/cmock/vendor/unity/test/testdata/cmock.h

@@ -0,0 +1,14 @@
+#ifndef CMOCK_H
+#define CMOCK_H
+
+int CMockMemFreeFinalCounter = 0;
+int mockMock_Init_Counter = 0;
+int mockMock_Verify_Counter = 0;
+int mockMock_Destroy_Counter = 0;
+
+void CMock_Guts_MemFreeFinal(void) { CMockMemFreeFinalCounter++; }
+void mockMock_Init(void)           { mockMock_Init_Counter++;    }
+void mockMock_Verify(void)         { mockMock_Verify_Counter++;  }
+void mockMock_Destroy(void)        { mockMock_Destroy_Counter++; }
+
+#endif //CMOCK_H

data/vendor/cmock/vendor/unity/test/testdata/mockMock.h

@@ -0,0 +1,13 @@
+#ifndef MOCK_MOCK_H
+#define MOCK_MOCK_H
+
+extern int mockMock_Init_Counter;
+extern int mockMock_Verify_Counter;
+extern int mockMock_Destroy_Counter;
+extern int CMockMemFreeFinalCounter;
+
+void mockMock_Init(void);
+void mockMock_Verify(void);
+void mockMock_Destroy(void);
+
+#endif //MOCK_MOCK_H

data/vendor/cmock/vendor/unity/test/testdata/testRunnerGenerator.c

@@ -0,0 +1,183 @@
+/* This Test File Is Used To Verify Many Combinations Of Using the Generate Test Runner Script */
+
+#include <stdio.h>
+#include "unity.h"
+#include "Defs.h"
+
+#ifdef USE_CEXCEPTION
+#include "CException.h"
+#endif
+
+/* Notes about prefixes:
+   test     - normal default prefix. these are "always run" tests for this procedure
+   spec     - normal default prefix. required to run default setup/teardown calls.
+   should   - normal default prefix.
+   qwiktest - custom prefix for when tests skip all setup/teardown calls.
+   custtest - custom prefix for when tests use custom setup/teardown calls.
+   paratest - custom prefix for when we want to verify parameterized tests.
+   extest   - custom prefix only used during cexception
+   suitetest- custom prefix for when we want to use custom suite setup/teardown
+*/
+
+/* Support for Meta Test Rig */
+#define TEST_CASE(a)
+void putcharSpy(int c) { (void)putchar(c);} // include passthrough for linking tests
+
+/* Global Variables Used During These Tests */
+int CounterSetup = 0;
+int CounterTeardown = 0;
+int CounterSuiteSetup = 0;
+
+void setUp(void)
+{
+    CounterSetup = 1;
+}
+
+void tearDown(void)
+{
+    CounterTeardown = 1;
+}
+
+void custom_setup(void)
+{
+    CounterSetup = 2;
+}
+
+void custom_teardown(void)
+{
+    CounterTeardown = 2;
+}
+
+/*
+void test_OldSchoolCommentsShouldBeIgnored(void)
+{
+    TEST_ASSERT_FAIL("Old-School Comments Should Be Ignored");
+}
+*/
+
+void test_ThisTestAlwaysPasses(void)
+{
+    TEST_PASS();
+}
+
+void test_ThisTestAlwaysFails(void)
+{
+    TEST_FAIL_MESSAGE("This Test Should Fail");
+}
+
+void test_ThisTestAlwaysIgnored(void)
+{
+    TEST_IGNORE_MESSAGE("This Test Should Be Ignored");
+}
+
+void qwiktest_ThisTestPassesWhenNoSetupRan(void)
+{
+    TEST_ASSERT_EQUAL_MESSAGE(0, CounterSetup, "Setup Was Unexpectedly Run");
+}
+
+void qwiktest_ThisTestPassesWhenNoTeardownRan(void)
+{
+    TEST_ASSERT_EQUAL_MESSAGE(0, CounterTeardown, "Teardown Was Unexpectedly Run");
+}
+
+void spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan(void)
+{
+    TEST_ASSERT_EQUAL_MESSAGE(0, CounterSuiteSetup, "Suite Setup Was Unexpectedly Run");
+}
+
+void spec_ThisTestPassesWhenNormalSetupRan(void)
+{
+    TEST_ASSERT_EQUAL_MESSAGE(1, CounterSetup, "Normal Setup Wasn't Run");
+}
+
+void spec_ThisTestPassesWhenNormalTeardownRan(void)
+{
+    TEST_ASSERT_EQUAL_MESSAGE(1, CounterTeardown, "Normal Teardown Wasn't Run");
+}
+
+void custtest_ThisTestPassesWhenCustomSetupRan(void)
+{
+    TEST_ASSERT_EQUAL_MESSAGE(2, CounterSetup, "Custom Setup Wasn't Run");
+}
+
+void custtest_ThisTestPassesWhenCustomTeardownRan(void)
+{
+    TEST_ASSERT_EQUAL_MESSAGE(2, CounterTeardown, "Custom Teardown Wasn't Run");
+}
+
+//void test_NewStyleCommentsShouldBeIgnored(void)
+//{
+//    TEST_ASSERT_FAIL("New Style Comments Should Be Ignored");
+//}
+
+void test_NotBeConfusedByLongComplicatedStrings(void)
+{
+    const char* crazyString = "GET / HTTP/1.1\r\nHost: 127.0.0.1:8081\r\nConnection: keep-alive\r\nCache-Control: no-cache\r\nUser-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36\r\nPostman-Token: 768c7149-c3fb-f704-71a2-63918d9195b2\r\nAccept: */*\r\nAccept-Encoding: gzip, deflate, sdch\r\nAccept-Language: en-GB,en-US;q=0.8,en;q=0.6\r\n\r\n";
+
+    TEST_ASSERT_EQUAL_STRING_MESSAGE(crazyString, crazyString, "These Strings Are The Same");
+}
+
+void test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings(void)
+{
+    TEST_ASSERT_TRUE_MESSAGE(1, "1 Should be True");
+}
+
+void test_StillNotBeConfusedByLongComplicatedStrings(void)
+{
+    const char* crazyString = "GET / HTTP/1.1\r\nHost: 127.0.0.1:8081\r\nConnection: keep-alive\r\nCache-Control: no-cache\r\nUser-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36\r\nPostman-Token: 768c7149-c3fb-f704-71a2-63918d9195b2\r\nAccept: */*\r\nAccept-Encoding: gzip, deflate, sdch\r\nAccept-Language: en-GB,en-US;q=0.8,en;q=0.6\r\n\r\n";
+
+    TEST_ASSERT_EQUAL_STRING_MESSAGE(crazyString, crazyString, "These Strings Are Still The Same");
+}
+
+void should_RunTestsStartingWithShouldByDefault(void)
+{
+    TEST_ASSERT_TRUE_MESSAGE(1, "1 Should be True");
+}
+
+TEST_CASE(25)
+TEST_CASE(125)
+TEST_CASE(5)
+void paratest_ShouldHandleParameterizedTests(int Num)
+{
+    TEST_ASSERT_EQUAL_MESSAGE(0, (Num % 5), "All The Values Are Divisible By 5");
+}
+
+TEST_CASE(7)
+void paratest_ShouldHandleParameterizedTests2(int Num)
+{
+    TEST_ASSERT_EQUAL_MESSAGE(7, Num, "The Only Call To This Passes");
+}
+
+void paratest_ShouldHandleNonParameterizedTestsWhenParameterizationValid(void)
+{
+    TEST_PASS();
+}
+
+TEST_CASE(17)
+void paratest_ShouldHandleParameterizedTestsThatFail(int Num)
+{
+    TEST_ASSERT_EQUAL_MESSAGE(3, Num, "This call should fail");
+}
+
+#ifdef USE_CEXCEPTION
+void extest_ShouldHandleCExceptionInTest(void)
+{
+    TEST_ASSERT_EQUAL_MESSAGE(1, CEXCEPTION_BEING_USED, "Should be pulling in CException");
+}
+#endif
+
+#ifdef USE_ANOTHER_MAIN
+int custom_main(void);
+
+int main(void)
+{
+    return custom_main();
+}
+#endif
+
+void suitetest_ThisTestPassesWhenCustomSuiteSetupAndTeardownRan(void)
+{
+    TEST_ASSERT_EQUAL_MESSAGE(1, CounterSuiteSetup, "Suite Setup Should Have Run");
+}
+
+