ceedling 0.18.0 → 0.19.0

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

@@ -1,85 +1,85 @@
-tools_root: &tools_root 'C:\Program Files\IAR Systems\Embedded Workbench 6.0\'
-compiler:
-  path:             [*tools_root, 'sh\bin\iccsh.exe']
-  source_path:      '..\src\'
-  unit_tests_path:  &unit_tests_path 'tests\'
-  build_path:       &build_path 'build\'
-  options:
-    - -e
-    - --char_is_signed
-    - -Ol
-    - --no_cse
-    - --no_unroll
-    - --no_inline
-    - --no_code_motion
-    - --no_tbaa
-    - --no_scheduling
-    - --no_clustering
-    - --debug
-    - --dlib_config
-    - [*tools_root, 'sh\inc\DLib_Product.h']
-    - --double=32
-    - --code_model=huge
-    - --data_model=huge
-    - --core=sh2afpu
-    - --warnings_affect_exit_code
-    - --warnings_are_errors
-    - --mfc
-    - --use_unix_directory_separators
-    - --diag_suppress=Pe161
-  includes:
-    prefix: '-I'
-    items:
-      - [*tools_root, 'sh\inc\']
-      - [*tools_root, 'sh\inc\c']
-      - 'src\'
-      - '..\src\'
-      - *unit_tests_path
-      - 'vendor\unity\src\'
-  defines:
-    prefix: '-D'
-    items:
-      - UNITY_SUPPORT_64
-      - 'UNITY_SUPPORT_TEST_CASES'
-  object_files:
-    prefix: '-o'
-    extension: '.o'
-    destination: *build_path
-linker:
-  path: [*tools_root, 'sh\bin\ilinksh.exe']
-  options:
-    - --redirect __Printf=__PrintfSmall
-    - --redirect __Scanf=__ScanfSmall
-    - --config
-    - [*tools_root, 'sh\config\generic.icf']
-    - --config_def _CSTACK_SIZE=0x800
-    - --config_def _HEAP_SIZE=0x800
-    - --config_def _INT_TABLE=0x10
-    - --entry __iar_program_start
-    - --debug_lib
-  object_files:
-    path: *build_path
-    extension: '.o'
-  bin_files:
-    prefix: '-o'
-    extension: '.out'
-    destination: *build_path
-simulator:
-  path: [*tools_root, 'common\bin\CSpyBat.exe']
-  pre_support:
-    - --silent
-    - [*tools_root, 'sh\bin\shproc.dll']
-    - [*tools_root, 'sh\bin\shsim.dll']
-  post_support:
-    - --plugin
-    - [*tools_root, 'sh\bin\shbat.dll']
-    - --backend
-    - -B
-    - --core sh2afpu
-    - -p
-    - [*tools_root, 'sh\config\debugger\io7264.ddf']
-    - -d
-    - sim
-colour: true
-:unity:
-  :plugins: []
+tools_root: &tools_root 'C:\Program Files\IAR Systems\Embedded Workbench 6.0\'
+compiler:
+  path:             [*tools_root, 'sh\bin\iccsh.exe']
+  source_path:      '..\src\'
+  unit_tests_path:  &unit_tests_path 'tests\'
+  build_path:       &build_path 'build\'
+  options:
+    - -e
+    - --char_is_signed
+    - -Ol
+    - --no_cse
+    - --no_unroll
+    - --no_inline
+    - --no_code_motion
+    - --no_tbaa
+    - --no_scheduling
+    - --no_clustering
+    - --debug
+    - --dlib_config
+    - [*tools_root, 'sh\inc\DLib_Product.h']
+    - --double=32
+    - --code_model=huge
+    - --data_model=huge
+    - --core=sh2afpu
+    - --warnings_affect_exit_code
+    - --warnings_are_errors
+    - --mfc
+    - --use_unix_directory_separators
+    - --diag_suppress=Pe161
+  includes:
+    prefix: '-I'
+    items:
+      - [*tools_root, 'sh\inc\']
+      - [*tools_root, 'sh\inc\c']
+      - 'src\'
+      - '..\src\'
+      - *unit_tests_path
+      - 'vendor\unity\src\'
+  defines:
+    prefix: '-D'
+    items:
+      - UNITY_SUPPORT_64
+      - 'UNITY_SUPPORT_TEST_CASES'
+  object_files:
+    prefix: '-o'
+    extension: '.o'
+    destination: *build_path
+linker:
+  path: [*tools_root, 'sh\bin\ilinksh.exe']
+  options:
+    - --redirect __Printf=__PrintfSmall
+    - --redirect __Scanf=__ScanfSmall
+    - --config
+    - [*tools_root, 'sh\config\generic.icf']
+    - --config_def _CSTACK_SIZE=0x800
+    - --config_def _HEAP_SIZE=0x800
+    - --config_def _INT_TABLE=0x10
+    - --entry __iar_program_start
+    - --debug_lib
+  object_files:
+    path: *build_path
+    extension: '.o'
+  bin_files:
+    prefix: '-o'
+    extension: '.out'
+    destination: *build_path
+simulator:
+  path: [*tools_root, 'common\bin\CSpyBat.exe']
+  pre_support:
+    - --silent
+    - [*tools_root, 'sh\bin\shproc.dll']
+    - [*tools_root, 'sh\bin\shsim.dll']
+  post_support:
+    - --plugin
+    - [*tools_root, 'sh\bin\shbat.dll']
+    - --backend
+    - -B
+    - --core sh2afpu
+    - -p
+    - [*tools_root, 'sh\config\debugger\io7264.ddf']
+    - -d
+    - sim
+colour: true
+:unity:
+  :plugins: []

data/vendor/unity/test/testdata/mocksample.c

@@ -1,51 +1,51 @@
-// This is just a sample test file to be used to test the generator script
-#ifndef TEST_SAMPLE_H
-#define TEST_SAMPLE_H
-
-#include <setjmp.h>
-#include "unity.h"
-#include "funky.h"
-#include "Mockstanky.h"
-
-void setUp(void)
-{
-  CustomSetupStuff();
-}
-
-void tearDown(void)
-{
-  CustomTeardownStuff
-}
-
-//Yup, nice comment
-void test_TheFirstThingToTest(void)
-{
-    TEST_ASSERT(1);
-
-    TEST_ASSERT_TRUE(1);
-}
-
-/*
-void test_ShouldBeIgnored(void)
-{
-    DoesStuff();
-}
-*/
-
-//void test_ShouldAlsoNotBeTested(void)
-//{
-//    Call_An_Expect();
-//    
-//    CallAFunction();
-//    test_CallAFunctionThatLooksLikeATest();
-//}
-
-void test_TheSecondThingToTest(void)
-{
-    Call_An_Expect();
-    
-    CallAFunction();
-    test_CallAFunctionThatLooksLikeATest();
-}
-
-#endif //TEST_SAMPLE_H
+// This is just a sample test file to be used to test the generator script
+#ifndef TEST_SAMPLE_H
+#define TEST_SAMPLE_H
+
+#include <setjmp.h>
+#include "unity.h"
+#include "funky.h"
+#include "Mockstanky.h"
+
+void setUp(void)
+{
+  CustomSetupStuff();
+}
+
+void tearDown(void)
+{
+  CustomTeardownStuff
+}
+
+//Yup, nice comment
+void test_TheFirstThingToTest(void)
+{
+    TEST_ASSERT(1);
+
+    TEST_ASSERT_TRUE(1);
+}
+
+/*
+void test_ShouldBeIgnored(void)
+{
+    DoesStuff();
+}
+*/
+
+//void test_ShouldAlsoNotBeTested(void)
+//{
+//    Call_An_Expect();
+//    
+//    CallAFunction();
+//    test_CallAFunctionThatLooksLikeATest();
+//}
+
+void test_TheSecondThingToTest(void)
+{
+    Call_An_Expect();
+    
+    CallAFunction();
+    test_CallAFunctionThatLooksLikeATest();
+}
+
+#endif //TEST_SAMPLE_H

data/vendor/unity/test/testdata/sample.yml

@@ -1,9 +1,9 @@
-:unity:
-  :includes:
-    - two.h
-    - three.h
-    - <four.h>
-  :plugins:
-    - :cexception
-  :suite_setup: |
+:unity:
+  :includes:
+    - two.h
+    - three.h
+    - <four.h>
+  :plugins:
+    - :cexception
+  :suite_setup: |
     a_yaml_setup();

data/vendor/unity/test/testdata/testsample.c

@@ -1,51 +1,51 @@
-// This is just a sample test file to be used to test the generator script
-#ifndef TEST_SAMPLE_H
-#define TEST_SAMPLE_H
-
-#include <setjmp.h>
-#include "unity.h"
-#include "funky.h"
-#include "stanky.h"
-
-void setUp(void)
-{
-  CustomSetupStuff();
-}
-
-void tearDown(void)
-{
-  CustomTeardownStuff
-}
-
-//Yup, nice comment
-void test_TheFirstThingToTest(void)
-{
-    TEST_ASSERT(1);
-
-    TEST_ASSERT_TRUE(1);
-}
-
-/*
-void test_ShouldBeIgnored(void)
-{
-    DoesStuff();
-}
-*/
-
-//void test_ShouldAlsoNotBeTested(void)
-//{
-//    Call_An_Expect();
-//    
-//    CallAFunction();
-//    test_CallAFunctionThatLooksLikeATest();
-//}
-
-void test_TheSecondThingToTest(void)
-{
-    Call_An_Expect();
-    
-    CallAFunction();
-    test_CallAFunctionThatLooksLikeATest();
-}
-
-#endif //TEST_SAMPLE_H
+// This is just a sample test file to be used to test the generator script
+#ifndef TEST_SAMPLE_H
+#define TEST_SAMPLE_H
+
+#include <setjmp.h>
+#include "unity.h"
+#include "funky.h"
+#include "stanky.h"
+
+void setUp(void)
+{
+  CustomSetupStuff();
+}
+
+void tearDown(void)
+{
+  CustomTeardownStuff
+}
+
+//Yup, nice comment
+void test_TheFirstThingToTest(void)
+{
+    TEST_ASSERT(1);
+
+    TEST_ASSERT_TRUE(1);
+}
+
+/*
+void test_ShouldBeIgnored(void)
+{
+    DoesStuff();
+}
+*/
+
+//void test_ShouldAlsoNotBeTested(void)
+//{
+//    Call_An_Expect();
+//    
+//    CallAFunction();
+//    test_CallAFunctionThatLooksLikeATest();
+//}
+
+void test_TheSecondThingToTest(void)
+{
+    Call_An_Expect();
+    
+    CallAFunction();
+    test_CallAFunctionThatLooksLikeATest();
+}
+
+#endif //TEST_SAMPLE_H

data/vendor/unity/test/tests/test_generate_test_runner.rb

@@ -1,88 +1,102 @@
-# ==========================================
-#   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 '../auto/generate_test_runner.rb'
-
-TEST_FILE = 'testdata/testsample.c'
-TEST_MOCK = 'testdata/mocksample.c'
-OUT_FILE  = 'build/testsample_'
-EXP_FILE  = 'expectdata/testsample_'
-
-$generate_test_runner_failures = 0
-
-def verify_output_equal(subtest)
-  expected = File.read(EXP_FILE + subtest + '.c').gsub(/\r\n/,"\n")
-  actual   = File.read(OUT_FILE + subtest + '.c').gsub(/\r\n/,"\n")
-  if (expected != actual)
-    report("    #{subtest}:FAIL")
-    $generate_test_runner_failures += 1
-  else
-    report("    #{subtest}:PASS")
-  end
-end
-
-should "GenerateARunnerByCreatingRunnerWithOptions" do
-  sets = { 'def'  => nil,
-           'new1' => { :plugins => [:cexception], :includes => ['one.h', 'two.h'], :enforce_strict_ordering => true },
-           'new2' => { :plugins => [:ignore], :suite_setup => "a_custom_setup();", :suite_teardown => "a_custom_teardown();" }
-  }
-
-  sets.each_pair do |subtest, options|
-    UnityTestRunnerGenerator.new(options).run(TEST_FILE, OUT_FILE + subtest + '.c')
-    verify_output_equal(subtest)
-    UnityTestRunnerGenerator.new(options).run(TEST_MOCK, OUT_FILE + 'mock_' + subtest + '.c')
-    verify_output_equal('mock_' + subtest)
-  end
-end
-
-should "GenerateARunnerByRunningRunnerWithOptions" do
-  sets = { 'run1' => { :plugins => [:cexception], :includes => ['one.h', 'two.h'], :enforce_strict_ordering => true },
-           'run2' => { :plugins => [:ignore], :suite_setup => "a_custom_setup();", :suite_teardown => "a_custom_teardown();" }
-  }
-
-  sets.each_pair do |subtest, options|
-    UnityTestRunnerGenerator.new.run(TEST_FILE, OUT_FILE + subtest + '.c', options)
-    verify_output_equal(subtest)
-    UnityTestRunnerGenerator.new.run(TEST_MOCK, OUT_FILE + 'mock_' + subtest + '.c', options)
-    verify_output_equal('mock_' + subtest)
-  end
-end
-
-should "GenerateARunnerByPullingYamlOptions" do
-  subtest = 'yaml'
-  cmdstr = "ruby ../auto/generate_test_runner.rb testdata/sample.yml \"#{TEST_FILE}\" \"#{OUT_FILE + subtest + '.c'}\""
-  `#{cmdstr}`
-  verify_output_equal(subtest)
-
-  cmdstr = "ruby ../auto/generate_test_runner.rb testdata/sample.yml \"#{TEST_MOCK}\" \"#{OUT_FILE + 'mock_' + subtest + '.c'}\""
-  `#{cmdstr}`
-  verify_output_equal('mock_' + subtest)
-end
-
-should "GenerateARunnerByPullingCommandlineOptions" do
-  subtest = 'cmd'
-  cmdstr = "ruby ../auto/generate_test_runner.rb -cexception \"#{TEST_FILE}\" \"#{OUT_FILE + subtest + '.c'}\""
-  `#{cmdstr}`
-  verify_output_equal(subtest)
-
-  cmdstr = "ruby ../auto/generate_test_runner.rb -cexception \"#{TEST_MOCK}\" \"#{OUT_FILE + 'mock_' + subtest + '.c'}\""
-  `#{cmdstr}`
-  verify_output_equal('mock_' + subtest)
-end
-
-should "GenerateARunnerThatUsesParameterizedTests" do
-  sets = { 'param'  => { :plugins => [:ignore], :use_param_tests => true }
-  }
-
-  sets.each_pair do |subtest, options|
-    UnityTestRunnerGenerator.new(options).run(TEST_FILE, OUT_FILE + subtest + '.c')
-    verify_output_equal(subtest)
-    UnityTestRunnerGenerator.new(options).run(TEST_MOCK, OUT_FILE + 'mock_' + subtest + '.c')
-    verify_output_equal('mock_' + subtest)
-  end
-end
-
-raise "There were #{$generate_test_runner_failures.to_s} failures while testing generate_test_runner.rb" if ($generate_test_runner_failures > 0)
+# ==========================================
+#   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 '../auto/generate_test_runner.rb'
+
+TEST_FILE = 'testdata/testsample.c'
+TEST_MOCK = 'testdata/mocksample.c'
+OUT_FILE  = 'build/testsample_'
+EXP_FILE  = 'expectdata/testsample_'
+
+$generate_test_runner_failures = 0
+
+def verify_output_equal(subtest)
+  expected = File.read(EXP_FILE + subtest + '.c').gsub(/\r\n/,"\n")
+  actual   = File.read(OUT_FILE + subtest + '.c').gsub(/\r\n/,"\n")
+  if (expected != actual)
+    report("    #{subtest}:FAIL")
+    $generate_test_runner_failures += 1
+  else
+    report("    #{subtest}:PASS")
+  end
+end
+
+should "GenerateARunnerByCreatingRunnerWithOptions" do
+  sets = { 'def'  => nil,
+           'new1' => { :plugins => [:cexception], :includes => ['one.h', 'two.h'], :enforce_strict_ordering => true },
+           'new2' => { :plugins => [:ignore], :suite_setup => "a_custom_setup();", :suite_teardown => "a_custom_teardown();" }
+  }
+
+  sets.each_pair do |subtest, options|
+    UnityTestRunnerGenerator.new(options).run(TEST_FILE, OUT_FILE + subtest + '.c')
+    verify_output_equal(subtest)
+    UnityTestRunnerGenerator.new(options).run(TEST_MOCK, OUT_FILE + 'mock_' + subtest + '.c')
+    verify_output_equal('mock_' + subtest)
+  end
+end
+
+should "GenerateARunnerAlongWithAHeaderIfSpecified" do
+  sets = { 'head1' => { :header_file => "#{OUT_FILE}head1.h" } }
+  sets.each_pair do |subtest, options|
+    UnityTestRunnerGenerator.new(options).run(TEST_FILE, OUT_FILE + subtest + '.c')
+    verify_output_equal(subtest)
+  end
+
+  sets = { 'head1' => { :header_file => "#{OUT_FILE}mock_head1.h" } }
+  sets.each_pair do |subtest, options|
+    UnityTestRunnerGenerator.new(options).run(TEST_MOCK, OUT_FILE + 'mock_' + subtest + '.c')
+    verify_output_equal('mock_' + subtest)
+  end
+end
+
+should "GenerateARunnerByRunningRunnerWithOptions" do
+  sets = { 'run1' => { :plugins => [:cexception], :includes => ['one.h', 'two.h'], :enforce_strict_ordering => true },
+           'run2' => { :plugins => [:ignore], :suite_setup => "a_custom_setup();", :suite_teardown => "a_custom_teardown();" }
+  }
+
+  sets.each_pair do |subtest, options|
+    UnityTestRunnerGenerator.new.run(TEST_FILE, OUT_FILE + subtest + '.c', options)
+    verify_output_equal(subtest)
+    UnityTestRunnerGenerator.new.run(TEST_MOCK, OUT_FILE + 'mock_' + subtest + '.c', options)
+    verify_output_equal('mock_' + subtest)
+  end
+end
+
+should "GenerateARunnerByPullingYamlOptions" do
+  subtest = 'yaml'
+  cmdstr = "ruby ../auto/generate_test_runner.rb testdata/sample.yml \"#{TEST_FILE}\" \"#{OUT_FILE + subtest + '.c'}\""
+  `#{cmdstr}`
+  verify_output_equal(subtest)
+
+  cmdstr = "ruby ../auto/generate_test_runner.rb testdata/sample.yml \"#{TEST_MOCK}\" \"#{OUT_FILE + 'mock_' + subtest + '.c'}\""
+  `#{cmdstr}`
+  verify_output_equal('mock_' + subtest)
+end
+
+should "GenerateARunnerByPullingCommandlineOptions" do
+  subtest = 'cmd'
+  cmdstr = "ruby ../auto/generate_test_runner.rb -cexception \"#{TEST_FILE}\" \"#{OUT_FILE + subtest + '.c'}\""
+  `#{cmdstr}`
+  verify_output_equal(subtest)
+
+  cmdstr = "ruby ../auto/generate_test_runner.rb -cexception \"#{TEST_MOCK}\" \"#{OUT_FILE + 'mock_' + subtest + '.c'}\""
+  `#{cmdstr}`
+  verify_output_equal('mock_' + subtest)
+end
+
+should "GenerateARunnerThatUsesParameterizedTests" do
+  sets = { 'param'  => { :plugins => [:ignore], :use_param_tests => true }
+  }
+
+  sets.each_pair do |subtest, options|
+    UnityTestRunnerGenerator.new(options).run(TEST_FILE, OUT_FILE + subtest + '.c')
+    verify_output_equal(subtest)
+    UnityTestRunnerGenerator.new(options).run(TEST_MOCK, OUT_FILE + 'mock_' + subtest + '.c')
+    verify_output_equal('mock_' + subtest)
+  end
+end
+
+raise "There were #{$generate_test_runner_failures.to_s} failures while testing generate_test_runner.rb" if ($generate_test_runner_failures > 0)