From 30fcb613375cfa271676eedba58eecfda9686a26 Mon Sep 17 00:00:00 2001
From: Peter Thedens <pthedens@iastate.edu>
Date: Wed, 8 Nov 2017 15:47:23 -0600
Subject: [PATCH] remove extra files from unity folder

---
 Unity/extras/eclipse/error_parsers.txt        |   26 -
 Unity/extras/fixture/rakefile.rb              |   48 -
 Unity/extras/fixture/rakefile_helper.rb       |  178 -
 Unity/extras/fixture/readme.txt               |    9 -
 Unity/extras/fixture/src/unity_fixture.c      |  432 --
 Unity/extras/fixture/src/unity_fixture.h      |   83 -
 .../fixture/src/unity_fixture_internals.h     |   51 -
 .../src/unity_fixture_malloc_overrides.h      |   47 -
 Unity/extras/fixture/test/Makefile            |   75 -
 Unity/extras/fixture/test/main/AllTests.c     |   22 -
 .../fixture/test/template_fixture_tests.c     |   39 -
 .../extras/fixture/test/unity_fixture_Test.c  |  543 --
 .../fixture/test/unity_fixture_TestRunner.c   |   57 -
 Unity/extras/fixture/test/unity_output_Spy.c  |   57 -
 Unity/extras/fixture/test/unity_output_Spy.h  |   17 -
 Unity/test/.rubocop.yml                       |   58 -
 Unity/test/Makefile                           |   64 -
 Unity/test/expectdata/testsample_cmd.c        |   61 -
 Unity/test/expectdata/testsample_def.c        |   57 -
 Unity/test/expectdata/testsample_head1.c      |   55 -
 Unity/test/expectdata/testsample_head1.h      |   15 -
 Unity/test/expectdata/testsample_mock_cmd.c   |   80 -
 Unity/test/expectdata/testsample_mock_def.c   |   76 -
 Unity/test/expectdata/testsample_mock_head1.c |   75 -
 Unity/test/expectdata/testsample_mock_head1.h |   13 -
 Unity/test/expectdata/testsample_mock_new1.c  |   89 -
 Unity/test/expectdata/testsample_mock_new2.c  |   89 -
 Unity/test/expectdata/testsample_mock_param.c |   77 -
 Unity/test/expectdata/testsample_mock_run1.c  |   89 -
 Unity/test/expectdata/testsample_mock_run2.c  |   89 -
 Unity/test/expectdata/testsample_mock_yaml.c  |   90 -
 Unity/test/expectdata/testsample_new1.c       |   67 -
 Unity/test/expectdata/testsample_new2.c       |   70 -
 Unity/test/expectdata/testsample_param.c      |   58 -
 Unity/test/expectdata/testsample_run1.c       |   67 -
 Unity/test/expectdata/testsample_run2.c       |   70 -
 Unity/test/expectdata/testsample_yaml.c       |   71 -
 Unity/test/rakefile                           |  125 -
 Unity/test/rakefile_helper.rb                 |  260 -
 .../generate_module_existing_file_spec.rb     |  158 -
 Unity/test/targets/clang_file.yml             |   78 -
 Unity/test/targets/clang_strict.yml           |   78 -
 Unity/test/targets/gcc_32.yml                 |   49 -
 Unity/test/targets/gcc_64.yml                 |   50 -
 Unity/test/targets/gcc_auto_limits.yml        |   47 -
 Unity/test/targets/gcc_auto_stdint.yml        |   59 -
 Unity/test/targets/gcc_manual_math.yml        |   47 -
 Unity/test/targets/hitech_picc18.yml          |  101 -
 Unity/test/targets/iar_arm_v4.yml             |   90 -
 Unity/test/targets/iar_arm_v5.yml             |   80 -
 Unity/test/targets/iar_arm_v5_3.yml           |   80 -
 .../targets/iar_armcortex_LM3S9B92_v5_4.yml   |   94 -
 Unity/test/targets/iar_cortexm3_v5.yml        |   84 -
 Unity/test/targets/iar_msp430.yml             |   95 -
 Unity/test/targets/iar_sh2a_v6.yml            |   86 -
 Unity/test/testdata/CException.h              |   11 -
 Unity/test/testdata/Defs.h                    |    8 -
 Unity/test/testdata/cmock.h                   |   14 -
 Unity/test/testdata/mockMock.h                |   13 -
 Unity/test/testdata/testRunnerGenerator.c     |  183 -
 .../test/testdata/testRunnerGeneratorSmall.c  |   67 -
 .../testdata/testRunnerGeneratorWithMocks.c   |  192 -
 Unity/test/tests/test_generate_test_runner.rb | 1252 ----
 Unity/test/tests/testparameterized.c          |  110 -
 Unity/test/tests/testunity.c                  | 5337 -----------------
 65 files changed, 12012 deletions(-)
 delete mode 100755 Unity/extras/eclipse/error_parsers.txt
 delete mode 100755 Unity/extras/fixture/rakefile.rb
 delete mode 100755 Unity/extras/fixture/rakefile_helper.rb
 delete mode 100755 Unity/extras/fixture/readme.txt
 delete mode 100755 Unity/extras/fixture/src/unity_fixture.c
 delete mode 100755 Unity/extras/fixture/src/unity_fixture.h
 delete mode 100755 Unity/extras/fixture/src/unity_fixture_internals.h
 delete mode 100755 Unity/extras/fixture/src/unity_fixture_malloc_overrides.h
 delete mode 100755 Unity/extras/fixture/test/Makefile
 delete mode 100755 Unity/extras/fixture/test/main/AllTests.c
 delete mode 100755 Unity/extras/fixture/test/template_fixture_tests.c
 delete mode 100755 Unity/extras/fixture/test/unity_fixture_Test.c
 delete mode 100755 Unity/extras/fixture/test/unity_fixture_TestRunner.c
 delete mode 100755 Unity/extras/fixture/test/unity_output_Spy.c
 delete mode 100755 Unity/extras/fixture/test/unity_output_Spy.h
 delete mode 100755 Unity/test/.rubocop.yml
 delete mode 100755 Unity/test/Makefile
 delete mode 100755 Unity/test/expectdata/testsample_cmd.c
 delete mode 100755 Unity/test/expectdata/testsample_def.c
 delete mode 100755 Unity/test/expectdata/testsample_head1.c
 delete mode 100755 Unity/test/expectdata/testsample_head1.h
 delete mode 100755 Unity/test/expectdata/testsample_mock_cmd.c
 delete mode 100755 Unity/test/expectdata/testsample_mock_def.c
 delete mode 100755 Unity/test/expectdata/testsample_mock_head1.c
 delete mode 100755 Unity/test/expectdata/testsample_mock_head1.h
 delete mode 100755 Unity/test/expectdata/testsample_mock_new1.c
 delete mode 100755 Unity/test/expectdata/testsample_mock_new2.c
 delete mode 100755 Unity/test/expectdata/testsample_mock_param.c
 delete mode 100755 Unity/test/expectdata/testsample_mock_run1.c
 delete mode 100755 Unity/test/expectdata/testsample_mock_run2.c
 delete mode 100755 Unity/test/expectdata/testsample_mock_yaml.c
 delete mode 100755 Unity/test/expectdata/testsample_new1.c
 delete mode 100755 Unity/test/expectdata/testsample_new2.c
 delete mode 100755 Unity/test/expectdata/testsample_param.c
 delete mode 100755 Unity/test/expectdata/testsample_run1.c
 delete mode 100755 Unity/test/expectdata/testsample_run2.c
 delete mode 100755 Unity/test/expectdata/testsample_yaml.c
 delete mode 100755 Unity/test/rakefile
 delete mode 100755 Unity/test/rakefile_helper.rb
 delete mode 100755 Unity/test/spec/generate_module_existing_file_spec.rb
 delete mode 100755 Unity/test/targets/clang_file.yml
 delete mode 100755 Unity/test/targets/clang_strict.yml
 delete mode 100755 Unity/test/targets/gcc_32.yml
 delete mode 100755 Unity/test/targets/gcc_64.yml
 delete mode 100755 Unity/test/targets/gcc_auto_limits.yml
 delete mode 100755 Unity/test/targets/gcc_auto_stdint.yml
 delete mode 100755 Unity/test/targets/gcc_manual_math.yml
 delete mode 100755 Unity/test/targets/hitech_picc18.yml
 delete mode 100755 Unity/test/targets/iar_arm_v4.yml
 delete mode 100755 Unity/test/targets/iar_arm_v5.yml
 delete mode 100755 Unity/test/targets/iar_arm_v5_3.yml
 delete mode 100755 Unity/test/targets/iar_armcortex_LM3S9B92_v5_4.yml
 delete mode 100755 Unity/test/targets/iar_cortexm3_v5.yml
 delete mode 100755 Unity/test/targets/iar_msp430.yml
 delete mode 100755 Unity/test/targets/iar_sh2a_v6.yml
 delete mode 100755 Unity/test/testdata/CException.h
 delete mode 100755 Unity/test/testdata/Defs.h
 delete mode 100755 Unity/test/testdata/cmock.h
 delete mode 100755 Unity/test/testdata/mockMock.h
 delete mode 100755 Unity/test/testdata/testRunnerGenerator.c
 delete mode 100755 Unity/test/testdata/testRunnerGeneratorSmall.c
 delete mode 100755 Unity/test/testdata/testRunnerGeneratorWithMocks.c
 delete mode 100755 Unity/test/tests/test_generate_test_runner.rb
 delete mode 100755 Unity/test/tests/testparameterized.c
 delete mode 100755 Unity/test/tests/testunity.c

diff --git a/Unity/extras/eclipse/error_parsers.txt b/Unity/extras/eclipse/error_parsers.txt
deleted file mode 100755
index 94e34ff38..000000000
--- a/Unity/extras/eclipse/error_parsers.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Eclipse error parsers
-=====================
-
-These are a godsend for extracting  & quickly navigating to
-warnings & error messages from console output. Unforunately
-I don't know how to write an Eclipse plugin so you'll have
-to add them manually.
-
-To add a console parser to Eclipse, go to Window --> Preferences
---> C/C++ --> Build --> Settings. Click on the 'Error Parsers'
-tab and then click the 'Add...' button. See the table below for
-the parser fields to add.
-
-Eclipse will only parse the console output during a build, so
-running your unit tests must be part of your build process.
-Either add this to your make/rakefile, or add it as a post-
-build step in your Eclipse project settings.
-
-
-Unity unit test error parsers
------------------------------
-Severity    Pattern                                 File    Line    Description
--------------------------------------------------------------------------------
-Error       (\.+)(.*?):(\d+):(.*?):FAIL: (.*)       $2      $3      $5
-Warning     (\.+)(.*?):(\d+):(.*?):IGNORE: (.*)     $2      $3      $5
-Warning     (\.+)(.*?):(\d+):(.*?):IGNORE\s*$       $2      $3      Ignored test
diff --git a/Unity/extras/fixture/rakefile.rb b/Unity/extras/fixture/rakefile.rb
deleted file mode 100755
index 7603e5745..000000000
--- a/Unity/extras/fixture/rakefile.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# ==========================================
-#   Unity Project - A Test Framework for C
-#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
-#   [Released under MIT License. Please refer to license.txt for details]
-# ==========================================
-
-HERE = File.expand_path(File.dirname(__FILE__)) + '/'
-
-require 'rake'
-require 'rake/clean'
-require 'rake/testtask'
-require HERE + 'rakefile_helper'
-
-TEMP_DIRS = [
-  File.join(HERE, 'build')
-].freeze
-
-TEMP_DIRS.each do |dir|
-  directory(dir)
-  CLOBBER.include(dir)
-end
-
-task prepare_for_tests: TEMP_DIRS
-
-include RakefileHelpers
-
-# Load default configuration, for now
-DEFAULT_CONFIG_FILE = 'gcc_auto_stdint.yml'.freeze
-configure_toolchain(DEFAULT_CONFIG_FILE)
-
-task unit: [:prepare_for_tests] do
-  run_tests
-end
-
-desc 'Build and test Unity Framework'
-task all: %i(clean unit)
-task default: %i(clobber all)
-task ci: %i(no_color default)
-task cruise: %i(no_color default)
-
-desc 'Load configuration'
-task :config, :config_file do |_t, args|
-  configure_toolchain(args[:config_file])
-end
-
-task :no_color do
-  $colour_output = false
-end
diff --git a/Unity/extras/fixture/rakefile_helper.rb b/Unity/extras/fixture/rakefile_helper.rb
deleted file mode 100755
index c45b2393d..000000000
--- a/Unity/extras/fixture/rakefile_helper.rb
+++ /dev/null
@@ -1,178 +0,0 @@
-# ==========================================
-#   Unity Project - A Test Framework for C
-#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
-#   [Released under MIT License. Please refer to license.txt for details]
-# ==========================================
-
-require 'yaml'
-require 'fileutils'
-require HERE + '../../auto/unity_test_summary'
-require HERE + '../../auto/generate_test_runner'
-require HERE + '../../auto/colour_reporter'
-
-module RakefileHelpers
-  C_EXTENSION = '.c'.freeze
-
-  def load_configuration(config_file)
-    return if $configured
-
-    $cfg_file = HERE + "../../test/targets/#{config_file}" unless config_file =~ /[\\|\/]/
-    $cfg = YAML.load(File.read($cfg_file))
-    $colour_output = false unless $cfg['colour']
-    $configured = true if config_file != DEFAULT_CONFIG_FILE
-  end
-
-  def configure_clean
-    CLEAN.include($cfg['compiler']['build_path'] + '*.*') unless $cfg['compiler']['build_path'].nil?
-  end
-
-  def configure_toolchain(config_file = DEFAULT_CONFIG_FILE)
-    config_file += '.yml' unless config_file =~ /\.yml$/
-    config_file = config_file unless config_file =~ /[\\|\/]/
-    load_configuration(config_file)
-    configure_clean
-  end
-
-  def tackit(strings)
-    result = if strings.is_a?(Array)
-               "\"#{strings.join}\""
-             else
-               strings
-             end
-    result
-  end
-
-  def squash(prefix, items)
-    result = ''
-    items.each { |item| result += " #{prefix}#{tackit(item)}" }
-    result
-  end
-
-  def build_compiler_fields
-    command = tackit($cfg['compiler']['path'])
-    defines = if $cfg['compiler']['defines']['items'].nil?
-                ''
-              else
-                squash($cfg['compiler']['defines']['prefix'], $cfg['compiler']['defines']['items'] + ['UNITY_OUTPUT_CHAR=UnityOutputCharSpy_OutputChar'] + ['UNITY_OUTPUT_CHAR_HEADER_DECLARATION=UnityOutputCharSpy_OutputChar\(int\)'])
-              end
-    options  = squash('', $cfg['compiler']['options'])
-    includes = squash($cfg['compiler']['includes']['prefix'], $cfg['compiler']['includes']['items'])
-    includes = includes.gsub(/\\ /, ' ').gsub(/\\\"/, '"').gsub(/\\$/, '') # Remove trailing slashes (for IAR)
-
-    { command: command, defines: defines, options: options, includes: includes }
-  end
-
-  def compile(file, _defines = [])
-    compiler = build_compiler_fields
-    unity_include = $cfg['compiler']['includes']['prefix'] + '../../src'
-    cmd_str = "#{compiler[:command]}#{compiler[:defines]}#{compiler[:options]}#{compiler[:includes]} #{unity_include} #{file} " \
-              "#{$cfg['compiler']['object_files']['prefix']}#{$cfg['compiler']['object_files']['destination']}" \
-              "#{File.basename(file, C_EXTENSION)}#{$cfg['compiler']['object_files']['extension']}"
-
-    execute(cmd_str)
-  end
-
-  def build_linker_fields
-    command = tackit($cfg['linker']['path'])
-    options = if $cfg['linker']['options'].nil?
-                ''
-              else
-                squash('', $cfg['linker']['options'])
-              end
-    includes = if $cfg['linker']['includes'].nil? || $cfg['linker']['includes']['items'].nil?
-                 ''
-               else
-                 squash($cfg['linker']['includes']['prefix'], $cfg['linker']['includes']['items'])
-               end.gsub(/\\ /, ' ').gsub(/\\\"/, '"').gsub(/\\$/, '') # Remove trailing slashes (for IAR)
-
-    { command: command, options: options, includes: includes }
-  end
-
-  def link_it(exe_name, obj_list)
-    linker = build_linker_fields
-    cmd_str = "#{linker[:command]}#{linker[:options]}#{linker[:includes]} " +
-              (obj_list.map { |obj| "#{$cfg['linker']['object_files']['path']}#{obj} " }).join +
-              $cfg['linker']['bin_files']['prefix'] + ' ' +
-              $cfg['linker']['bin_files']['destination'] +
-              exe_name + $cfg['linker']['bin_files']['extension']
-    execute(cmd_str)
-  end
-
-  def build_simulator_fields
-    return nil if $cfg['simulator'].nil?
-    command = if $cfg['simulator']['path'].nil?
-                ''
-              else
-                (tackit($cfg['simulator']['path']) + ' ')
-              end
-    pre_support = if $cfg['simulator']['pre_support'].nil?
-                    ''
-                  else
-                    squash('', $cfg['simulator']['pre_support'])
-                  end
-    post_support = if $cfg['simulator']['post_support'].nil?
-                     ''
-                   else
-                     squash('', $cfg['simulator']['post_support'])
-                   end
-    { command: command, pre_support: pre_support, post_support: post_support }
-  end
-
-  def execute(command_string, verbose = true)
-    report command_string
-    output = `#{command_string}`.chomp
-    report(output) if verbose && !output.nil? && !output.empty?
-    raise "Command failed. (Returned #{$?.exitstatus})" if $?.exitstatus != 0
-    output
-  end
-
-  def report_summary
-    summary = UnityTestSummary.new
-    summary.root = HERE
-    results_glob = "#{$cfg['compiler']['build_path']}*.test*"
-    results_glob.tr!('\\', '/')
-    results = Dir[results_glob]
-    summary.targets = results
-    summary.run
-  end
-
-  def run_tests
-    report 'Running Unity system tests...'
-
-    # Tack on TEST define for compiling unit tests
-    load_configuration($cfg_file)
-    test_defines = ['TEST']
-    $cfg['compiler']['defines']['items'] = [] if $cfg['compiler']['defines']['items'].nil?
-
-    # Get a list of all source files needed
-    src_files  = Dir[HERE + 'src/*.c']
-    src_files += Dir[HERE + 'test/*.c']
-    src_files += Dir[HERE + 'test/main/*.c']
-    src_files << '../../src/unity.c'
-
-    # Build object files
-    src_files.each { |f| compile(f, test_defines) }
-    obj_list = src_files.map { |f| File.basename(f.ext($cfg['compiler']['object_files']['extension'])) }
-
-    # Link the test executable
-    test_base = 'framework_test'
-    link_it(test_base, obj_list)
-
-    # Execute unit test and generate results file
-    simulator = build_simulator_fields
-    executable = $cfg['linker']['bin_files']['destination'] + test_base + $cfg['linker']['bin_files']['extension']
-    cmd_str = if simulator.nil?
-                executable + ' -v -r'
-              else
-                "#{simulator[:command]} #{simulator[:pre_support]} #{executable} #{simulator[:post_support]}"
-              end
-    output = execute(cmd_str)
-    test_results = $cfg['compiler']['build_path'] + test_base
-    test_results += if output.match(/OK$/m).nil?
-                      '.testfail'
-                    else
-                      '.testpass'
-                    end
-    File.open(test_results, 'w') { |f| f.print output }
-  end
-end
diff --git a/Unity/extras/fixture/readme.txt b/Unity/extras/fixture/readme.txt
deleted file mode 100755
index 6b9a78c17..000000000
--- a/Unity/extras/fixture/readme.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Copyright (c) 2010 James Grenning and Contributed to Unity Project
-
-Unity Project - A Test Framework for C
-Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
-[Released under MIT License. Please refer to license.txt for details]
-
-This Framework is an optional add-on to Unity.  By including unity_framework.h in place of unity.h,
-you may now work with Unity in a manner similar to CppUTest.  This framework adds the concepts of 
-test groups and gives finer control of your tests over the command line.
\ No newline at end of file
diff --git a/Unity/extras/fixture/src/unity_fixture.c b/Unity/extras/fixture/src/unity_fixture.c
deleted file mode 100755
index 3872bd8ff..000000000
--- a/Unity/extras/fixture/src/unity_fixture.c
+++ /dev/null
@@ -1,432 +0,0 @@
-/* Copyright (c) 2010 James Grenning and Contributed to Unity Project
- * ==========================================
- *  Unity Project - A Test Framework for C
- *  Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
- *  [Released under MIT License. Please refer to license.txt for details]
- * ========================================== */
-
-#include "unity_fixture.h"
-#include "unity_internals.h"
-#include <string.h>
-
-struct UNITY_FIXTURE_T UnityFixture;
-
-/* If you decide to use the function pointer approach.
- * Build with -D UNITY_OUTPUT_CHAR=outputChar and include <stdio.h>
- * int (*outputChar)(int) = putchar; */
-
-#if !defined(UNITY_WEAK_ATTRIBUTE) && !defined(UNITY_WEAK_PRAGMA)
-void setUp(void)    { /*does nothing*/ }
-void tearDown(void) { /*does nothing*/ }
-#endif
-
-static void announceTestRun(unsigned int runNumber)
-{
-    UnityPrint("Unity test run ");
-    UnityPrintNumberUnsigned(runNumber+1);
-    UnityPrint(" of ");
-    UnityPrintNumberUnsigned(UnityFixture.RepeatCount);
-    UNITY_PRINT_EOL();
-}
-
-int UnityMain(int argc, const char* argv[], void (*runAllTests)(void))
-{
-    int result = UnityGetCommandLineOptions(argc, argv);
-    unsigned int r;
-    if (result != 0)
-        return result;
-
-    for (r = 0; r < UnityFixture.RepeatCount; r++)
-    {
-        UnityBegin(argv[0]);
-        announceTestRun(r);
-        runAllTests();
-        if (!UnityFixture.Verbose) UNITY_PRINT_EOL();
-        UnityEnd();
-    }
-
-    return (int)Unity.TestFailures;
-}
-
-static int selected(const char* filter, const char* name)
-{
-    if (filter == 0)
-        return 1;
-    return strstr(name, filter) ? 1 : 0;
-}
-
-static int testSelected(const char* test)
-{
-    return selected(UnityFixture.NameFilter, test);
-}
-
-static int groupSelected(const char* group)
-{
-    return selected(UnityFixture.GroupFilter, group);
-}
-
-void UnityTestRunner(unityfunction* setup,
-                     unityfunction* testBody,
-                     unityfunction* teardown,
-                     const char* printableName,
-                     const char* group,
-                     const char* name,
-                     const char* file,
-                     unsigned int line)
-{
-    if (testSelected(name) && groupSelected(group))
-    {
-        Unity.TestFile = file;
-        Unity.CurrentTestName = printableName;
-        Unity.CurrentTestLineNumber = line;
-        if (!UnityFixture.Verbose)
-            UNITY_OUTPUT_CHAR('.');
-        else
-        {
-            UnityPrint(printableName);
-        #ifndef UNITY_REPEAT_TEST_NAME
-            Unity.CurrentTestName = NULL;
-        #endif
-        }
-
-        Unity.NumberOfTests++;
-        UnityMalloc_StartTest();
-        UnityPointer_Init();
-
-        if (TEST_PROTECT())
-        {
-            setup();
-            testBody();
-        }
-        if (TEST_PROTECT())
-        {
-            teardown();
-        }
-        if (TEST_PROTECT())
-        {
-            UnityPointer_UndoAllSets();
-            if (!Unity.CurrentTestFailed)
-                UnityMalloc_EndTest();
-        }
-        UnityConcludeFixtureTest();
-    }
-}
-
-void UnityIgnoreTest(const char* printableName, const char* group, const char* name)
-{
-    if (testSelected(name) && groupSelected(group))
-    {
-        Unity.NumberOfTests++;
-        Unity.TestIgnores++;
-        if (!UnityFixture.Verbose)
-            UNITY_OUTPUT_CHAR('!');
-        else
-        {
-            UnityPrint(printableName);
-            UNITY_PRINT_EOL();
-        }
-    }
-}
-
-
-/*------------------------------------------------- */
-/* Malloc and free stuff */
-#define MALLOC_DONT_FAIL -1
-static int malloc_count;
-static int malloc_fail_countdown = MALLOC_DONT_FAIL;
-
-void UnityMalloc_StartTest(void)
-{
-    malloc_count = 0;
-    malloc_fail_countdown = MALLOC_DONT_FAIL;
-}
-
-void UnityMalloc_EndTest(void)
-{
-    malloc_fail_countdown = MALLOC_DONT_FAIL;
-    if (malloc_count != 0)
-    {
-        UNITY_TEST_FAIL(Unity.CurrentTestLineNumber, "This test leaks!");
-    }
-}
-
-void UnityMalloc_MakeMallocFailAfterCount(int countdown)
-{
-    malloc_fail_countdown = countdown;
-}
-
-/* These definitions are always included from unity_fixture_malloc_overrides.h */
-/* We undef to use them or avoid conflict with <stdlib.h> per the C standard */
-#undef malloc
-#undef free
-#undef calloc
-#undef realloc
-
-#ifdef UNITY_EXCLUDE_STDLIB_MALLOC
-static unsigned char unity_heap[UNITY_INTERNAL_HEAP_SIZE_BYTES];
-static size_t heap_index;
-#else
-#include <stdlib.h>
-#endif
-
-typedef struct GuardBytes
-{
-    size_t size;
-    size_t guard_space;
-} Guard;
-
-
-static const char end[] = "END";
-
-void* unity_malloc(size_t size)
-{
-    char* mem;
-    Guard* guard;
-    size_t total_size = size + sizeof(Guard) + sizeof(end);
-
-    if (malloc_fail_countdown != MALLOC_DONT_FAIL)
-    {
-        if (malloc_fail_countdown == 0)
-            return NULL;
-        malloc_fail_countdown--;
-    }
-
-    if (size == 0) return NULL;
-#ifdef UNITY_EXCLUDE_STDLIB_MALLOC
-    if (heap_index + total_size > UNITY_INTERNAL_HEAP_SIZE_BYTES)
-    {
-        guard = NULL;
-    }
-    else
-    {
-        guard = (Guard*)&unity_heap[heap_index];
-        heap_index += total_size;
-    }
-#else
-    guard = (Guard*)UNITY_FIXTURE_MALLOC(total_size);
-#endif
-    if (guard == NULL) return NULL;
-    malloc_count++;
-    guard->size = size;
-    guard->guard_space = 0;
-    mem = (char*)&(guard[1]);
-    memcpy(&mem[size], end, sizeof(end));
-
-    return (void*)mem;
-}
-
-static int isOverrun(void* mem)
-{
-    Guard* guard = (Guard*)mem;
-    char* memAsChar = (char*)mem;
-    guard--;
-
-    return guard->guard_space != 0 || strcmp(&memAsChar[guard->size], end) != 0;
-}
-
-static void release_memory(void* mem)
-{
-    Guard* guard = (Guard*)mem;
-    guard--;
-
-    malloc_count--;
-#ifdef UNITY_EXCLUDE_STDLIB_MALLOC
-    if (mem == unity_heap + heap_index - guard->size - sizeof(end))
-    {
-        heap_index -= (guard->size + sizeof(Guard) + sizeof(end));
-    }
-#else
-    UNITY_FIXTURE_FREE(guard);
-#endif
-}
-
-void unity_free(void* mem)
-{
-    int overrun;
-
-    if (mem == NULL)
-    {
-        return;
-    }
-
-    overrun = isOverrun(mem);
-    release_memory(mem);
-    if (overrun)
-    {
-        UNITY_TEST_FAIL(Unity.CurrentTestLineNumber, "Buffer overrun detected during free()");
-    }
-}
-
-void* unity_calloc(size_t num, size_t size)
-{
-    void* mem = unity_malloc(num * size);
-    if (mem == NULL) return NULL;
-    memset(mem, 0, num * size);
-    return mem;
-}
-
-void* unity_realloc(void* oldMem, size_t size)
-{
-    Guard* guard = (Guard*)oldMem;
-    void* newMem;
-
-    if (oldMem == NULL) return unity_malloc(size);
-
-    guard--;
-    if (isOverrun(oldMem))
-    {
-        release_memory(oldMem);
-        UNITY_TEST_FAIL(Unity.CurrentTestLineNumber, "Buffer overrun detected during realloc()");
-    }
-
-    if (size == 0)
-    {
-        release_memory(oldMem);
-        return NULL;
-    }
-
-    if (guard->size >= size) return oldMem;
-
-#ifdef UNITY_EXCLUDE_STDLIB_MALLOC /* Optimization if memory is expandable */
-    if (oldMem == unity_heap + heap_index - guard->size - sizeof(end) &&
-        heap_index + size - guard->size <= UNITY_INTERNAL_HEAP_SIZE_BYTES)
-    {
-        release_memory(oldMem);    /* Not thread-safe, like unity_heap generally */
-        return unity_malloc(size); /* No memcpy since data is in place */
-    }
-#endif
-    newMem = unity_malloc(size);
-    if (newMem == NULL) return NULL; /* Do not release old memory */
-    memcpy(newMem, oldMem, guard->size);
-    release_memory(oldMem);
-    return newMem;
-}
-
-
-/*-------------------------------------------------------- */
-/*Automatic pointer restoration functions */
-struct PointerPair
-{
-    void** pointer;
-    void* old_value;
-};
-
-static struct PointerPair pointer_store[UNITY_MAX_POINTERS];
-static int pointer_index = 0;
-
-void UnityPointer_Init(void)
-{
-    pointer_index = 0;
-}
-
-void UnityPointer_Set(void** pointer, void* newValue, UNITY_LINE_TYPE line)
-{
-    if (pointer_index >= UNITY_MAX_POINTERS)
-    {
-        UNITY_TEST_FAIL(line, "Too many pointers set");
-    }
-    else
-    {
-        pointer_store[pointer_index].pointer = pointer;
-        pointer_store[pointer_index].old_value = *pointer;
-        *pointer = newValue;
-        pointer_index++;
-    }
-}
-
-void UnityPointer_UndoAllSets(void)
-{
-    while (pointer_index > 0)
-    {
-        pointer_index--;
-        *(pointer_store[pointer_index].pointer) =
-            pointer_store[pointer_index].old_value;
-    }
-}
-
-int UnityGetCommandLineOptions(int argc, const char* argv[])
-{
-    int i;
-    UnityFixture.Verbose = 0;
-    UnityFixture.GroupFilter = 0;
-    UnityFixture.NameFilter = 0;
-    UnityFixture.RepeatCount = 1;
-
-    if (argc == 1)
-        return 0;
-
-    for (i = 1; i < argc; )
-    {
-        if (strcmp(argv[i], "-v") == 0)
-        {
-            UnityFixture.Verbose = 1;
-            i++;
-        }
-        else if (strcmp(argv[i], "-g") == 0)
-        {
-            i++;
-            if (i >= argc)
-                return 1;
-            UnityFixture.GroupFilter = argv[i];
-            i++;
-        }
-        else if (strcmp(argv[i], "-n") == 0)
-        {
-            i++;
-            if (i >= argc)
-                return 1;
-            UnityFixture.NameFilter = argv[i];
-            i++;
-        }
-        else if (strcmp(argv[i], "-r") == 0)
-        {
-            UnityFixture.RepeatCount = 2;
-            i++;
-            if (i < argc)
-            {
-                if (*(argv[i]) >= '0' && *(argv[i]) <= '9')
-                {
-                    unsigned int digit = 0;
-                    UnityFixture.RepeatCount = 0;
-                    while (argv[i][digit] >= '0' && argv[i][digit] <= '9')
-                    {
-                        UnityFixture.RepeatCount *= 10;
-                        UnityFixture.RepeatCount += (unsigned int)argv[i][digit++] - '0';
-                    }
-                    i++;
-                }
-            }
-        }
-        else
-        {
-            /* ignore unknown parameter */
-            i++;
-        }
-    }
-    return 0;
-}
-
-void UnityConcludeFixtureTest(void)
-{
-    if (Unity.CurrentTestIgnored)
-    {
-        Unity.TestIgnores++;
-        UNITY_PRINT_EOL();
-    }
-    else if (!Unity.CurrentTestFailed)
-    {
-        if (UnityFixture.Verbose)
-        {
-            UnityPrint(" PASS");
-            UNITY_PRINT_EOL();
-        }
-    }
-    else /* Unity.CurrentTestFailed */
-    {
-        Unity.TestFailures++;
-        UNITY_PRINT_EOL();
-    }
-
-    Unity.CurrentTestFailed = 0;
-    Unity.CurrentTestIgnored = 0;
-}
diff --git a/Unity/extras/fixture/src/unity_fixture.h b/Unity/extras/fixture/src/unity_fixture.h
deleted file mode 100755
index 6f8d6234b..000000000
--- a/Unity/extras/fixture/src/unity_fixture.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Copyright (c) 2010 James Grenning and Contributed to Unity Project
- * ==========================================
- *  Unity Project - A Test Framework for C
- *  Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
- *  [Released under MIT License. Please refer to license.txt for details]
- * ========================================== */
-
-#ifndef UNITY_FIXTURE_H_
-#define UNITY_FIXTURE_H_
-
-#include "unity.h"
-#include "unity_internals.h"
-#include "unity_fixture_malloc_overrides.h"
-#include "unity_fixture_internals.h"
-
-int UnityMain(int argc, const char* argv[], void (*runAllTests)(void));
-
-
-#define TEST_GROUP(group)\
-    static const char* TEST_GROUP_##group = #group
-
-#define TEST_SETUP(group) void TEST_##group##_SETUP(void);\
-    void TEST_##group##_SETUP(void)
-
-#define TEST_TEAR_DOWN(group) void TEST_##group##_TEAR_DOWN(void);\
-    void TEST_##group##_TEAR_DOWN(void)
-
-
-#define TEST(group, name) \
-    void TEST_##group##_##name##_(void);\
-    void TEST_##group##_##name##_run(void);\
-    void TEST_##group##_##name##_run(void)\
-    {\
-        UnityTestRunner(TEST_##group##_SETUP,\
-            TEST_##group##_##name##_,\
-            TEST_##group##_TEAR_DOWN,\
-            "TEST(" #group ", " #name ")",\
-            TEST_GROUP_##group, #name,\
-            __FILE__, __LINE__);\
-    }\
-    void  TEST_##group##_##name##_(void)
-
-#define IGNORE_TEST(group, name) \
-    void TEST_##group##_##name##_(void);\
-    void TEST_##group##_##name##_run(void);\
-    void TEST_##group##_##name##_run(void)\
-    {\
-        UnityIgnoreTest("IGNORE_TEST(" #group ", " #name ")", TEST_GROUP_##group, #name);\
-    }\
-    void TEST_##group##_##name##_(void)
-
-/* Call this for each test, insider the group runner */
-#define RUN_TEST_CASE(group, name) \
-    { void TEST_##group##_##name##_run(void);\
-      TEST_##group##_##name##_run(); }
-
-/* This goes at the bottom of each test file or in a separate c file */
-#define TEST_GROUP_RUNNER(group)\
-    void TEST_##group##_GROUP_RUNNER(void);\
-    void TEST_##group##_GROUP_RUNNER(void)
-
-/* Call this from main */
-#define RUN_TEST_GROUP(group)\
-    { void TEST_##group##_GROUP_RUNNER(void);\
-      TEST_##group##_GROUP_RUNNER(); }
-
-/* CppUTest Compatibility Macros */
-#ifndef UNITY_EXCLUDE_CPPUTEST_ASSERTS
-/* Sets a pointer and automatically restores it to its old value after teardown */
-#define UT_PTR_SET(ptr, newPointerValue)               UnityPointer_Set((void**)&(ptr), (void*)(newPointerValue), __LINE__)
-#define TEST_ASSERT_POINTERS_EQUAL(expected, actual)   TEST_ASSERT_EQUAL_PTR((expected), (actual))
-#define TEST_ASSERT_BYTES_EQUAL(expected, actual)      TEST_ASSERT_EQUAL_HEX8(0xff & (expected), 0xff & (actual))
-#define FAIL(message)                                  TEST_FAIL_MESSAGE((message))
-#define CHECK(condition)                               TEST_ASSERT_TRUE((condition))
-#define LONGS_EQUAL(expected, actual)                  TEST_ASSERT_EQUAL_INT((expected), (actual))
-#define STRCMP_EQUAL(expected, actual)                 TEST_ASSERT_EQUAL_STRING((expected), (actual))
-#define DOUBLES_EQUAL(expected, actual, delta)         TEST_ASSERT_DOUBLE_WITHIN((delta), (expected), (actual))
-#endif
-
-/* You must compile with malloc replacement, as defined in unity_fixture_malloc_overrides.h */
-void UnityMalloc_MakeMallocFailAfterCount(int count);
-
-#endif /* UNITY_FIXTURE_H_ */
diff --git a/Unity/extras/fixture/src/unity_fixture_internals.h b/Unity/extras/fixture/src/unity_fixture_internals.h
deleted file mode 100755
index aa0d9e7c0..000000000
--- a/Unity/extras/fixture/src/unity_fixture_internals.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright (c) 2010 James Grenning and Contributed to Unity Project
- * ==========================================
- *  Unity Project - A Test Framework for C
- *  Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
- *  [Released under MIT License. Please refer to license.txt for details]
- * ========================================== */
-
-#ifndef UNITY_FIXTURE_INTERNALS_H_
-#define UNITY_FIXTURE_INTERNALS_H_
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-struct UNITY_FIXTURE_T
-{
-    int Verbose;
-    unsigned int RepeatCount;
-    const char* NameFilter;
-    const char* GroupFilter;
-};
-extern struct UNITY_FIXTURE_T UnityFixture;
-
-typedef void unityfunction(void);
-void UnityTestRunner(unityfunction* setup,
-                     unityfunction* body,
-                     unityfunction* teardown,
-                     const char* printableName,
-                     const char* group,
-                     const char* name,
-                     const char* file, unsigned int line);
-
-void UnityIgnoreTest(const char* printableName, const char* group, const char* name);
-void UnityMalloc_StartTest(void);
-void UnityMalloc_EndTest(void);
-int UnityGetCommandLineOptions(int argc, const char* argv[]);
-void UnityConcludeFixtureTest(void);
-
-void UnityPointer_Set(void** ptr, void* newValue, UNITY_LINE_TYPE line);
-void UnityPointer_UndoAllSets(void);
-void UnityPointer_Init(void);
-#ifndef UNITY_MAX_POINTERS
-#define UNITY_MAX_POINTERS 5
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* UNITY_FIXTURE_INTERNALS_H_ */
diff --git a/Unity/extras/fixture/src/unity_fixture_malloc_overrides.h b/Unity/extras/fixture/src/unity_fixture_malloc_overrides.h
deleted file mode 100755
index 7daba50aa..000000000
--- a/Unity/extras/fixture/src/unity_fixture_malloc_overrides.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright (c) 2010 James Grenning and Contributed to Unity Project
- * ==========================================
- *  Unity Project - A Test Framework for C
- *  Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
- *  [Released under MIT License. Please refer to license.txt for details]
- * ========================================== */
-
-#ifndef UNITY_FIXTURE_MALLOC_OVERRIDES_H_
-#define UNITY_FIXTURE_MALLOC_OVERRIDES_H_
-
-#include <stddef.h>
-
-#ifdef UNITY_EXCLUDE_STDLIB_MALLOC
-/* Define this macro to remove the use of stdlib.h, malloc, and free.
- * Many embedded systems do not have a heap or malloc/free by default.
- * This internal unity_malloc() provides allocated memory deterministically from
- * the end of an array only, unity_free() only releases from end-of-array,
- * blocks are not coalesced, and memory not freed in LIFO order is stranded. */
-    #ifndef UNITY_INTERNAL_HEAP_SIZE_BYTES
-    #define UNITY_INTERNAL_HEAP_SIZE_BYTES 256
-    #endif
-#endif
-
-/* These functions are used by the Unity Fixture to allocate and release memory
- * on the heap and can be overridden with platform-specific implementations.
- * For example, when using FreeRTOS UNITY_FIXTURE_MALLOC becomes pvPortMalloc()
- * and UNITY_FIXTURE_FREE becomes vPortFree(). */
-#if !defined(UNITY_FIXTURE_MALLOC) || !defined(UNITY_FIXTURE_FREE)
-    #include <stdlib.h>
-    #define UNITY_FIXTURE_MALLOC(size) malloc(size)
-    #define UNITY_FIXTURE_FREE(ptr)    free(ptr)
-#else
-    extern void* UNITY_FIXTURE_MALLOC(size_t size);
-    extern void UNITY_FIXTURE_FREE(void* ptr);
-#endif
-
-#define malloc  unity_malloc
-#define calloc  unity_calloc
-#define realloc unity_realloc
-#define free    unity_free
-
-void* unity_malloc(size_t size);
-void* unity_calloc(size_t num, size_t size);
-void* unity_realloc(void * oldMem, size_t size);
-void unity_free(void * mem);
-
-#endif /* UNITY_FIXTURE_MALLOC_OVERRIDES_H_ */
diff --git a/Unity/extras/fixture/test/Makefile b/Unity/extras/fixture/test/Makefile
deleted file mode 100755
index e6c62552f..000000000
--- a/Unity/extras/fixture/test/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-CC = gcc
-ifeq ($(shell uname -s), Darwin)
-CC = clang
-endif
-#DEBUG = -O0 -g
-CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror
-CFLAGS += $(DEBUG)
-DEFINES = -D UNITY_OUTPUT_CHAR=UnityOutputCharSpy_OutputChar
-DEFINES += -D UNITY_OUTPUT_CHAR_HEADER_DECLARATION=UnityOutputCharSpy_OutputChar\(int\)
-SRC = ../src/unity_fixture.c \
-      ../../../src/unity.c   \
-      unity_fixture_Test.c   \
-      unity_fixture_TestRunner.c \
-      unity_output_Spy.c     \
-      main/AllTests.c
-
-INC_DIR = -I../src -I../../../src/
-BUILD_DIR = ../build
-TARGET = ../build/fixture_tests.exe
-
-all: default noStdlibMalloc 32bits
-
-default: $(BUILD_DIR)
-	$(CC) $(CFLAGS) $(DEFINES) $(SRC) $(INC_DIR) -o $(TARGET) -D UNITY_SUPPORT_64
-	@ echo "default build"
-	./$(TARGET)
-
-32bits: $(BUILD_DIR)
-	$(CC) $(CFLAGS) $(DEFINES) $(SRC) $(INC_DIR) -o $(TARGET) -m32
-	@ echo "32bits build"
-	./$(TARGET)
-
-noStdlibMalloc: $(BUILD_DIR)
-	$(CC) $(CFLAGS) $(DEFINES) $(SRC) $(INC_DIR) -o $(TARGET) -D UNITY_EXCLUDE_STDLIB_MALLOC
-	@ echo "build with noStdlibMalloc"
-	./$(TARGET)
-
-C89: CFLAGS += -D UNITY_EXCLUDE_STDINT_H # C89 did not have type 'long long', <stdint.h>
-C89: $(BUILD_DIR)
-	$(CC) $(CFLAGS) $(DEFINES) $(SRC) $(INC_DIR) -o $(TARGET) -std=c89 && ./$(TARGET)
-	$(CC) $(CFLAGS) $(DEFINES) $(SRC) $(INC_DIR) -o $(TARGET) -D UNITY_EXCLUDE_STDLIB_MALLOC -std=c89
-	./$(TARGET)
-
-$(BUILD_DIR):
-	mkdir -p $(BUILD_DIR)
-
-clean:
-	rm -f $(TARGET) $(BUILD_DIR)/*.gc*
-
-cov: $(BUILD_DIR)
-	cd $(BUILD_DIR) && \
-	$(CC) $(DEFINES) $(foreach i, $(SRC), ../test/$(i)) $(INC_DIR) -o $(TARGET) -fprofile-arcs -ftest-coverage
-	rm -f $(BUILD_DIR)/*.gcda
-	./$(TARGET) > /dev/null ; ./$(TARGET) -v > /dev/null
-	cd $(BUILD_DIR) && \
-	gcov unity_fixture.c | head -3
-	grep '###' $(BUILD_DIR)/unity_fixture.c.gcov -C2 || true # Show uncovered lines
-
-# These extended flags DO get included before any target build runs
-CFLAGS += -Wbad-function-cast
-CFLAGS += -Wcast-qual
-CFLAGS += -Wconversion
-CFLAGS += -Wformat=2
-CFLAGS += -Wmissing-prototypes
-CFLAGS += -Wold-style-definition
-CFLAGS += -Wpointer-arith
-CFLAGS += -Wshadow
-CFLAGS += -Wstrict-overflow=5
-CFLAGS += -Wstrict-prototypes
-CFLAGS += -Wswitch-default
-CFLAGS += -Wundef
-CFLAGS += -Wno-error=undef  # Warning only, this should not stop the build
-CFLAGS += -Wunreachable-code
-CFLAGS += -Wunused
-CFLAGS += -fstrict-aliasing
diff --git a/Unity/extras/fixture/test/main/AllTests.c b/Unity/extras/fixture/test/main/AllTests.c
deleted file mode 100755
index e30dd853d..000000000
--- a/Unity/extras/fixture/test/main/AllTests.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright (c) 2010 James Grenning and Contributed to Unity Project
- * ==========================================
- *  Unity Project - A Test Framework for C
- *  Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
- *  [Released under MIT License. Please refer to license.txt for details]
- * ========================================== */
-
-#include "unity_fixture.h"
-
-static void runAllTests(void)
-{
-    RUN_TEST_GROUP(UnityFixture);
-    RUN_TEST_GROUP(UnityCommandOptions);
-    RUN_TEST_GROUP(LeakDetection);
-    RUN_TEST_GROUP(InternalMalloc);
-}
-
-int main(int argc, const char* argv[])
-{
-    return UnityMain(argc, argv, runAllTests);
-}
-
diff --git a/Unity/extras/fixture/test/template_fixture_tests.c b/Unity/extras/fixture/test/template_fixture_tests.c
deleted file mode 100755
index 18bbb89e8..000000000
--- a/Unity/extras/fixture/test/template_fixture_tests.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright (c) 2010 James Grenning and Contributed to Unity Project
- * ==========================================
- *  Unity Project - A Test Framework for C
- *  Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
- *  [Released under MIT License. Please refer to license.txt for details]
- * ========================================== */
-
-#include "unity_fixture.h"
-
-static int data = -1;
-
-TEST_GROUP(mygroup);
-
-TEST_SETUP(mygroup)
-{
-    data = 0;
-}
-
-TEST_TEAR_DOWN(mygroup)
-{
-    data = -1;
-}
-
-TEST(mygroup, test1)
-{
-    TEST_ASSERT_EQUAL_INT(0, data);
-}
-
-TEST(mygroup, test2)
-{
-    TEST_ASSERT_EQUAL_INT(0, data);
-    data = 5;
-}
-
-TEST(mygroup, test3)
-{
-    data = 7;
-    TEST_ASSERT_EQUAL_INT(7, data);
-}
diff --git a/Unity/extras/fixture/test/unity_fixture_Test.c b/Unity/extras/fixture/test/unity_fixture_Test.c
deleted file mode 100755
index a842b0853..000000000
--- a/Unity/extras/fixture/test/unity_fixture_Test.c
+++ /dev/null
@@ -1,543 +0,0 @@
-/* Copyright (c) 2010 James Grenning and Contributed to Unity Project
- * ==========================================
- *  Unity Project - A Test Framework for C
- *  Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
- *  [Released under MIT License. Please refer to license.txt for details]
- * ========================================== */
-
-#include "unity_fixture.h"
-#include "unity_output_Spy.h"
-#include <stdlib.h>
-#include <string.h>
-
-TEST_GROUP(UnityFixture);
-
-TEST_SETUP(UnityFixture)
-{
-}
-
-TEST_TEAR_DOWN(UnityFixture)
-{
-}
-
-static int* pointer1 = 0;
-static int* pointer2 = (int*)2;
-static int* pointer3 = (int*)3;
-static int int1;
-static int int2;
-static int int3;
-static int int4;
-
-TEST(UnityFixture, PointerSetting)
-{
-    TEST_ASSERT_POINTERS_EQUAL(pointer1, 0);
-    UT_PTR_SET(pointer1, &int1);
-    UT_PTR_SET(pointer2, &int2);
-    UT_PTR_SET(pointer3, &int3);
-    TEST_ASSERT_POINTERS_EQUAL(pointer1, &int1);
-    TEST_ASSERT_POINTERS_EQUAL(pointer2, &int2);
-    TEST_ASSERT_POINTERS_EQUAL(pointer3, &int3);
-    UT_PTR_SET(pointer1, &int4);
-    UnityPointer_UndoAllSets();
-    TEST_ASSERT_POINTERS_EQUAL(pointer1, 0);
-    TEST_ASSERT_POINTERS_EQUAL(pointer2, (int*)2);
-    TEST_ASSERT_POINTERS_EQUAL(pointer3, (int*)3);
-}
-
-TEST(UnityFixture, ForceMallocFail)
-{
-    void* m;
-    void* mfails;
-    UnityMalloc_MakeMallocFailAfterCount(1);
-    m = malloc(10);
-    CHECK(m);
-    mfails = malloc(10);
-    TEST_ASSERT_POINTERS_EQUAL(0, mfails);
-    free(m);
-}
-
-TEST(UnityFixture, ReallocSmallerIsUnchanged)
-{
-    void* m1 = malloc(10);
-    void* m2 = realloc(m1, 5);
-    TEST_ASSERT_POINTERS_EQUAL(m1, m2);
-    free(m2);
-}
-
-TEST(UnityFixture, ReallocSameIsUnchanged)
-{
-    void* m1 = malloc(10);
-    void* m2 = realloc(m1, 10);
-    TEST_ASSERT_POINTERS_EQUAL(m1, m2);
-    free(m2);
-}
-
-TEST(UnityFixture, ReallocLargerNeeded)
-{
-    void* m1 = malloc(10);
-    void* m2;
-    CHECK(m1);
-    strcpy((char*)m1, "123456789");
-    m2 = realloc(m1, 15);
-    /* CHECK(m1 != m2); //Depends on implementation */
-    STRCMP_EQUAL("123456789", m2);
-    free(m2);
-}
-
-TEST(UnityFixture, ReallocNullPointerIsLikeMalloc)
-{
-    void* m = realloc(0, 15);
-    CHECK(m != 0);
-    free(m);
-}
-
-TEST(UnityFixture, ReallocSizeZeroFreesMemAndReturnsNullPointer)
-{
-    void* m1 = malloc(10);
-    void* m2 = realloc(m1, 0);
-    TEST_ASSERT_POINTERS_EQUAL(0, m2);
-}
-
-TEST(UnityFixture, CallocFillsWithZero)
-{
-    void* m = calloc(3, sizeof(char));
-    char* s = (char*)m;
-    CHECK(m);
-    TEST_ASSERT_BYTES_EQUAL(0, s[0]);
-    TEST_ASSERT_BYTES_EQUAL(0, s[1]);
-    TEST_ASSERT_BYTES_EQUAL(0, s[2]);
-    free(m);
-}
-
-static char *p1;
-static char *p2;
-
-TEST(UnityFixture, PointerSet)
-{
-    char c1;
-    char c2;
-    char newC1;
-    char newC2;
-    p1 = &c1;
-    p2 = &c2;
-
-    UnityPointer_Init();
-    UT_PTR_SET(p1, &newC1);
-    UT_PTR_SET(p2, &newC2);
-    TEST_ASSERT_POINTERS_EQUAL(&newC1, p1);
-    TEST_ASSERT_POINTERS_EQUAL(&newC2, p2);
-    UnityPointer_UndoAllSets();
-    TEST_ASSERT_POINTERS_EQUAL(&c1, p1);
-    TEST_ASSERT_POINTERS_EQUAL(&c2, p2);
-}
-
-TEST(UnityFixture, FreeNULLSafety)
-{
-    free(NULL);
-}
-
-TEST(UnityFixture, ConcludeTestIncrementsFailCount)
-{
-    UNITY_UINT savedFails = Unity.TestFailures;
-    UNITY_UINT savedIgnores = Unity.TestIgnores;
-    UnityOutputCharSpy_Enable(1);
-    Unity.CurrentTestFailed = 1;
-    UnityConcludeFixtureTest(); /* Resets TestFailed for this test to pass */
-    Unity.CurrentTestIgnored = 1;
-    UnityConcludeFixtureTest(); /* Resets TestIgnored */
-    UnityOutputCharSpy_Enable(0);
-    TEST_ASSERT_EQUAL(savedFails + 1, Unity.TestFailures);
-    TEST_ASSERT_EQUAL(savedIgnores + 1, Unity.TestIgnores);
-    Unity.TestFailures = savedFails;
-    Unity.TestIgnores = savedIgnores;
-}
-
-/*------------------------------------------------------------ */
-
-TEST_GROUP(UnityCommandOptions);
-
-static int savedVerbose;
-static unsigned int savedRepeat;
-static const char* savedName;
-static const char* savedGroup;
-
-TEST_SETUP(UnityCommandOptions)
-{
-    savedVerbose = UnityFixture.Verbose;
-    savedRepeat = UnityFixture.RepeatCount;
-    savedName = UnityFixture.NameFilter;
-    savedGroup = UnityFixture.GroupFilter;
-}
-
-TEST_TEAR_DOWN(UnityCommandOptions)
-{
-    UnityFixture.Verbose = savedVerbose;
-    UnityFixture.RepeatCount= savedRepeat;
-    UnityFixture.NameFilter = savedName;
-    UnityFixture.GroupFilter = savedGroup;
-}
-
-
-static const char* noOptions[] = {
-        "testrunner.exe"
-};
-
-TEST(UnityCommandOptions, DefaultOptions)
-{
-    UnityGetCommandLineOptions(1, noOptions);
-    TEST_ASSERT_EQUAL(0, UnityFixture.Verbose);
-    TEST_ASSERT_POINTERS_EQUAL(0, UnityFixture.GroupFilter);
-    TEST_ASSERT_POINTERS_EQUAL(0, UnityFixture.NameFilter);
-    TEST_ASSERT_EQUAL(1, UnityFixture.RepeatCount);
-}
-
-static const char* verbose[] = {
-        "testrunner.exe",
-        "-v"
-};
-
-TEST(UnityCommandOptions, OptionVerbose)
-{
-    TEST_ASSERT_EQUAL(0, UnityGetCommandLineOptions(2, verbose));
-    TEST_ASSERT_EQUAL(1, UnityFixture.Verbose);
-}
-
-static const char* group[] = {
-        "testrunner.exe",
-        "-g", "groupname"
-};
-
-TEST(UnityCommandOptions, OptionSelectTestByGroup)
-{
-    TEST_ASSERT_EQUAL(0, UnityGetCommandLineOptions(3, group));
-    STRCMP_EQUAL("groupname", UnityFixture.GroupFilter);
-}
-
-static const char* name[] = {
-        "testrunner.exe",
-        "-n", "testname"
-};
-
-TEST(UnityCommandOptions, OptionSelectTestByName)
-{
-    TEST_ASSERT_EQUAL(0, UnityGetCommandLineOptions(3, name));
-    STRCMP_EQUAL("testname", UnityFixture.NameFilter);
-}
-
-static const char* repeat[] = {
-        "testrunner.exe",
-        "-r", "99"
-};
-
-TEST(UnityCommandOptions, OptionSelectRepeatTestsDefaultCount)
-{
-    TEST_ASSERT_EQUAL(0, UnityGetCommandLineOptions(2, repeat));
-    TEST_ASSERT_EQUAL(2, UnityFixture.RepeatCount);
-}
-
-TEST(UnityCommandOptions, OptionSelectRepeatTestsSpecificCount)
-{
-    TEST_ASSERT_EQUAL(0, UnityGetCommandLineOptions(3, repeat));
-    TEST_ASSERT_EQUAL(99, UnityFixture.RepeatCount);
-}
-
-static const char* multiple[] = {
-        "testrunner.exe",
-        "-v",
-        "-g", "groupname",
-        "-n", "testname",
-        "-r", "98"
-};
-
-TEST(UnityCommandOptions, MultipleOptions)
-{
-    TEST_ASSERT_EQUAL(0, UnityGetCommandLineOptions(8, multiple));
-    TEST_ASSERT_EQUAL(1, UnityFixture.Verbose);
-    STRCMP_EQUAL("groupname", UnityFixture.GroupFilter);
-    STRCMP_EQUAL("testname", UnityFixture.NameFilter);
-    TEST_ASSERT_EQUAL(98, UnityFixture.RepeatCount);
-}
-
-static const char* dashRNotLast[] = {
-        "testrunner.exe",
-        "-v",
-        "-g", "gggg",
-        "-r",
-        "-n", "tttt",
-};
-
-TEST(UnityCommandOptions, MultipleOptionsDashRNotLastAndNoValueSpecified)
-{
-    TEST_ASSERT_EQUAL(0, UnityGetCommandLineOptions(7, dashRNotLast));
-    TEST_ASSERT_EQUAL(1, UnityFixture.Verbose);
-    STRCMP_EQUAL("gggg", UnityFixture.GroupFilter);
-    STRCMP_EQUAL("tttt", UnityFixture.NameFilter);
-    TEST_ASSERT_EQUAL(2, UnityFixture.RepeatCount);
-}
-
-static const char* unknownCommand[] = {
-        "testrunner.exe",
-        "-v",
-        "-g", "groupname",
-        "-n", "testname",
-        "-r", "98",
-        "-z"
-};
-TEST(UnityCommandOptions, UnknownCommandIsIgnored)
-{
-    TEST_ASSERT_EQUAL(0, UnityGetCommandLineOptions(9, unknownCommand));
-    TEST_ASSERT_EQUAL(1, UnityFixture.Verbose);
-    STRCMP_EQUAL("groupname", UnityFixture.GroupFilter);
-    STRCMP_EQUAL("testname", UnityFixture.NameFilter);
-    TEST_ASSERT_EQUAL(98, UnityFixture.RepeatCount);
-}
-
-TEST(UnityCommandOptions, GroupOrNameFilterWithoutStringFails)
-{
-    TEST_ASSERT_EQUAL(1, UnityGetCommandLineOptions(3, unknownCommand));
-    TEST_ASSERT_EQUAL(1, UnityGetCommandLineOptions(5, unknownCommand));
-    TEST_ASSERT_EQUAL(1, UnityMain(3, unknownCommand, NULL));
-}
-
-TEST(UnityCommandOptions, GroupFilterReallyFilters)
-{
-    UNITY_UINT saved = Unity.NumberOfTests;
-    TEST_ASSERT_EQUAL(0, UnityGetCommandLineOptions(4, unknownCommand));
-    UnityIgnoreTest(NULL, "non-matching", NULL);
-    TEST_ASSERT_EQUAL(saved, Unity.NumberOfTests);
-}
-
-IGNORE_TEST(UnityCommandOptions, TestShouldBeIgnored)
-{
-    TEST_FAIL_MESSAGE("This test should not run!");
-}
-
-/*------------------------------------------------------------ */
-
-TEST_GROUP(LeakDetection);
-
-TEST_SETUP(LeakDetection)
-{
-#ifdef UNITY_EXCLUDE_STDLIB_MALLOC
-    UnityOutputCharSpy_Create(200);
-#else
-    UnityOutputCharSpy_Create(1000);
-#endif
-}
-
-TEST_TEAR_DOWN(LeakDetection)
-{
-    UnityOutputCharSpy_Destroy();
-}
-
-#define EXPECT_ABORT_BEGIN \
-  { \
-    jmp_buf TestAbortFrame;   \
-    memcpy(TestAbortFrame, Unity.AbortFrame, sizeof(jmp_buf)); \
-    if (TEST_PROTECT()) \
-    {
-
-#define EXPECT_ABORT_END \
-    } \
-    memcpy(Unity.AbortFrame, TestAbortFrame, sizeof(jmp_buf)); \
-  }
-
-/* This tricky set of defines lets us see if we are using the Spy, returns 1 if true */
-#ifdef __STDC_VERSION__
-
-#if __STDC_VERSION__ >= 199901L
-#define USING_SPY_AS(a)                    EXPAND_AND_USE_2ND(ASSIGN_VALUE(a), 0)
-#define ASSIGN_VALUE(a)                    VAL_##a
-#define VAL_UnityOutputCharSpy_OutputChar  0, 1
-#define EXPAND_AND_USE_2ND(a, b)           SECOND_PARAM(a, b, throwaway)
-#define SECOND_PARAM(a, b, ...)            b
-#if USING_SPY_AS(UNITY_OUTPUT_CHAR)
-  #define USING_OUTPUT_SPY /* UNITY_OUTPUT_CHAR = UnityOutputCharSpy_OutputChar */
-#endif
-#endif /* >= 199901 */
-
-#else  /* __STDC_VERSION__ else */
-#define UnityOutputCharSpy_OutputChar 42
-#if UNITY_OUTPUT_CHAR == UnityOutputCharSpy_OutputChar /* Works if no -Wundef -Werror */
-  #define USING_OUTPUT_SPY
-#endif
-#undef UnityOutputCharSpy_OutputChar
-#endif /* __STDC_VERSION__ */
-
-TEST(LeakDetection, DetectsLeak)
-{
-#ifndef USING_OUTPUT_SPY
-    TEST_IGNORE_MESSAGE("Build with '-D UNITY_OUTPUT_CHAR=UnityOutputCharSpy_OutputChar' to enable tests");
-#else
-    void* m = malloc(10);
-    TEST_ASSERT_NOT_NULL(m);
-    UnityOutputCharSpy_Enable(1);
-    EXPECT_ABORT_BEGIN
-    UnityMalloc_EndTest();
-    EXPECT_ABORT_END
-    UnityOutputCharSpy_Enable(0);
-    Unity.CurrentTestFailed = 0;
-    CHECK(strstr(UnityOutputCharSpy_Get(), "This test leaks!"));
-    free(m);
-#endif
-}
-
-TEST(LeakDetection, BufferOverrunFoundDuringFree)
-{
-#ifndef USING_OUTPUT_SPY
-    TEST_IGNORE();
-#else
-    void* m = malloc(10);
-    char* s = (char*)m;
-    TEST_ASSERT_NOT_NULL(m);
-    s[10] = (char)0xFF;
-    UnityOutputCharSpy_Enable(1);
-    EXPECT_ABORT_BEGIN
-    free(m);
-    EXPECT_ABORT_END
-    UnityOutputCharSpy_Enable(0);
-    Unity.CurrentTestFailed = 0;
-    CHECK(strstr(UnityOutputCharSpy_Get(), "Buffer overrun detected during free()"));
-#endif
-}
-
-TEST(LeakDetection, BufferOverrunFoundDuringRealloc)
-{
-#ifndef USING_OUTPUT_SPY
-    TEST_IGNORE();
-#else
-    void* m = malloc(10);
-    char* s = (char*)m;
-    TEST_ASSERT_NOT_NULL(m);
-    s[10] = (char)0xFF;
-    UnityOutputCharSpy_Enable(1);
-    EXPECT_ABORT_BEGIN
-    m = realloc(m, 100);
-    EXPECT_ABORT_END
-    UnityOutputCharSpy_Enable(0);
-    Unity.CurrentTestFailed = 0;
-    CHECK(strstr(UnityOutputCharSpy_Get(), "Buffer overrun detected during realloc()"));
-#endif
-}
-
-TEST(LeakDetection, BufferGuardWriteFoundDuringFree)
-{
-#ifndef USING_OUTPUT_SPY
-    TEST_IGNORE();
-#else
-    void* m = malloc(10);
-    char* s = (char*)m;
-    TEST_ASSERT_NOT_NULL(m);
-    s[-1] = (char)0x00; /* Will not detect 0 */
-    s[-2] = (char)0x01;
-    UnityOutputCharSpy_Enable(1);
-    EXPECT_ABORT_BEGIN
-    free(m);
-    EXPECT_ABORT_END
-    UnityOutputCharSpy_Enable(0);
-    Unity.CurrentTestFailed = 0;
-    CHECK(strstr(UnityOutputCharSpy_Get(), "Buffer overrun detected during free()"));
-#endif
-}
-
-TEST(LeakDetection, BufferGuardWriteFoundDuringRealloc)
-{
-#ifndef USING_OUTPUT_SPY
-    TEST_IGNORE();
-#else
-    void* m = malloc(10);
-    char* s = (char*)m;
-    TEST_ASSERT_NOT_NULL(m);
-    s[-1] = (char)0x0A;
-    UnityOutputCharSpy_Enable(1);
-    EXPECT_ABORT_BEGIN
-    m = realloc(m, 100);
-    EXPECT_ABORT_END
-    UnityOutputCharSpy_Enable(0);
-    Unity.CurrentTestFailed = 0;
-    CHECK(strstr(UnityOutputCharSpy_Get(), "Buffer overrun detected during realloc()"));
-#endif
-}
-
-TEST(LeakDetection, PointerSettingMax)
-{
-#ifndef USING_OUTPUT_SPY
-    TEST_IGNORE();
-#else
-    int i;
-    for (i = 0; i < UNITY_MAX_POINTERS; i++) UT_PTR_SET(pointer1, &int1);
-    UnityOutputCharSpy_Enable(1);
-    EXPECT_ABORT_BEGIN
-    UT_PTR_SET(pointer1, &int1);
-    EXPECT_ABORT_END
-    UnityOutputCharSpy_Enable(0);
-    Unity.CurrentTestFailed = 0;
-    CHECK(strstr(UnityOutputCharSpy_Get(), "Too many pointers set"));
-#endif
-}
-
-/*------------------------------------------------------------ */
-
-TEST_GROUP(InternalMalloc);
-#define TEST_ASSERT_MEMORY_ALL_FREE_LIFO_ORDER(first_mem_ptr, ptr) \
-    ptr = malloc(10); free(ptr);                                   \
-    TEST_ASSERT_EQUAL_PTR_MESSAGE(first_mem_ptr, ptr, "Memory was stranded, free in LIFO order");
-
-
-TEST_SETUP(InternalMalloc) { }
-TEST_TEAR_DOWN(InternalMalloc) { }
-
-TEST(InternalMalloc, MallocPastBufferFails)
-{
-#ifdef UNITY_EXCLUDE_STDLIB_MALLOC
-    void* m = malloc(UNITY_INTERNAL_HEAP_SIZE_BYTES/2 + 1);
-    void* n = malloc(UNITY_INTERNAL_HEAP_SIZE_BYTES/2);
-    free(m);
-    TEST_ASSERT_NOT_NULL(m);
-    TEST_ASSERT_NULL(n);
-    TEST_ASSERT_MEMORY_ALL_FREE_LIFO_ORDER(m, n);
-#endif
-}
-
-TEST(InternalMalloc, CallocPastBufferFails)
-{
-#ifdef UNITY_EXCLUDE_STDLIB_MALLOC
-    void* m = calloc(1, UNITY_INTERNAL_HEAP_SIZE_BYTES/2 + 1);
-    void* n = calloc(1, UNITY_INTERNAL_HEAP_SIZE_BYTES/2);
-    free(m);
-    TEST_ASSERT_NOT_NULL(m);
-    TEST_ASSERT_NULL(n);
-    TEST_ASSERT_MEMORY_ALL_FREE_LIFO_ORDER(m, n);
-#endif
-}
-
-TEST(InternalMalloc, MallocThenReallocGrowsMemoryInPlace)
-{
-#ifdef UNITY_EXCLUDE_STDLIB_MALLOC
-    void* m = malloc(UNITY_INTERNAL_HEAP_SIZE_BYTES/2 + 1);
-    void* n = realloc(m, UNITY_INTERNAL_HEAP_SIZE_BYTES/2 + 9);
-    free(n);
-    TEST_ASSERT_NOT_NULL(m);
-    TEST_ASSERT_EQUAL(m, n);
-    TEST_ASSERT_MEMORY_ALL_FREE_LIFO_ORDER(m, n);
-#endif
-}
-
-TEST(InternalMalloc, ReallocFailDoesNotFreeMem)
-{
-#ifdef UNITY_EXCLUDE_STDLIB_MALLOC
-    void* m = malloc(UNITY_INTERNAL_HEAP_SIZE_BYTES/2);
-    void* n1 = malloc(10);
-    void* out_of_mem = realloc(n1, UNITY_INTERNAL_HEAP_SIZE_BYTES/2 + 1);
-    void* n2 = malloc(10);
-
-    free(n2);
-    if (out_of_mem == NULL) free(n1);
-    free(m);
-
-    TEST_ASSERT_NOT_NULL(m);       /* Got a real memory location */
-    TEST_ASSERT_NULL(out_of_mem);  /* The realloc should have failed */
-    TEST_ASSERT_NOT_EQUAL(n2, n1); /* If n1 != n2 then realloc did not free n1 */
-    TEST_ASSERT_MEMORY_ALL_FREE_LIFO_ORDER(m, n2);
-#endif
-}
diff --git a/Unity/extras/fixture/test/unity_fixture_TestRunner.c b/Unity/extras/fixture/test/unity_fixture_TestRunner.c
deleted file mode 100755
index e8713e1bc..000000000
--- a/Unity/extras/fixture/test/unity_fixture_TestRunner.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright (c) 2010 James Grenning and Contributed to Unity Project
- * ==========================================
- *  Unity Project - A Test Framework for C
- *  Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
- *  [Released under MIT License. Please refer to license.txt for details]
- * ========================================== */
-
-#include "unity_fixture.h"
-
-TEST_GROUP_RUNNER(UnityFixture)
-{
-    RUN_TEST_CASE(UnityFixture, PointerSetting);
-    RUN_TEST_CASE(UnityFixture, ForceMallocFail);
-    RUN_TEST_CASE(UnityFixture, ReallocSmallerIsUnchanged);
-    RUN_TEST_CASE(UnityFixture, ReallocSameIsUnchanged);
-    RUN_TEST_CASE(UnityFixture, ReallocLargerNeeded);
-    RUN_TEST_CASE(UnityFixture, ReallocNullPointerIsLikeMalloc);
-    RUN_TEST_CASE(UnityFixture, ReallocSizeZeroFreesMemAndReturnsNullPointer);
-    RUN_TEST_CASE(UnityFixture, CallocFillsWithZero);
-    RUN_TEST_CASE(UnityFixture, PointerSet);
-    RUN_TEST_CASE(UnityFixture, FreeNULLSafety);
-    RUN_TEST_CASE(UnityFixture, ConcludeTestIncrementsFailCount);
-}
-
-TEST_GROUP_RUNNER(UnityCommandOptions)
-{
-    RUN_TEST_CASE(UnityCommandOptions, DefaultOptions);
-    RUN_TEST_CASE(UnityCommandOptions, OptionVerbose);
-    RUN_TEST_CASE(UnityCommandOptions, OptionSelectTestByGroup);
-    RUN_TEST_CASE(UnityCommandOptions, OptionSelectTestByName);
-    RUN_TEST_CASE(UnityCommandOptions, OptionSelectRepeatTestsDefaultCount);
-    RUN_TEST_CASE(UnityCommandOptions, OptionSelectRepeatTestsSpecificCount);
-    RUN_TEST_CASE(UnityCommandOptions, MultipleOptions);
-    RUN_TEST_CASE(UnityCommandOptions, MultipleOptionsDashRNotLastAndNoValueSpecified);
-    RUN_TEST_CASE(UnityCommandOptions, UnknownCommandIsIgnored);
-    RUN_TEST_CASE(UnityCommandOptions, GroupOrNameFilterWithoutStringFails);
-    RUN_TEST_CASE(UnityCommandOptions, GroupFilterReallyFilters);
-    RUN_TEST_CASE(UnityCommandOptions, TestShouldBeIgnored);
-}
-
-TEST_GROUP_RUNNER(LeakDetection)
-{
-    RUN_TEST_CASE(LeakDetection, DetectsLeak);
-    RUN_TEST_CASE(LeakDetection, BufferOverrunFoundDuringFree);
-    RUN_TEST_CASE(LeakDetection, BufferOverrunFoundDuringRealloc);
-    RUN_TEST_CASE(LeakDetection, BufferGuardWriteFoundDuringFree);
-    RUN_TEST_CASE(LeakDetection, BufferGuardWriteFoundDuringRealloc);
-    RUN_TEST_CASE(LeakDetection, PointerSettingMax);
-}
-
-TEST_GROUP_RUNNER(InternalMalloc)
-{
-    RUN_TEST_CASE(InternalMalloc, MallocPastBufferFails);
-    RUN_TEST_CASE(InternalMalloc, CallocPastBufferFails);
-    RUN_TEST_CASE(InternalMalloc, MallocThenReallocGrowsMemoryInPlace);
-    RUN_TEST_CASE(InternalMalloc, ReallocFailDoesNotFreeMem);
-}
diff --git a/Unity/extras/fixture/test/unity_output_Spy.c b/Unity/extras/fixture/test/unity_output_Spy.c
deleted file mode 100755
index be87bd58f..000000000
--- a/Unity/extras/fixture/test/unity_output_Spy.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright (c) 2010 James Grenning and Contributed to Unity Project
- * ==========================================
- *  Unity Project - A Test Framework for C
- *  Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
- *  [Released under MIT License. Please refer to license.txt for details]
- * ========================================== */
-
-
-#include "unity_output_Spy.h"
-#include "unity_fixture.h"
-
-#include <stdio.h>
-#include <string.h>
-
-static int size;
-static int count;
-static char* buffer;
-static int spy_enable;
-
-void UnityOutputCharSpy_Create(int s)
-{
-    size = (s > 0) ? s : 0;
-    count = 0;
-    spy_enable = 0;
-    buffer = malloc((size_t)size);
-    TEST_ASSERT_NOT_NULL_MESSAGE(buffer, "Internal malloc failed in Spy Create():" __FILE__);
-    memset(buffer, 0, (size_t)size);
-}
-
-void UnityOutputCharSpy_Destroy(void)
-{
-    size = 0;
-    free(buffer);
-}
-
-void UnityOutputCharSpy_OutputChar(int c)
-{
-    if (spy_enable)
-    {
-        if (count < (size-1))
-            buffer[count++] = (char)c;
-    }
-    else
-    {
-        putchar(c);
-    }
-}
-
-const char * UnityOutputCharSpy_Get(void)
-{
-    return buffer;
-}
-
-void UnityOutputCharSpy_Enable(int enable)
-{
-    spy_enable = enable;
-}
diff --git a/Unity/extras/fixture/test/unity_output_Spy.h b/Unity/extras/fixture/test/unity_output_Spy.h
deleted file mode 100755
index b30a7f13b..000000000
--- a/Unity/extras/fixture/test/unity_output_Spy.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright (c) 2010 James Grenning and Contributed to Unity Project
- * ==========================================
- *  Unity Project - A Test Framework for C
- *  Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
- *  [Released under MIT License. Please refer to license.txt for details]
- * ========================================== */
-
-#ifndef D_unity_output_Spy_H
-#define D_unity_output_Spy_H
-
-void UnityOutputCharSpy_Create(int s);
-void UnityOutputCharSpy_Destroy(void);
-void UnityOutputCharSpy_OutputChar(int c);
-const char * UnityOutputCharSpy_Get(void);
-void UnityOutputCharSpy_Enable(int enable);
-
-#endif
diff --git a/Unity/test/.rubocop.yml b/Unity/test/.rubocop.yml
deleted file mode 100755
index c074ca9ac..000000000
--- a/Unity/test/.rubocop.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-# This is the configuration used to check the rubocop source code.
-
-#inherit_from: .rubocop_todo.yml
-
-AllCops:
-  TargetRubyVersion: 2.1
-
-# These are areas where ThrowTheSwitch's coding style diverges from the Ruby standard
-Style/SpecialGlobalVars:
-  EnforcedStyle: use_perl_names
-Style/FormatString:
-  Enabled: false
-Style/GlobalVars:
-  Enabled: false
-Style/RegexpLiteral:
-  AllowInnerSlashes: true
-Style/HashSyntax:
-  EnforcedStyle: no_mixed_keys
-
-# This is disabled because it seems to get confused over nested hashes
-Style/AlignHash:
-  Enabled: false
-  EnforcedHashRocketStyle: table
-  EnforcedColonStyle: table
-
-# We purposefully use these insecure features because they're what makes Ruby awesome
-Security/Eval:
-  Enabled: false
-Security/YAMLLoad:
-  Enabled: false
-
-# At this point, we're not ready to enforce inline documentation requirements
-Style/Documentation:
-  Enabled: false
-Style/DocumentationMethod:
-  Enabled: false
-
-# At this point, we're not ready to enforce any metrics
-Metrics/AbcSize:
-  Enabled: false
-Metrics/BlockLength:
-  Enabled: false
-Metrics/BlockNesting:
-  Enabled: false
-Metrics/ClassLength:
-  Enabled: false
-Metrics/CyclomaticComplexity:
-  Enabled: false
-Metrics/LineLength:
-  Enabled: false
-Metrics/MethodLength:
-  Enabled: false
-Metrics/ModuleLength:
-  Enabled: false
-Metrics/ParameterLists:
-  Enabled: false
-Metrics/PerceivedComplexity:
-  Enabled: false
diff --git a/Unity/test/Makefile b/Unity/test/Makefile
deleted file mode 100755
index 9de7a49ac..000000000
--- a/Unity/test/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-CC = gcc
-ifeq ($(shell uname -s), Darwin)
-CC = clang
-endif
-ifeq ($(findstring clang, $(CC)), clang)
-E = -Weverything
-CFLAGS += $E -Wno-unknown-warning-option -Wno-missing-prototypes
-CFLAGS += -Wno-unused-macros -Wno-padded -Wno-missing-noreturn
-endif
-CFLAGS += -std=c99 -pedantic -Wall -Wextra -Wconversion -Werror
-CFLAGS += -Wno-switch-enum -Wno-double-promotion
-CFLAGS += -Wbad-function-cast -Wcast-qual -Wold-style-definition -Wshadow -Wstrict-overflow \
-          -Wstrict-prototypes -Wswitch-default -Wundef
-#DEBUG = -O0 -g
-CFLAGS += $(DEBUG)
-DEFINES =  -D UNITY_OUTPUT_CHAR=putcharSpy
-DEFINES += -D UNITY_OUTPUT_CHAR_HEADER_DECLARATION=putcharSpy\(int\)
-DEFINES += -D UNITY_SUPPORT_64 -D UNITY_INCLUDE_DOUBLE
-SRC = ../src/unity.c tests/testunity.c build/testunityRunner.c
-INC_DIR = -I ../src
-COV_FLAGS = -fprofile-arcs -ftest-coverage -I ../../src
-BUILD_DIR = build
-TARGET = build/testunity-cov.exe
-
-# To generate coverage, call 'make -s', the default target runs.
-# For verbose output of all the tests, run 'make test'.
-default: coverage
-.PHONY: default coverage test clean
-coverage: DEFINES += -D UNITY_NO_WEAK
-coverage: $(BUILD_DIR)/testunityRunner.c
-	cd $(BUILD_DIR) && \
-	$(CC) $(CFLAGS) $(DEFINES) $(foreach i,$(SRC), ../$i) $(COV_FLAGS) -o ../$(TARGET)
-	rm -f $(BUILD_DIR)/*.gcda
-	./$(TARGET) | grep 'Tests\|]]]' -A1
-	cd $(BUILD_DIR) && \
-	gcov unity.c | head -3
-	grep '###' $(BUILD_DIR)/unity.c.gcov -C2 || true
-
-test: $(BUILD_DIR)/testunityRunner.c
-	$(CC) $(CFLAGS) $(DEFINES) $(INC_DIR) $(SRC) -o $(TARGET)
-	./$(TARGET)
-
-# Compile only, for testing that preprocessor detection works
-UNITY_C_ONLY =-c ../src/unity.c -o $(BUILD_DIR)/unity.o
-intDetection:
-	$(CC) $(CFLAGS) $(INC_DIR) $(UNITY_C_ONLY) -D UNITY_EXCLUDE_STDINT_H
-	$(CC) $(CFLAGS) $(INC_DIR) $(UNITY_C_ONLY) -D UNITY_EXCLUDE_LIMITS_H
-
-$(BUILD_DIR)/testunityRunner.c: tests/testunity.c | $(BUILD_DIR)
-	awk $(AWK_SCRIPT) tests/testunity.c > $@
-
-AWK_SCRIPT=\
-  '/^void test/{ declarations[d++]=$$0; gsub(/\(?void\)? ?/,""); tests[t++]=$$0; line[u++]=NR } \
-  END{ print "\#include \"unity.h\" /* Autogenerated by awk in Makefile */" ;                   \
-       for (i=0; i<d; i++) { print declarations[i] ";" }                                        \
-       print "int main(void)\n{\n    UnityBegin(\"" FILENAME "\");" ;                           \
-       for (i=0; i<t; i++) { print "    RUN_TEST(" tests[i] ", " line[i] ");" }                 \
-       print "    return UNITY_END();\n}" }'
-
-$(BUILD_DIR):
-	mkdir -p $(BUILD_DIR)
-
-clean:
-	rm -f $(TARGET) $(BUILD_DIR)/*.gc* $(BUILD_DIR)/testunityRunner.c
diff --git a/Unity/test/expectdata/testsample_cmd.c b/Unity/test/expectdata/testsample_cmd.c
deleted file mode 100755
index 7bcf8e102..000000000
--- a/Unity/test/expectdata/testsample_cmd.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-/*=======Test Runner Used To Run Each Test Below=====*/
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-    CEXCEPTION_T e; \
-    Try { \
-      setUp(); \
-      TestFunc(); \
-    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-/*=======Automagically Detected Files To Include=====*/
-#include "unity.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "CException.h"
-#include "funky.h"
-#include "stanky.h"
-#include <setjmp.h>
-
-/*=======External Functions This Runner Calls=====*/
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-extern void test_TheThirdThingToTest(void);
-extern void test_TheFourthThingToTest(void);
-
-
-/*=======Test Reset Option=====*/
-void resetTest(void);
-void resetTest(void)
-{
-  tearDown();
-  setUp();
-}
-
-
-/*=======MAIN=====*/
-int main(void)
-{
-  UnityBegin("testdata/testsample.c");
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-  RUN_TEST(test_TheThirdThingToTest, 53);
-  RUN_TEST(test_TheFourthThingToTest, 58);
-
-  return (UnityEnd());
-}
diff --git a/Unity/test/expectdata/testsample_def.c b/Unity/test/expectdata/testsample_def.c
deleted file mode 100755
index b8ad559f6..000000000
--- a/Unity/test/expectdata/testsample_def.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-/*=======Test Runner Used To Run Each Test Below=====*/
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-      setUp(); \
-      TestFunc(); \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-/*=======Automagically Detected Files To Include=====*/
-#include "unity.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "funky.h"
-#include "stanky.h"
-#include <setjmp.h>
-
-/*=======External Functions This Runner Calls=====*/
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-extern void test_TheThirdThingToTest(void);
-extern void test_TheFourthThingToTest(void);
-
-
-/*=======Test Reset Option=====*/
-void resetTest(void);
-void resetTest(void)
-{
-  tearDown();
-  setUp();
-}
-
-
-/*=======MAIN=====*/
-int main(void)
-{
-  UnityBegin("testdata/testsample.c");
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-  RUN_TEST(test_TheThirdThingToTest, 53);
-  RUN_TEST(test_TheFourthThingToTest, 58);
-
-  return (UnityEnd());
-}
diff --git a/Unity/test/expectdata/testsample_head1.c b/Unity/test/expectdata/testsample_head1.c
deleted file mode 100755
index 1d01551e8..000000000
--- a/Unity/test/expectdata/testsample_head1.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-/*=======Test Runner Used To Run Each Test Below=====*/
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-      setUp(); \
-      TestFunc(); \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-/*=======Automagically Detected Files To Include=====*/
-#include "unity.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "testsample_head1.h"
-
-/*=======External Functions This Runner Calls=====*/
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-extern void test_TheThirdThingToTest(void);
-extern void test_TheFourthThingToTest(void);
-
-
-/*=======Test Reset Option=====*/
-void resetTest(void);
-void resetTest(void)
-{
-  tearDown();
-  setUp();
-}
-
-
-/*=======MAIN=====*/
-int main(void)
-{
-  UnityBegin("testdata/testsample.c");
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-  RUN_TEST(test_TheThirdThingToTest, 53);
-  RUN_TEST(test_TheFourthThingToTest, 58);
-
-  return (UnityEnd());
-}
diff --git a/Unity/test/expectdata/testsample_head1.h b/Unity/test/expectdata/testsample_head1.h
deleted file mode 100755
index da6b7ab26..000000000
--- a/Unity/test/expectdata/testsample_head1.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-#ifndef _TESTSAMPLE_HEAD1_H
-#define _TESTSAMPLE_HEAD1_H
-
-#include "unity.h"
-#include "funky.h"
-#include "stanky.h"
-#include <setjmp.h>
-
-void test_TheFirstThingToTest(void);
-void test_TheSecondThingToTest(void);
-void test_TheThirdThingToTest(void);
-void test_TheFourthThingToTest(void);
-#endif
-
diff --git a/Unity/test/expectdata/testsample_mock_cmd.c b/Unity/test/expectdata/testsample_mock_cmd.c
deleted file mode 100755
index 45a09af22..000000000
--- a/Unity/test/expectdata/testsample_mock_cmd.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-/*=======Test Runner Used To Run Each Test Below=====*/
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  CMock_Init(); \
-  UNITY_CLR_DETAILS(); \
-  if (TEST_PROTECT()) \
-  { \
-    CEXCEPTION_T e; \
-    Try { \
-      setUp(); \
-      TestFunc(); \
-    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-    CMock_Verify(); \
-  } \
-  CMock_Destroy(); \
-  UnityConcludeTest(); \
-}
-
-/*=======Automagically Detected Files To Include=====*/
-#include "unity.h"
-#include "cmock.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "CException.h"
-#include "funky.h"
-#include <setjmp.h>
-#include "Mockstanky.h"
-
-/*=======External Functions This Runner Calls=====*/
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-/*=======Mock Management=====*/
-static void CMock_Init(void)
-{
-  Mockstanky_Init();
-}
-static void CMock_Verify(void)
-{
-  Mockstanky_Verify();
-}
-static void CMock_Destroy(void)
-{
-  Mockstanky_Destroy();
-}
-
-/*=======Test Reset Option=====*/
-void resetTest(void);
-void resetTest(void)
-{
-  CMock_Verify();
-  CMock_Destroy();
-  tearDown();
-  CMock_Init();
-  setUp();
-}
-
-
-/*=======MAIN=====*/
-int main(void)
-{
-  UnityBegin("testdata/mocksample.c");
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-
-  CMock_Guts_MemFreeFinal();
-  return (UnityEnd());
-}
diff --git a/Unity/test/expectdata/testsample_mock_def.c b/Unity/test/expectdata/testsample_mock_def.c
deleted file mode 100755
index a7a26078b..000000000
--- a/Unity/test/expectdata/testsample_mock_def.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-/*=======Test Runner Used To Run Each Test Below=====*/
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  CMock_Init(); \
-  UNITY_CLR_DETAILS(); \
-  if (TEST_PROTECT()) \
-  { \
-      setUp(); \
-      TestFunc(); \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-    CMock_Verify(); \
-  } \
-  CMock_Destroy(); \
-  UnityConcludeTest(); \
-}
-
-/*=======Automagically Detected Files To Include=====*/
-#include "unity.h"
-#include "cmock.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "funky.h"
-#include <setjmp.h>
-#include "Mockstanky.h"
-
-/*=======External Functions This Runner Calls=====*/
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-/*=======Mock Management=====*/
-static void CMock_Init(void)
-{
-  Mockstanky_Init();
-}
-static void CMock_Verify(void)
-{
-  Mockstanky_Verify();
-}
-static void CMock_Destroy(void)
-{
-  Mockstanky_Destroy();
-}
-
-/*=======Test Reset Option=====*/
-void resetTest(void);
-void resetTest(void)
-{
-  CMock_Verify();
-  CMock_Destroy();
-  tearDown();
-  CMock_Init();
-  setUp();
-}
-
-
-/*=======MAIN=====*/
-int main(void)
-{
-  UnityBegin("testdata/mocksample.c");
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-
-  CMock_Guts_MemFreeFinal();
-  return (UnityEnd());
-}
diff --git a/Unity/test/expectdata/testsample_mock_head1.c b/Unity/test/expectdata/testsample_mock_head1.c
deleted file mode 100755
index 45829fe7e..000000000
--- a/Unity/test/expectdata/testsample_mock_head1.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-/*=======Test Runner Used To Run Each Test Below=====*/
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  CMock_Init(); \
-  UNITY_CLR_DETAILS(); \
-  if (TEST_PROTECT()) \
-  { \
-      setUp(); \
-      TestFunc(); \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-    CMock_Verify(); \
-  } \
-  CMock_Destroy(); \
-  UnityConcludeTest(); \
-}
-
-/*=======Automagically Detected Files To Include=====*/
-#include "unity.h"
-#include "cmock.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "testsample_mock_head1.h"
-#include "Mockstanky.h"
-
-/*=======External Functions This Runner Calls=====*/
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-/*=======Mock Management=====*/
-static void CMock_Init(void)
-{
-  Mockstanky_Init();
-}
-static void CMock_Verify(void)
-{
-  Mockstanky_Verify();
-}
-static void CMock_Destroy(void)
-{
-  Mockstanky_Destroy();
-}
-
-/*=======Test Reset Option=====*/
-void resetTest(void);
-void resetTest(void)
-{
-  CMock_Verify();
-  CMock_Destroy();
-  tearDown();
-  CMock_Init();
-  setUp();
-}
-
-
-/*=======MAIN=====*/
-int main(void)
-{
-  UnityBegin("testdata/mocksample.c");
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-
-  CMock_Guts_MemFreeFinal();
-  return (UnityEnd());
-}
diff --git a/Unity/test/expectdata/testsample_mock_head1.h b/Unity/test/expectdata/testsample_mock_head1.h
deleted file mode 100755
index 30c509ad0..000000000
--- a/Unity/test/expectdata/testsample_mock_head1.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-#ifndef _TESTSAMPLE_MOCK_HEAD1_H
-#define _TESTSAMPLE_MOCK_HEAD1_H
-
-#include "unity.h"
-#include "cmock.h"
-#include "funky.h"
-#include <setjmp.h>
-
-void test_TheFirstThingToTest(void);
-void test_TheSecondThingToTest(void);
-#endif
-
diff --git a/Unity/test/expectdata/testsample_mock_new1.c b/Unity/test/expectdata/testsample_mock_new1.c
deleted file mode 100755
index 0061822e5..000000000
--- a/Unity/test/expectdata/testsample_mock_new1.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-/*=======Test Runner Used To Run Each Test Below=====*/
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  CMock_Init(); \
-  UNITY_CLR_DETAILS(); \
-  if (TEST_PROTECT()) \
-  { \
-    CEXCEPTION_T e; \
-    Try { \
-      setUp(); \
-      TestFunc(); \
-    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-    CMock_Verify(); \
-  } \
-  CMock_Destroy(); \
-  UnityConcludeTest(); \
-}
-
-/*=======Automagically Detected Files To Include=====*/
-#include "unity.h"
-#include "cmock.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "CException.h"
-#include "one.h"
-#include "two.h"
-#include "funky.h"
-#include <setjmp.h>
-#include "Mockstanky.h"
-
-int GlobalExpectCount;
-int GlobalVerifyOrder;
-char* GlobalOrderError;
-
-/*=======External Functions This Runner Calls=====*/
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-/*=======Mock Management=====*/
-static void CMock_Init(void)
-{
-  GlobalExpectCount = 0;
-  GlobalVerifyOrder = 0;
-  GlobalOrderError = NULL;
-  Mockstanky_Init();
-}
-static void CMock_Verify(void)
-{
-  Mockstanky_Verify();
-}
-static void CMock_Destroy(void)
-{
-  Mockstanky_Destroy();
-}
-
-/*=======Test Reset Option=====*/
-void resetTest(void);
-void resetTest(void)
-{
-  CMock_Verify();
-  CMock_Destroy();
-  tearDown();
-  CMock_Init();
-  setUp();
-}
-
-
-/*=======MAIN=====*/
-int main(void)
-{
-  UnityBegin("testdata/mocksample.c");
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-
-  CMock_Guts_MemFreeFinal();
-  return (UnityEnd());
-}
diff --git a/Unity/test/expectdata/testsample_mock_new2.c b/Unity/test/expectdata/testsample_mock_new2.c
deleted file mode 100755
index ee63cdc0b..000000000
--- a/Unity/test/expectdata/testsample_mock_new2.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-/*=======Test Runner Used To Run Each Test Below=====*/
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  CMock_Init(); \
-  UNITY_CLR_DETAILS(); \
-  if (TEST_PROTECT()) \
-  { \
-      setUp(); \
-      TestFunc(); \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-    CMock_Verify(); \
-  } \
-  CMock_Destroy(); \
-  UnityConcludeTest(); \
-}
-
-/*=======Automagically Detected Files To Include=====*/
-#include "unity.h"
-#include "cmock.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "funky.h"
-#include <setjmp.h>
-#include "Mockstanky.h"
-
-/*=======External Functions This Runner Calls=====*/
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-/*=======Mock Management=====*/
-static void CMock_Init(void)
-{
-  Mockstanky_Init();
-}
-static void CMock_Verify(void)
-{
-  Mockstanky_Verify();
-}
-static void CMock_Destroy(void)
-{
-  Mockstanky_Destroy();
-}
-
-/*=======Suite Setup=====*/
-static int suite_setup(void)
-{
-a_custom_setup();
-}
-
-/*=======Suite Teardown=====*/
-static int suite_teardown(int num_failures)
-{
-a_custom_teardown();
-}
-
-/*=======Test Reset Option=====*/
-void resetTest(void);
-void resetTest(void)
-{
-  CMock_Verify();
-  CMock_Destroy();
-  tearDown();
-  CMock_Init();
-  setUp();
-}
-
-
-/*=======MAIN=====*/
-int main(void)
-{
-  suite_setup();
-  UnityBegin("testdata/mocksample.c");
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-
-  CMock_Guts_MemFreeFinal();
-  return suite_teardown(UnityEnd());
-}
diff --git a/Unity/test/expectdata/testsample_mock_param.c b/Unity/test/expectdata/testsample_mock_param.c
deleted file mode 100755
index a42b7deae..000000000
--- a/Unity/test/expectdata/testsample_mock_param.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-/*=======Test Runner Used To Run Each Test Below=====*/
-#define RUN_TEST_NO_ARGS
-#define RUN_TEST(TestFunc, TestLineNum, ...) \
-{ \
-  Unity.CurrentTestName = #TestFunc "(" #__VA_ARGS__ ")"; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  CMock_Init(); \
-  UNITY_CLR_DETAILS(); \
-  if (TEST_PROTECT()) \
-  { \
-      setUp(); \
-      TestFunc(__VA_ARGS__); \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-    CMock_Verify(); \
-  } \
-  CMock_Destroy(); \
-  UnityConcludeTest(); \
-}
-
-/*=======Automagically Detected Files To Include=====*/
-#include "unity.h"
-#include "cmock.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "funky.h"
-#include <setjmp.h>
-#include "Mockstanky.h"
-
-/*=======External Functions This Runner Calls=====*/
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-/*=======Mock Management=====*/
-static void CMock_Init(void)
-{
-  Mockstanky_Init();
-}
-static void CMock_Verify(void)
-{
-  Mockstanky_Verify();
-}
-static void CMock_Destroy(void)
-{
-  Mockstanky_Destroy();
-}
-
-/*=======Test Reset Option=====*/
-void resetTest(void);
-void resetTest(void)
-{
-  CMock_Verify();
-  CMock_Destroy();
-  tearDown();
-  CMock_Init();
-  setUp();
-}
-
-
-/*=======MAIN=====*/
-int main(void)
-{
-  UnityBegin("testdata/mocksample.c");
-  RUN_TEST(test_TheFirstThingToTest, 21, RUN_TEST_NO_ARGS);
-  RUN_TEST(test_TheSecondThingToTest, 43, RUN_TEST_NO_ARGS);
-
-  CMock_Guts_MemFreeFinal();
-  return (UnityEnd());
-}
diff --git a/Unity/test/expectdata/testsample_mock_run1.c b/Unity/test/expectdata/testsample_mock_run1.c
deleted file mode 100755
index 0061822e5..000000000
--- a/Unity/test/expectdata/testsample_mock_run1.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-/*=======Test Runner Used To Run Each Test Below=====*/
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  CMock_Init(); \
-  UNITY_CLR_DETAILS(); \
-  if (TEST_PROTECT()) \
-  { \
-    CEXCEPTION_T e; \
-    Try { \
-      setUp(); \
-      TestFunc(); \
-    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-    CMock_Verify(); \
-  } \
-  CMock_Destroy(); \
-  UnityConcludeTest(); \
-}
-
-/*=======Automagically Detected Files To Include=====*/
-#include "unity.h"
-#include "cmock.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "CException.h"
-#include "one.h"
-#include "two.h"
-#include "funky.h"
-#include <setjmp.h>
-#include "Mockstanky.h"
-
-int GlobalExpectCount;
-int GlobalVerifyOrder;
-char* GlobalOrderError;
-
-/*=======External Functions This Runner Calls=====*/
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-/*=======Mock Management=====*/
-static void CMock_Init(void)
-{
-  GlobalExpectCount = 0;
-  GlobalVerifyOrder = 0;
-  GlobalOrderError = NULL;
-  Mockstanky_Init();
-}
-static void CMock_Verify(void)
-{
-  Mockstanky_Verify();
-}
-static void CMock_Destroy(void)
-{
-  Mockstanky_Destroy();
-}
-
-/*=======Test Reset Option=====*/
-void resetTest(void);
-void resetTest(void)
-{
-  CMock_Verify();
-  CMock_Destroy();
-  tearDown();
-  CMock_Init();
-  setUp();
-}
-
-
-/*=======MAIN=====*/
-int main(void)
-{
-  UnityBegin("testdata/mocksample.c");
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-
-  CMock_Guts_MemFreeFinal();
-  return (UnityEnd());
-}
diff --git a/Unity/test/expectdata/testsample_mock_run2.c b/Unity/test/expectdata/testsample_mock_run2.c
deleted file mode 100755
index ee63cdc0b..000000000
--- a/Unity/test/expectdata/testsample_mock_run2.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-/*=======Test Runner Used To Run Each Test Below=====*/
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  CMock_Init(); \
-  UNITY_CLR_DETAILS(); \
-  if (TEST_PROTECT()) \
-  { \
-      setUp(); \
-      TestFunc(); \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-    CMock_Verify(); \
-  } \
-  CMock_Destroy(); \
-  UnityConcludeTest(); \
-}
-
-/*=======Automagically Detected Files To Include=====*/
-#include "unity.h"
-#include "cmock.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "funky.h"
-#include <setjmp.h>
-#include "Mockstanky.h"
-
-/*=======External Functions This Runner Calls=====*/
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-/*=======Mock Management=====*/
-static void CMock_Init(void)
-{
-  Mockstanky_Init();
-}
-static void CMock_Verify(void)
-{
-  Mockstanky_Verify();
-}
-static void CMock_Destroy(void)
-{
-  Mockstanky_Destroy();
-}
-
-/*=======Suite Setup=====*/
-static int suite_setup(void)
-{
-a_custom_setup();
-}
-
-/*=======Suite Teardown=====*/
-static int suite_teardown(int num_failures)
-{
-a_custom_teardown();
-}
-
-/*=======Test Reset Option=====*/
-void resetTest(void);
-void resetTest(void)
-{
-  CMock_Verify();
-  CMock_Destroy();
-  tearDown();
-  CMock_Init();
-  setUp();
-}
-
-
-/*=======MAIN=====*/
-int main(void)
-{
-  suite_setup();
-  UnityBegin("testdata/mocksample.c");
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-
-  CMock_Guts_MemFreeFinal();
-  return suite_teardown(UnityEnd());
-}
diff --git a/Unity/test/expectdata/testsample_mock_yaml.c b/Unity/test/expectdata/testsample_mock_yaml.c
deleted file mode 100755
index a24bb5a57..000000000
--- a/Unity/test/expectdata/testsample_mock_yaml.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-/*=======Test Runner Used To Run Each Test Below=====*/
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  CMock_Init(); \
-  UNITY_CLR_DETAILS(); \
-  if (TEST_PROTECT()) \
-  { \
-    CEXCEPTION_T e; \
-    Try { \
-      setUp(); \
-      TestFunc(); \
-    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-    CMock_Verify(); \
-  } \
-  CMock_Destroy(); \
-  UnityConcludeTest(); \
-}
-
-/*=======Automagically Detected Files To Include=====*/
-#include "unity.h"
-#include "cmock.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "CException.h"
-#include "two.h"
-#include "three.h"
-#include <four.h>
-#include "funky.h"
-#include <setjmp.h>
-#include "Mockstanky.h"
-
-/*=======External Functions This Runner Calls=====*/
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-
-
-/*=======Mock Management=====*/
-static void CMock_Init(void)
-{
-  Mockstanky_Init();
-}
-static void CMock_Verify(void)
-{
-  Mockstanky_Verify();
-}
-static void CMock_Destroy(void)
-{
-  Mockstanky_Destroy();
-}
-
-/*=======Suite Setup=====*/
-static int suite_setup(void)
-{
-a_yaml_setup();
-}
-
-/*=======Test Reset Option=====*/
-void resetTest(void);
-void resetTest(void)
-{
-  CMock_Verify();
-  CMock_Destroy();
-  tearDown();
-  CMock_Init();
-  setUp();
-}
-
-
-/*=======MAIN=====*/
-int main(void)
-{
-  suite_setup();
-  UnityBegin("testdata/mocksample.c");
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-
-  CMock_Guts_MemFreeFinal();
-  return (UnityEnd());
-}
diff --git a/Unity/test/expectdata/testsample_new1.c b/Unity/test/expectdata/testsample_new1.c
deleted file mode 100755
index 7dcd3fdfe..000000000
--- a/Unity/test/expectdata/testsample_new1.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-/*=======Test Runner Used To Run Each Test Below=====*/
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-    CEXCEPTION_T e; \
-    Try { \
-      setUp(); \
-      TestFunc(); \
-    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-/*=======Automagically Detected Files To Include=====*/
-#include "unity.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "CException.h"
-#include "one.h"
-#include "two.h"
-#include "funky.h"
-#include "stanky.h"
-#include <setjmp.h>
-
-int GlobalExpectCount;
-int GlobalVerifyOrder;
-char* GlobalOrderError;
-
-/*=======External Functions This Runner Calls=====*/
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-extern void test_TheThirdThingToTest(void);
-extern void test_TheFourthThingToTest(void);
-
-
-/*=======Test Reset Option=====*/
-void resetTest(void);
-void resetTest(void)
-{
-  tearDown();
-  setUp();
-}
-
-
-/*=======MAIN=====*/
-int main(void)
-{
-  UnityBegin("testdata/testsample.c");
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-  RUN_TEST(test_TheThirdThingToTest, 53);
-  RUN_TEST(test_TheFourthThingToTest, 58);
-
-  return (UnityEnd());
-}
diff --git a/Unity/test/expectdata/testsample_new2.c b/Unity/test/expectdata/testsample_new2.c
deleted file mode 100755
index c98c697f5..000000000
--- a/Unity/test/expectdata/testsample_new2.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-/*=======Test Runner Used To Run Each Test Below=====*/
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-      setUp(); \
-      TestFunc(); \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-/*=======Automagically Detected Files To Include=====*/
-#include "unity.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "funky.h"
-#include "stanky.h"
-#include <setjmp.h>
-
-/*=======External Functions This Runner Calls=====*/
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-extern void test_TheThirdThingToTest(void);
-extern void test_TheFourthThingToTest(void);
-
-
-/*=======Suite Setup=====*/
-static int suite_setup(void)
-{
-a_custom_setup();
-}
-
-/*=======Suite Teardown=====*/
-static int suite_teardown(int num_failures)
-{
-a_custom_teardown();
-}
-
-/*=======Test Reset Option=====*/
-void resetTest(void);
-void resetTest(void)
-{
-  tearDown();
-  setUp();
-}
-
-
-/*=======MAIN=====*/
-int main(void)
-{
-  suite_setup();
-  UnityBegin("testdata/testsample.c");
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-  RUN_TEST(test_TheThirdThingToTest, 53);
-  RUN_TEST(test_TheFourthThingToTest, 58);
-
-  return suite_teardown(UnityEnd());
-}
diff --git a/Unity/test/expectdata/testsample_param.c b/Unity/test/expectdata/testsample_param.c
deleted file mode 100755
index adf6c2626..000000000
--- a/Unity/test/expectdata/testsample_param.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-/*=======Test Runner Used To Run Each Test Below=====*/
-#define RUN_TEST_NO_ARGS
-#define RUN_TEST(TestFunc, TestLineNum, ...) \
-{ \
-  Unity.CurrentTestName = #TestFunc "(" #__VA_ARGS__ ")"; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-      setUp(); \
-      TestFunc(__VA_ARGS__); \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-/*=======Automagically Detected Files To Include=====*/
-#include "unity.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "funky.h"
-#include "stanky.h"
-#include <setjmp.h>
-
-/*=======External Functions This Runner Calls=====*/
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-extern void test_TheThirdThingToTest(void);
-extern void test_TheFourthThingToTest(void);
-
-
-/*=======Test Reset Option=====*/
-void resetTest(void);
-void resetTest(void)
-{
-  tearDown();
-  setUp();
-}
-
-
-/*=======MAIN=====*/
-int main(void)
-{
-  UnityBegin("testdata/testsample.c");
-  RUN_TEST(test_TheFirstThingToTest, 21, RUN_TEST_NO_ARGS);
-  RUN_TEST(test_TheSecondThingToTest, 43, RUN_TEST_NO_ARGS);
-  RUN_TEST(test_TheThirdThingToTest, 53, RUN_TEST_NO_ARGS);
-  RUN_TEST(test_TheFourthThingToTest, 58, RUN_TEST_NO_ARGS);
-
-  return (UnityEnd());
-}
diff --git a/Unity/test/expectdata/testsample_run1.c b/Unity/test/expectdata/testsample_run1.c
deleted file mode 100755
index 7dcd3fdfe..000000000
--- a/Unity/test/expectdata/testsample_run1.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-/*=======Test Runner Used To Run Each Test Below=====*/
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-    CEXCEPTION_T e; \
-    Try { \
-      setUp(); \
-      TestFunc(); \
-    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-/*=======Automagically Detected Files To Include=====*/
-#include "unity.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "CException.h"
-#include "one.h"
-#include "two.h"
-#include "funky.h"
-#include "stanky.h"
-#include <setjmp.h>
-
-int GlobalExpectCount;
-int GlobalVerifyOrder;
-char* GlobalOrderError;
-
-/*=======External Functions This Runner Calls=====*/
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-extern void test_TheThirdThingToTest(void);
-extern void test_TheFourthThingToTest(void);
-
-
-/*=======Test Reset Option=====*/
-void resetTest(void);
-void resetTest(void)
-{
-  tearDown();
-  setUp();
-}
-
-
-/*=======MAIN=====*/
-int main(void)
-{
-  UnityBegin("testdata/testsample.c");
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-  RUN_TEST(test_TheThirdThingToTest, 53);
-  RUN_TEST(test_TheFourthThingToTest, 58);
-
-  return (UnityEnd());
-}
diff --git a/Unity/test/expectdata/testsample_run2.c b/Unity/test/expectdata/testsample_run2.c
deleted file mode 100755
index c98c697f5..000000000
--- a/Unity/test/expectdata/testsample_run2.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-/*=======Test Runner Used To Run Each Test Below=====*/
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-      setUp(); \
-      TestFunc(); \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-/*=======Automagically Detected Files To Include=====*/
-#include "unity.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "funky.h"
-#include "stanky.h"
-#include <setjmp.h>
-
-/*=======External Functions This Runner Calls=====*/
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-extern void test_TheThirdThingToTest(void);
-extern void test_TheFourthThingToTest(void);
-
-
-/*=======Suite Setup=====*/
-static int suite_setup(void)
-{
-a_custom_setup();
-}
-
-/*=======Suite Teardown=====*/
-static int suite_teardown(int num_failures)
-{
-a_custom_teardown();
-}
-
-/*=======Test Reset Option=====*/
-void resetTest(void);
-void resetTest(void)
-{
-  tearDown();
-  setUp();
-}
-
-
-/*=======MAIN=====*/
-int main(void)
-{
-  suite_setup();
-  UnityBegin("testdata/testsample.c");
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-  RUN_TEST(test_TheThirdThingToTest, 53);
-  RUN_TEST(test_TheFourthThingToTest, 58);
-
-  return suite_teardown(UnityEnd());
-}
diff --git a/Unity/test/expectdata/testsample_yaml.c b/Unity/test/expectdata/testsample_yaml.c
deleted file mode 100755
index 3316024df..000000000
--- a/Unity/test/expectdata/testsample_yaml.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* AUTOGENERATED FILE. DO NOT EDIT. */
-
-/*=======Test Runner Used To Run Each Test Below=====*/
-#define RUN_TEST(TestFunc, TestLineNum) \
-{ \
-  Unity.CurrentTestName = #TestFunc; \
-  Unity.CurrentTestLineNumber = TestLineNum; \
-  Unity.NumberOfTests++; \
-  if (TEST_PROTECT()) \
-  { \
-    CEXCEPTION_T e; \
-    Try { \
-      setUp(); \
-      TestFunc(); \
-    } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
-  } \
-  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
-  { \
-    tearDown(); \
-  } \
-  UnityConcludeTest(); \
-}
-
-/*=======Automagically Detected Files To Include=====*/
-#include "unity.h"
-#include <setjmp.h>
-#include <stdio.h>
-#include "CException.h"
-#include "two.h"
-#include "three.h"
-#include <four.h>
-#include "funky.h"
-#include "stanky.h"
-#include <setjmp.h>
-
-/*=======External Functions This Runner Calls=====*/
-extern void setUp(void);
-extern void tearDown(void);
-extern void test_TheFirstThingToTest(void);
-extern void test_TheSecondThingToTest(void);
-extern void test_TheThirdThingToTest(void);
-extern void test_TheFourthThingToTest(void);
-
-
-/*=======Suite Setup=====*/
-static int suite_setup(void)
-{
-a_yaml_setup();
-}
-
-/*=======Test Reset Option=====*/
-void resetTest(void);
-void resetTest(void)
-{
-  tearDown();
-  setUp();
-}
-
-
-/*=======MAIN=====*/
-int main(void)
-{
-  suite_setup();
-  UnityBegin("testdata/testsample.c");
-  RUN_TEST(test_TheFirstThingToTest, 21);
-  RUN_TEST(test_TheSecondThingToTest, 43);
-  RUN_TEST(test_TheThirdThingToTest, 53);
-  RUN_TEST(test_TheFourthThingToTest, 58);
-
-  return (UnityEnd());
-}
diff --git a/Unity/test/rakefile b/Unity/test/rakefile
deleted file mode 100755
index 4a2f3d2c1..000000000
--- a/Unity/test/rakefile
+++ /dev/null
@@ -1,125 +0,0 @@
-# ==========================================
-#   Unity Project - A Test Framework for C
-#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
-#   [Released under MIT License. Please refer to license.txt for details]
-# ==========================================
-
-UNITY_ROOT = File.expand_path(File.dirname(__FILE__)) + '/'
-$verbose = false
-
-require 'rake'
-require 'rake/clean'
-require UNITY_ROOT + 'rakefile_helper'
-require 'rspec/core/rake_task'
-
-TEMP_DIRS = [
-	File.join(UNITY_ROOT, 'build'),
-	File.join(UNITY_ROOT, 'sandbox')
-]
-
-TEMP_DIRS.each do |dir|
-  directory(dir)
-  CLOBBER.include(dir)
-end
-
-task :prepare_for_tests => TEMP_DIRS
-
-include RakefileHelpers
-
-# Load proper GCC as defult configuration
-DEFAULT_CONFIG_FILE = 'gcc_auto_stdint.yml'
-configure_toolchain(DEFAULT_CONFIG_FILE)
-
-desc "Test unity with its own unit tests"
-task :unit => [:prepare_for_tests] do
-  run_tests unit_test_files
-end
-
-desc "Test unity's helper scripts"
-task :scripts => [:prepare_for_tests] do
-  Dir['tests/test_*.rb'].each do |scriptfile|
-    require "./"+scriptfile
-  end
-end
-
-desc "Run all rspecs"
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.pattern = 'spec/**/*_spec.rb'
-end
-
-desc "Generate test summary"
-task :summary do
-  report_summary
-end
-
-desc "Build and test Unity"
-task :all => [:clean, :prepare_for_tests, :scripts, :unit, :style, :summary]
-task :default => [:clobber, :all]
-task :ci => [:no_color, :default]
-task :cruise => [:no_color, :default]
-
-desc "Load configuration"
-task :config, :config_file do |t, args|
-  configure_toolchain(args[:config_file])
-end
-
-task :no_color do
-  $colour_output = false
-end
-
-task :verbose do
-  $verbose = true
-end
-
-namespace :style do
-  desc "Check style"
-  task :check do
-    report "\nVERIFYING RUBY STYLE"
-    report execute("rubocop ../auto ../examples ../extras --config .rubocop.yml", true)
-    report "Styling Ruby:PASS"
-  end
-
-  namespace :check do
-    Dir['../**/*.rb'].each do |f|
-      filename = File.basename(f, '.rb')
-      desc "Check Style of #{filename}"
-      task filename.to_sym => ['style:clean'] do
-        report execute("rubocop #{f} --color --config .rubocop.yml", true)
-        report "Style Checked for #{f}"
-      end
-    end
-  end
-
-  desc "Fix Style of all C Code"
-  task :c do
-    run_astyle("../src/*.* ../extras/fixture/src/*.*")
-  end
-
-  namespace :c do
-    Dir['../{src,extras/**}/*.{c,h}'].each do |f|
-      filename = File.basename(f)[0..-3]
-      desc "Check Style of #{filename}"
-      task filename.to_sym do
-        run_astyle f
-      end
-    end
-  end
-
-  desc "Attempt to Autocorrect style"
-  task :auto  => ['style:clean'] do
-    execute("rubocop ../auto ../examples ../extras --auto-correct --config .rubocop.yml")
-    report "Autocorrected What We Could."
-  end
-
-  desc "Update style todo list"
-  task :todo  => ['style:clean'] do
-    execute("rubocop ../auto ../examples ../extras --auto-gen-config --config .rubocop.yml")
-    report "Updated Style TODO List."
-  end
-
-  task :clean do
-    File.delete(".rubocop_todo.yml") if File.exists?(".rubocop_todo.yml")
-  end
-end
-
-task :style => ['style:check']
diff --git a/Unity/test/rakefile_helper.rb b/Unity/test/rakefile_helper.rb
deleted file mode 100755
index 1fd60c5fd..000000000
--- a/Unity/test/rakefile_helper.rb
+++ /dev/null
@@ -1,260 +0,0 @@
-# ==========================================
-#   Unity Project - A Test Framework for C
-#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
-#   [Released under MIT License. Please refer to license.txt for details]
-# ==========================================
-
-require 'yaml'
-require 'fileutils'
-require UNITY_ROOT + '../auto/unity_test_summary'
-require UNITY_ROOT + '../auto/generate_test_runner'
-require UNITY_ROOT + '../auto/colour_reporter'
-
-module RakefileHelpers
-  C_EXTENSION = '.c'.freeze
-  def load_configuration(config_file)
-    return if $configured
-
-    $cfg_file = "targets/#{config_file}" unless config_file =~ /[\\|\/]/
-    $cfg = YAML.load(File.read($cfg_file))
-    $colour_output = false unless $cfg['colour']
-    $configured = true if config_file != DEFAULT_CONFIG_FILE
-  end
-
-  def configure_clean
-    CLEAN.include($cfg['compiler']['build_path'] + '*.*') unless $cfg['compiler']['build_path'].nil?
-  end
-
-  def configure_toolchain(config_file = DEFAULT_CONFIG_FILE)
-    config_file += '.yml' unless config_file =~ /\.yml$/
-    config_file = config_file unless config_file =~ /[\\|\/]/
-    load_configuration(config_file)
-    configure_clean
-  end
-
-  def unit_test_files
-    path = $cfg['compiler']['unit_tests_path'] + 'test*' + C_EXTENSION
-    path.tr!('\\', '/')
-    FileList.new(path)
-  end
-
-  def local_include_dirs
-    include_dirs = $cfg['compiler']['includes']['items'].dup
-    include_dirs.delete_if { |dir| dir.is_a?(Array) }
-    include_dirs
-  end
-
-  def extract_headers(filename)
-    includes = []
-    lines = File.readlines(filename)
-    lines.each do |line|
-      m = line.match(/^\s*#include\s+\"\s*(.+\.[hH])\s*\"/)
-      includes << m[1] unless m.nil?
-    end
-    includes
-  end
-
-  def find_source_file(header, paths)
-    paths.each do |dir|
-      src_file = dir + header.ext(C_EXTENSION)
-      return src_file if File.exist?(src_file)
-    end
-    nil
-  end
-
-  def tackit(strings)
-    result = if strings.is_a?(Array)
-               "\"#{strings.join}\""
-             else
-               strings
-             end
-    result
-  end
-
-  def squash(prefix, items)
-    result = ''
-    items.each { |item| result += " #{prefix}#{tackit(item)}" }
-    result
-  end
-
-  def should(behave, &block)
-    if block
-      puts 'Should ' + behave
-      yield block
-    else
-      puts "UNIMPLEMENTED CASE: Should #{behave}"
-    end
-  end
-
-  def build_compiler_fields(inject_defines)
-    command = tackit($cfg['compiler']['path'])
-    defines = if $cfg['compiler']['defines']['items'].nil?
-                ''
-              else
-                squash($cfg['compiler']['defines']['prefix'], $cfg['compiler']['defines']['items'] + ['UNITY_OUTPUT_CHAR=putcharSpy'] + ['UNITY_OUTPUT_CHAR_HEADER_DECLARATION=putcharSpy\(int\)'] + inject_defines)
-              end
-    options = squash('', $cfg['compiler']['options'])
-    includes = squash($cfg['compiler']['includes']['prefix'], $cfg['compiler']['includes']['items'])
-    includes = includes.gsub(/\\ /, ' ').gsub(/\\\"/, '"').gsub(/\\$/, '') # Remove trailing slashes (for IAR)
-
-    { :command => command, :defines => defines, :options => options, :includes => includes }
-  end
-
-  def compile(file, defines = [])
-    compiler = build_compiler_fields(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']}"
-    execute(cmd_str + obj_file)
-
-    obj_file
-  end
-
-  def build_linker_fields
-    command = tackit($cfg['linker']['path'])
-    options = if $cfg['linker']['options'].nil?
-                ''
-              else
-                squash('', $cfg['linker']['options'])
-              end
-    includes = if $cfg['linker']['includes'].nil? || $cfg['linker']['includes']['items'].nil?
-                 ''
-               else
-                 squash($cfg['linker']['includes']['prefix'], $cfg['linker']['includes']['items'])
-               end.gsub(/\\ /, ' ').gsub(/\\\"/, '"').gsub(/\\$/, '') # Remove trailing slashes (for IAR)
-
-    { :command => command, :options => options, :includes => includes }
-  end
-
-  def link_it(exe_name, obj_list)
-    linker = build_linker_fields
-    cmd_str = "#{linker[:command]}#{linker[:options]}#{linker[:includes]} " +
-              (obj_list.map { |obj| "#{$cfg['linker']['object_files']['path']}#{obj} " }).join +
-              $cfg['linker']['bin_files']['prefix'] + ' ' +
-              $cfg['linker']['bin_files']['destination'] +
-              exe_name + $cfg['linker']['bin_files']['extension']
-    execute(cmd_str)
-  end
-
-  def build_simulator_fields
-    return nil if $cfg['simulator'].nil?
-    command = if $cfg['simulator']['path'].nil?
-                ''
-              else
-                (tackit($cfg['simulator']['path']) + ' ')
-              end
-    pre_support = if $cfg['simulator']['pre_support'].nil?
-                    ''
-                  else
-                    squash('', $cfg['simulator']['pre_support'])
-                  end
-    post_support = if $cfg['simulator']['post_support'].nil?
-                     ''
-                   else
-                     squash('', $cfg['simulator']['post_support'])
-                   end
-
-    { :command => command, :pre_support => pre_support, :post_support => post_support }
-  end
-
-  def run_astyle(style_what)
-    report "Styling C Code..."
-    command = "AStyle " \
-              "--style=allman --indent=spaces=4 --indent-switches --indent-preproc-define --indent-preproc-block " \
-              "--pad-oper --pad-comma --unpad-paren --pad-header " \
-              "--align-pointer=type --align-reference=name " \
-              "--add-brackets --mode=c --suffix=none " \
-              "#{style_what}"
-    execute(command, false)
-    report "Styling C:PASS"
-  end
-
-  def execute(command_string, ok_to_fail = false)
-    report command_string if $verbose
-    output = `#{command_string}`.chomp
-    report(output) if $verbose && !output.nil? && !output.empty?
-    raise "Command failed. (Returned #{$?.exitstatus})" if !$?.exitstatus.zero? && !ok_to_fail
-    output
-  end
-
-  def report_summary
-    summary = UnityTestSummary.new
-    summary.root = UNITY_ROOT
-    results_glob = "#{$cfg['compiler']['build_path']}*.test*"
-    results_glob.tr!('\\', '/')
-    results = Dir[results_glob]
-    summary.targets = results
-    report summary.run
-  end
-
-  def run_tests(test_files)
-    report 'Running Unity system tests...'
-
-    # Tack on TEST define for compiling unit tests
-    load_configuration($cfg_file)
-    test_defines = ['TEST']
-    $cfg['compiler']['defines']['items'] ||= []
-    $cfg['compiler']['defines']['items'] << 'TEST'
-
-    include_dirs = local_include_dirs
-
-    # Build and execute each unit test
-    test_files.each do |test|
-      obj_list = []
-
-      unless $cfg['compiler']['aux_sources'].nil?
-        $cfg['compiler']['aux_sources'].each do |aux|
-          obj_list << compile(aux, test_defines)
-        end
-      end
-
-      # Detect dependencies and build required modules
-      extract_headers(test).each do |header|
-        # Compile corresponding source file if it exists
-        src_file = find_source_file(header, include_dirs)
-
-        obj_list << compile(src_file, test_defines) unless src_file.nil?
-      end
-
-      # Build the test runner (generate if configured to do so)
-      test_base = File.basename(test, C_EXTENSION)
-
-      runner_name = test_base + '_Runner.c'
-
-      runner_path = if $cfg['compiler']['runner_path'].nil?
-                      $cfg['compiler']['build_path'] + runner_name
-                    else
-                      $cfg['compiler']['runner_path'] + runner_name
-                    end
-
-      options = $cfg[:unity]
-      options[:use_param_tests] = test =~ /parameterized/ ? true : false
-      UnityTestRunnerGenerator.new(options).run(test, runner_path)
-      obj_list << compile(runner_path, test_defines)
-
-      # Build the test module
-      obj_list << compile(test, test_defines)
-
-      # Link the test executable
-      link_it(test_base, obj_list)
-
-      # Execute unit test and generate results file
-      simulator = build_simulator_fields
-      executable = $cfg['linker']['bin_files']['destination'] + test_base + $cfg['linker']['bin_files']['extension']
-      cmd_str = if simulator.nil?
-                  executable
-                else
-                  "#{simulator[:command]} #{simulator[:pre_support]} #{executable} #{simulator[:post_support]}"
-                end
-      output = execute(cmd_str)
-      test_results = $cfg['compiler']['build_path'] + test_base
-      if output.match(/OK$/m).nil?
-        test_results += '.testfail'
-      else
-        report output unless $verbose # Verbose already prints this line, as does a failure
-        test_results += '.testpass'
-      end
-      File.open(test_results, 'w') { |f| f.print output }
-    end
-  end
-end
diff --git a/Unity/test/spec/generate_module_existing_file_spec.rb b/Unity/test/spec/generate_module_existing_file_spec.rb
deleted file mode 100755
index 74e7fc840..000000000
--- a/Unity/test/spec/generate_module_existing_file_spec.rb
+++ /dev/null
@@ -1,158 +0,0 @@
-
-require '../auto/generate_module.rb'
-require 'fileutils'
-
-def touch_src(file)
-  FileUtils.touch "sandbox/src/#{file}"
-end
-
-def touch_test(file)
-  FileUtils.touch "sandbox/test/#{file}"
-end
-
-def create_src_with_known_content(file)
-  File.open("sandbox/src/#{file}", "w") {|f| f.write("the original #{file}")}
-end
-
-def create_test_with_known_content(file)
-  File.open("sandbox/test/#{file}", "w") {|f| f.write("the original #{file}")}
-end
-
-def expect_src_content_didnt_change(file)
-  expect(File.read("sandbox/src/#{file}")).to eq("the original #{file}")
-end
-
-def expect_test_content_didnt_change(file)
-  expect(File.read("sandbox/test/#{file}")).to eq("the original #{file}")
-end
-
-def expect_src_file_to_exist(file)
-  expect(File.exist?("sandbox/src/#{file}")).to be true
-end
-
-def expect_test_file_to_exist(file)
-  expect(File.exist?("sandbox/test/#{file}")).to be true
-end
-
-describe "UnityModuleGenerator" do
-
-  before do
-    # clean sandbox and setup our "project" folders
-    FileUtils.rm_rf "sandbox"
-    FileUtils.mkdir_p "sandbox"
-    FileUtils.mkdir_p "sandbox/src"
-    FileUtils.mkdir_p "sandbox/test"
-
-    @options = {
-      :path_src => "sandbox/src",
-      :path_tst => "sandbox/test",
-    }
-  end
-
-  context "with src pattern" do
-    before do
-      @options[:pattern] = "src"
-    end
-
-    it "fails when all files already exist" do
-      # create an existing triad of files
-      touch_src "meh.c"
-      touch_src "meh.h"
-      touch_test "Testmeh.c"
-      expect {
-        UnityModuleGenerator.new(@options).generate("meh")
-      }.to raise_error("ERROR: File meh already exists. Exiting.")
-    end
-
-    it "creates the test file if the source and header files exist" do
-      # Create the existing files.
-      touch_src "meh.c"
-      touch_src "meh.h"
-
-      UnityModuleGenerator.new(@options).generate("meh")
-
-      expect_test_file_to_exist "Testmeh.c"
-    end
-
-    it "does not alter existing files" do
-      # Create some files with known content.
-      create_src_with_known_content "meh.c"
-      create_src_with_known_content "meh.h"
-
-      UnityModuleGenerator.new(@options).generate("meh")
-
-      expect_src_content_didnt_change "meh.c"
-      expect_src_content_didnt_change "meh.c"
-    end
-
-    it "does not alter existing test files" do
-      # Create some files with known content.
-      create_test_with_known_content "Testmeh.c"
-
-      UnityModuleGenerator.new(@options).generate("meh")
-
-      expect_test_content_didnt_change "Testmeh.c"
-    end
-
-  end
-
-  context "with mch pattern" do
-    before do
-      @options[:pattern] = "mch"
-    end
-
-    it "fails when all files exist" do
-        touch_src "meh_model.c"
-        touch_src "meh_conductor.c"
-        touch_src "meh_hardware.c"
-        touch_src "meh_model.h"
-        touch_src "meh_conductor.h"
-        touch_src "meh_hardware.h"
-        touch_test "Testmeh_model.c"
-        touch_test "Testmeh_conductor.c"
-        touch_test "Testmeh_hardware.c"
-        expect {
-          UnityModuleGenerator.new(@options).generate("meh")
-        }.to raise_error("ERROR: File meh_model already exists. Exiting.")
-    end
-
-    it "creates files that don't exist" do
-      touch_src "meh_model.c"
-      touch_src "meh_conductor.c"
-      touch_src "meh_hardware.c"
-      touch_src "meh_model.h"
-      touch_src "meh_conductor.h"
-
-      UnityModuleGenerator.new(@options).generate("meh")
-
-      expect_src_file_to_exist "meh_hardware.h"
-      expect_test_file_to_exist "Testmeh_model.c"
-      expect_test_file_to_exist "Testmeh_conductor.c"
-      expect_test_file_to_exist "Testmeh_hardware.c"
-    end
-
-    it "does not alter existing source files" do
-      create_src_with_known_content "meh_model.c"
-      create_src_with_known_content "meh_model.c"
-      create_src_with_known_content "meh_model.c"
-      create_src_with_known_content "meh_model.h"
-      create_src_with_known_content "meh_model.c"
-
-      UnityModuleGenerator.new(@options).generate("meh")
-
-      expect_src_content_didnt_change "meh_model.c"
-      expect_src_content_didnt_change "meh_model.c"
-      expect_src_content_didnt_change "meh_model.c"
-      expect_src_content_didnt_change "meh_model.c"
-    end
-
-    it "does not alter existing test files" do
-      create_test_with_known_content "Testmeh_model.c"
-
-      UnityModuleGenerator.new(@options).generate("meh")
-
-      expect_test_content_didnt_change "Testmeh_model.c"
-    end
-
-  end
-end
diff --git a/Unity/test/targets/clang_file.yml b/Unity/test/targets/clang_file.yml
deleted file mode 100755
index df1bd24e3..000000000
--- a/Unity/test/targets/clang_file.yml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-compiler:
-  path: clang
-  source_path:     '../src/'
-  unit_tests_path: &unit_tests_path 'tests/'
-  build_path:      &build_path 'build/'
-  options:
-    - '-c'
-    - '-Wall'
-    - '-Wextra'
-    - '-Werror'
-    - '-Wcast-qual'
-    - '-Wconversion'
-    - '-Wdisabled-optimization'
-    - '-Wformat=2'
-    - '-Winit-self'
-    - '-Winline'
-    - '-Winvalid-pch'
-    - '-Wmissing-include-dirs'
-    - '-Wnonnull'
-    - '-Wpacked'
-    - '-Wpointer-arith'
-    - '-Wswitch-default'
-    - '-Wstrict-aliasing'
-    - '-Wstrict-overflow=5'
-    - '-Wuninitialized'
-    - '-Wunused'
-#   - '-Wunreachable-code'
-    - '-Wreturn-type'
-    - '-Wshadow'
-    - '-Wundef'
-    - '-Wwrite-strings'
-    - '-Wno-nested-externs'
-    - '-Wno-unused-parameter'
-    - '-Wno-variadic-macros'
-    - '-Wbad-function-cast'
-    - '-fms-extensions'
-    - '-fno-omit-frame-pointer'
-    - '-ffloat-store'
-    - '-fno-common'
-    - '-fstrict-aliasing'
-    - '-std=gnu99'
-    - '-pedantic'
-    - '-O0'
-  includes:
-    prefix: '-I'
-    items:
-      - 'src/'
-      - '../src/'
-      - 'testdata/'
-      - *unit_tests_path
-  defines:
-    prefix: '-D'
-    items:
-      - UNITY_INCLUDE_DOUBLE
-      - UNITY_SUPPORT_64
-      - UNITY_OUTPUT_RESULTS_FILE
-  object_files:
-    prefix: '-o'
-    extension: '.o'
-    destination: *build_path
-linker:
-  path: clang
-  options:
-    - -lm
-    - '-m64'
-  includes:
-    prefix: '-I'
-  object_files:
-    path: *build_path
-    extension: '.o'
-  bin_files:
-    prefix: '-o'
-    extension: '.exe'
-    destination: *build_path
-colour: true
-:unity:
-  :plugins: []
diff --git a/Unity/test/targets/clang_strict.yml b/Unity/test/targets/clang_strict.yml
deleted file mode 100755
index ee05b2a99..000000000
--- a/Unity/test/targets/clang_strict.yml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-compiler:
-  path: clang
-  source_path:     '../src/'
-  unit_tests_path: &unit_tests_path 'tests/'
-  build_path:      &build_path 'build/'
-  options:
-    - '-c'
-    - '-Wall'
-    - '-Wextra'
-    - '-Werror'
-    - '-Wcast-qual'
-    - '-Wconversion'
-    - '-Wdisabled-optimization'
-    - '-Wformat=2'
-    - '-Winit-self'
-    - '-Winline'
-    - '-Winvalid-pch'
-    - '-Wmissing-include-dirs'
-    - '-Wnonnull'
-    - '-Wpacked'
-    - '-Wpointer-arith'
-    - '-Wswitch-default'
-    - '-Wstrict-aliasing'
-    - '-Wstrict-overflow=5'
-    - '-Wuninitialized'
-    - '-Wunused'
-#   - '-Wunreachable-code'
-    - '-Wreturn-type'
-    - '-Wshadow'
-    - '-Wundef'
-    - '-Wwrite-strings'
-    - '-Wno-nested-externs'
-    - '-Wno-unused-parameter'
-    - '-Wno-variadic-macros'
-    - '-Wbad-function-cast'
-    - '-fms-extensions'
-    - '-fno-omit-frame-pointer'
-    #- '-ffloat-store'
-    - '-fno-common'
-    - '-fstrict-aliasing'
-    - '-std=gnu99'
-    - '-pedantic'
-    - '-O0'
-  includes:
-    prefix: '-I'
-    items:
-      - 'src/'
-      - '../src/'
-      - 'testdata/'
-      - *unit_tests_path
-  defines:
-    prefix: '-D'
-    items:
-      - UNITY_INCLUDE_DOUBLE
-      - UNITY_SUPPORT_TEST_CASES
-      - UNITY_SUPPORT_64
-  object_files:
-    prefix: '-o'
-    extension: '.o'
-    destination: *build_path
-linker:
-  path: clang
-  options:
-    - -lm
-    - '-m64'
-  includes:
-    prefix: '-I'
-  object_files:
-    path: *build_path
-    extension: '.o'
-  bin_files:
-    prefix: '-o'
-    extension: '.exe'
-    destination: *build_path
-colour: true
-:unity:
-  :plugins: []
diff --git a/Unity/test/targets/gcc_32.yml b/Unity/test/targets/gcc_32.yml
deleted file mode 100755
index ec1165da0..000000000
--- a/Unity/test/targets/gcc_32.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-compiler:
-  path: gcc
-  source_path:     '../src/'
-  unit_tests_path: &unit_tests_path 'tests/'
-  build_path:      &build_path 'build/'
-  options:
-    - '-c'
-    - '-m32'
-    - '-Wall'
-    - '-Wno-address'
-    - '-std=c99'
-    - '-pedantic'
-  includes:
-    prefix: '-I'
-    items:
-      - 'src/'
-      - '../src/'
-      - 'testdata/'
-      - *unit_tests_path
-  defines:
-    prefix: '-D'
-    items:
-      - UNITY_EXCLUDE_STDINT_H
-      - UNITY_EXCLUDE_LIMITS_H
-      - UNITY_INCLUDE_DOUBLE
-      - UNITY_SUPPORT_TEST_CASES
-      - UNITY_INT_WIDTH=32
-      - UNITY_LONG_WIDTH=32
-  object_files:
-    prefix: '-o'
-    extension: '.o'
-    destination: *build_path
-linker:
-  path: gcc
-  options:
-    - -lm
-    - '-m32'
-  includes:
-    prefix: '-I'
-  object_files:
-    path: *build_path
-    extension: '.o'
-  bin_files:
-    prefix: '-o'
-    extension: '.exe'
-    destination: *build_path
-colour: true
-:unity:
-  :plugins: []
diff --git a/Unity/test/targets/gcc_64.yml b/Unity/test/targets/gcc_64.yml
deleted file mode 100755
index 0e273de8f..000000000
--- a/Unity/test/targets/gcc_64.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-compiler:
-  path: gcc
-  source_path:     '../src/'
-  unit_tests_path: &unit_tests_path 'tests/'
-  build_path:      &build_path 'build/'
-  options:
-    - '-c'
-    - '-m64'
-    - '-Wall'
-    - '-Wno-address'
-    - '-std=c99'
-    - '-pedantic'
-  includes:
-    prefix: '-I'
-    items:
-      - 'src/'
-      - '../src/'
-      - 'testdata/'
-      - *unit_tests_path
-  defines:
-    prefix: '-D'
-    items:
-      - UNITY_EXCLUDE_STDINT_H
-      - UNITY_EXCLUDE_LIMITS_H
-      - UNITY_INCLUDE_DOUBLE
-      - UNITY_SUPPORT_TEST_CASES
-      - UNITY_SUPPORT_64
-      - UNITY_INT_WIDTH=32
-      - UNITY_LONG_WIDTH=64
-  object_files:
-    prefix: '-o'
-    extension: '.o'
-    destination: *build_path
-linker:
-  path: gcc
-  options:
-    - -lm
-    - '-m64'
-  includes:
-    prefix: '-I'
-  object_files:
-    path: *build_path
-    extension: '.o'
-  bin_files:
-    prefix: '-o'
-    extension: '.exe'
-    destination: *build_path
-colour: true
-:unity:
-  :plugins: []
diff --git a/Unity/test/targets/gcc_auto_limits.yml b/Unity/test/targets/gcc_auto_limits.yml
deleted file mode 100755
index 40088ac43..000000000
--- a/Unity/test/targets/gcc_auto_limits.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-compiler:
-  path: gcc
-  source_path:     '../src/'
-  unit_tests_path: &unit_tests_path 'tests/'
-  build_path:      &build_path 'build/'
-  options:
-    - '-c'
-    - '-m64'
-    - '-Wall'
-    - '-Wno-address'
-    - '-std=c99'
-    - '-pedantic'
-  includes:
-    prefix: '-I'
-    items:
-      - 'src/'
-      - '../src/'
-      - 'testdata/'
-      - *unit_tests_path
-  defines:
-    prefix: '-D'
-    items:
-      - UNITY_EXCLUDE_STDINT_H
-      - UNITY_INCLUDE_DOUBLE
-      - UNITY_SUPPORT_TEST_CASES
-      - UNITY_SUPPORT_64
-  object_files:
-    prefix: '-o'
-    extension: '.o'
-    destination: *build_path
-linker:
-  path: gcc
-  options:
-    - -lm
-    - '-m64'
-  includes:
-    prefix: '-I'
-  object_files:
-    path: *build_path
-    extension: '.o'
-  bin_files:
-    prefix: '-o'
-    extension: '.exe'
-    destination: *build_path
-colour: true
-:unity:
-  :plugins: []
diff --git a/Unity/test/targets/gcc_auto_stdint.yml b/Unity/test/targets/gcc_auto_stdint.yml
deleted file mode 100755
index f12165cd1..000000000
--- a/Unity/test/targets/gcc_auto_stdint.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-compiler:
-  path: gcc
-  source_path:     '../src/'
-  unit_tests_path: &unit_tests_path 'tests/'
-  build_path:      &build_path 'build/'
-  options:
-    - '-c'
-    - '-m64'
-    - '-Wall'
-    - '-Wno-address'
-    - '-std=c99'
-    - '-pedantic'
-    - '-Wextra'
-    - '-Werror'
-    - '-Wpointer-arith'
-    - '-Wcast-align'
-    - '-Wwrite-strings'
-    - '-Wswitch-default'
-    - '-Wunreachable-code'
-    - '-Winit-self'
-    - '-Wmissing-field-initializers'
-    - '-Wno-unknown-pragmas'
-    - '-Wstrict-prototypes'
-    - '-Wundef'
-    - '-Wold-style-definition'
-  includes:
-    prefix: '-I'
-    items:
-      - 'src/'
-      - '../src/'
-      - 'testdata/'
-      - *unit_tests_path
-  defines:
-    prefix: '-D'
-    items:
-      - UNITY_INCLUDE_DOUBLE
-      - UNITY_SUPPORT_TEST_CASES
-      - UNITY_SUPPORT_64
-  object_files:
-    prefix: '-o'
-    extension: '.o'
-    destination: *build_path
-linker:
-  path: gcc
-  options:
-    - -lm
-    - '-m64'
-  includes:
-    prefix: '-I'
-  object_files:
-    path: *build_path
-    extension: '.o'
-  bin_files:
-    prefix: '-o'
-    extension: '.exe'
-    destination: *build_path
-colour: true
-:unity:
-  :plugins: []
diff --git a/Unity/test/targets/gcc_manual_math.yml b/Unity/test/targets/gcc_manual_math.yml
deleted file mode 100755
index b379e3fc4..000000000
--- a/Unity/test/targets/gcc_manual_math.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-compiler:
-  path: gcc
-  source_path:     '../src/'
-  unit_tests_path: &unit_tests_path 'tests/'
-  build_path:      &build_path 'build/'
-  options:
-    - '-c'
-    - '-m64'
-    - '-Wall'
-    - '-Wno-address'
-    - '-std=c99'
-    - '-pedantic'
-  includes:
-    prefix: '-I'
-    items:
-      - 'src/'
-      - '../src/'
-      - 'testdata/'
-      - *unit_tests_path
-  defines:
-    prefix: '-D'
-    items:
-      - UNITY_EXCLUDE_MATH_H
-      - UNITY_INCLUDE_DOUBLE
-      - UNITY_SUPPORT_TEST_CASES
-      - UNITY_SUPPORT_64
-  object_files:
-    prefix: '-o'
-    extension: '.o'
-    destination: *build_path
-linker:
-  path: gcc
-  options:
-    - -lm
-    - '-m64'
-  includes:
-    prefix: '-I'
-  object_files:
-    path: *build_path
-    extension: '.o'
-  bin_files:
-    prefix: '-o'
-    extension: '.exe'
-    destination: *build_path
-colour: true
-:unity:
-  :plugins: []
diff --git a/Unity/test/targets/hitech_picc18.yml b/Unity/test/targets/hitech_picc18.yml
deleted file mode 100755
index 2fd4aa366..000000000
--- a/Unity/test/targets/hitech_picc18.yml
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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: '..\src\'
-  unit_tests_path: &unit_tests_path 'tests\'
-  build_path: &build_path 'build\'
-  options:
-    - --chip=18F87J10
-    - --ide=hitide
-    - --q #quiet please
-    - --asmlist
-    - --codeoffset=0
-    - --emi=wordwrite # External memory interface protocol
-    - --warn=0 # allow all normal warning messages
-    - --errors=10 # Number of errors before aborting compile
-    - --char=unsigned
-    - -Bl # Large memory model
-    - -G # generate symbol file
-    - --cp=16 # 16-bit pointers
-    - --double=24
-    - -N255 # 255-char symbol names
-    - --opt=none # Do not use any compiler optimziations
-    - -c # compile only
-    - -M
-  includes:
-    prefix: '-I'
-    items:
-      - 'c:/Projects/NexGen/Prototypes/CMockTest/src/'
-      - 'c:/Projects/NexGen/Prototypes/CMockTest/mocks/'
-      - 'c:/CMock/src/'
-      - 'c:/CMock/examples/src/'
-      - 'c:/CMock/vendor/unity/src/'
-      - 'c:/CMock/vendor/unity/examples/helper/'
-      - *unit_tests_path
-  defines:
-    prefix: '-D'
-    items:
-      - UNITY_INT_WIDTH=16
-      - UNITY_POINTER_WIDTH=16
-      - CMOCK_MEM_STATIC
-      - CMOCK_MEM_SIZE=3000
-      - 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
-
-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
-
-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
-  :suite_teardown: |
-    if (num_failures)
-      _FAILED_TEST();
-    else
-      _PASSED_TESTS();
-    return 0;
-
-colour: true
diff --git a/Unity/test/targets/iar_arm_v4.yml b/Unity/test/targets/iar_arm_v4.yml
deleted file mode 100755
index 2f9f881ec..000000000
--- a/Unity/test/targets/iar_arm_v4.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-tools_root: &tools_root 'C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\'
-compiler:
-  path:             [*tools_root, 'arm\bin\iccarm.exe']
-  source_path:      '..\src\'
-  unit_tests_path:  &unit_tests_path 'tests\'
-  build_path:       &build_path 'build\'
-  options:
-    - --dlib_config
-    - [*tools_root, 'arm\lib\dl4tptinl8n.h']
-    - -z3
-    - --no_cse
-    - --no_unroll
-    - --no_inline
-    - --no_code_motion
-    - --no_tbaa
-    - --no_clustering
-    - --no_scheduling
-    - --debug
-    - --cpu_mode thumb
-    - --endian little
-    - --cpu ARM7TDMI
-    - --stack_align 4
-    - --interwork
-    - -e
-    - --silent
-    - --warnings_are_errors
-    - --fpu None
-    - --diag_suppress Pa050
-  includes:
-    prefix: '-I'
-    items:
-      - [*tools_root, 'arm\inc\']
-      - 'src\'
-      - '..\src\'
-      - 'testdata/'
-      - *unit_tests_path
-      - 'vendor\unity\src\'
-  defines:
-    prefix: '-D'
-    items:
-      - UNITY_SUPPORT_64
-      - 'UNITY_SUPPORT_TEST_CASES'
-  object_files:
-    prefix: '-o'
-    extension: '.r79'
-    destination: *build_path
-linker:
-  path: [*tools_root, 'common\bin\xlink.exe']
-  options:
-    - -rt
-    - [*tools_root, 'arm\lib\dl4tptinl8n.r79']
-    - -D_L_EXTMEM_START=0
-    - -D_L_EXTMEM_SIZE=0
-    - -D_L_HEAP_SIZE=120
-    - -D_L_STACK_SIZE=32
-    - -e_small_write=_formatted_write
-    - -s
-    - __program_start
-    - -f
-    - [*tools_root, '\arm\config\lnkarm.xcl']
-  includes:
-    prefix: '-I'
-    items:
-      - [*tools_root, 'arm\config\']
-      - [*tools_root, 'arm\lib\']
-  object_files:
-    path: *build_path
-    extension: '.r79'
-  bin_files:
-    prefix: '-o'
-    extension: '.d79'
-    destination: *build_path
-simulator:
-  path: [*tools_root, 'common\bin\CSpyBat.exe']
-  pre_support:
-    - --silent
-    - [*tools_root, 'arm\bin\armproc.dll']
-    - [*tools_root, 'arm\bin\armsim.dll']
-  post_support:
-    - --plugin
-    - [*tools_root, 'arm\bin\armbat.dll']
-    - --backend
-    - -B
-    - -p
-    - [*tools_root, 'arm\config\ioat91sam7X256.ddf']
-    - -d
-    - sim
-colour: true
-:unity:
-  :plugins: []
diff --git a/Unity/test/targets/iar_arm_v5.yml b/Unity/test/targets/iar_arm_v5.yml
deleted file mode 100755
index 223f1a65d..000000000
--- a/Unity/test/targets/iar_arm_v5.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-tools_root: &tools_root 'C:\Program Files\IAR Systems\Embedded Workbench 5.3\'
-compiler:
-  path:             [*tools_root, 'arm\bin\iccarm.exe']
-  source_path:      '..\src\'
-  unit_tests_path:  &unit_tests_path 'tests\'
-  build_path:       &build_path 'build\'
-  options:
-    - --dlib_config
-    - [*tools_root, 'arm\inc\DLib_Config_Normal.h']
-    - --no_cse
-    - --no_unroll
-    - --no_inline
-    - --no_code_motion
-    - --no_tbaa
-    - --no_clustering
-    - --no_scheduling
-    - --debug
-    - --cpu_mode thumb
-    - --endian=little
-    - --cpu=ARM7TDMI
-    - --interwork
-    - --warnings_are_errors
-    - --fpu=None
-    - --diag_suppress=Pa050
-    - --diag_suppress=Pe111
-    - -e
-    - -On
-  includes:
-    prefix: '-I'
-    items:
-      - [*tools_root, 'arm\inc\']
-      - 'src\'
-      - '..\src\'
-      - 'testdata/'
-      - *unit_tests_path
-      - 'vendor\unity\src\'
-      - 'iar\iar_v5\incIAR\'
-  defines:
-    prefix: '-D'
-    items:
-      - UNITY_SUPPORT_64
-      - 'UNITY_SUPPORT_TEST_CASES'
-  object_files:
-    prefix: '-o'
-    extension: '.r79'
-    destination: *build_path
-linker:
-  path: [*tools_root, 'arm\bin\ilinkarm.exe']
-  options:
-    - --redirect _Printf=_PrintfLarge
-    - --redirect _Scanf=_ScanfSmall
-    - --semihosting
-    - --entry __iar_program_start
-    - --config
-    - [*tools_root, 'arm\config\generic.icf']
-  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, 'arm\bin\armproc.dll']
-    - [*tools_root, 'arm\bin\armsim.dll']
-  post_support:
-    - --plugin
-    - [*tools_root, 'arm\bin\armbat.dll']
-    - --backend
-    - -B
-    - -p
-    - [*tools_root, 'arm\config\debugger\atmel\ioat91sam7X256.ddf']
-    - -d
-    - sim
-colour: true
-:unity:
-  :plugins: []
diff --git a/Unity/test/targets/iar_arm_v5_3.yml b/Unity/test/targets/iar_arm_v5_3.yml
deleted file mode 100755
index 223f1a65d..000000000
--- a/Unity/test/targets/iar_arm_v5_3.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-tools_root: &tools_root 'C:\Program Files\IAR Systems\Embedded Workbench 5.3\'
-compiler:
-  path:             [*tools_root, 'arm\bin\iccarm.exe']
-  source_path:      '..\src\'
-  unit_tests_path:  &unit_tests_path 'tests\'
-  build_path:       &build_path 'build\'
-  options:
-    - --dlib_config
-    - [*tools_root, 'arm\inc\DLib_Config_Normal.h']
-    - --no_cse
-    - --no_unroll
-    - --no_inline
-    - --no_code_motion
-    - --no_tbaa
-    - --no_clustering
-    - --no_scheduling
-    - --debug
-    - --cpu_mode thumb
-    - --endian=little
-    - --cpu=ARM7TDMI
-    - --interwork
-    - --warnings_are_errors
-    - --fpu=None
-    - --diag_suppress=Pa050
-    - --diag_suppress=Pe111
-    - -e
-    - -On
-  includes:
-    prefix: '-I'
-    items:
-      - [*tools_root, 'arm\inc\']
-      - 'src\'
-      - '..\src\'
-      - 'testdata/'
-      - *unit_tests_path
-      - 'vendor\unity\src\'
-      - 'iar\iar_v5\incIAR\'
-  defines:
-    prefix: '-D'
-    items:
-      - UNITY_SUPPORT_64
-      - 'UNITY_SUPPORT_TEST_CASES'
-  object_files:
-    prefix: '-o'
-    extension: '.r79'
-    destination: *build_path
-linker:
-  path: [*tools_root, 'arm\bin\ilinkarm.exe']
-  options:
-    - --redirect _Printf=_PrintfLarge
-    - --redirect _Scanf=_ScanfSmall
-    - --semihosting
-    - --entry __iar_program_start
-    - --config
-    - [*tools_root, 'arm\config\generic.icf']
-  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, 'arm\bin\armproc.dll']
-    - [*tools_root, 'arm\bin\armsim.dll']
-  post_support:
-    - --plugin
-    - [*tools_root, 'arm\bin\armbat.dll']
-    - --backend
-    - -B
-    - -p
-    - [*tools_root, 'arm\config\debugger\atmel\ioat91sam7X256.ddf']
-    - -d
-    - sim
-colour: true
-:unity:
-  :plugins: []
diff --git a/Unity/test/targets/iar_armcortex_LM3S9B92_v5_4.yml b/Unity/test/targets/iar_armcortex_LM3S9B92_v5_4.yml
deleted file mode 100755
index c79bacf95..000000000
--- a/Unity/test/targets/iar_armcortex_LM3S9B92_v5_4.yml
+++ /dev/null
@@ -1,94 +0,0 @@
-#Default tool path for IAR 5.4 on Windows XP 64bit
-tools_root: &tools_root 'C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\'
-compiler:
-  path:             [*tools_root, 'arm\bin\iccarm.exe']
-  source_path:      '..\src\'
-  unit_tests_path:  &unit_tests_path 'tests\'
-  build_path:       &build_path 'build\'
-  options:
-    - --diag_suppress=Pa050
-    #- --diag_suppress=Pe111
-    - --debug
-    - --endian=little
-    - --cpu=Cortex-M3
-    - --no_path_in_file_macros
-    - -e
-    - --fpu=None
-    - --dlib_config
-    - [*tools_root, 'arm\inc\DLib_Config_Normal.h']
-    #- --preinclude --preinclude C:\Vss\T2 Working\common\system.h
-    - --interwork
-    - --warnings_are_errors
-#    - Ohz
-    - -Oh
-#    - --no_cse
-#    - --no_unroll
-#    - --no_inline
-#    - --no_code_motion
-#    - --no_tbaa
-#    - --no_clustering
-#    - --no_scheduling
-
-  includes:
-    prefix: '-I'
-    items:
-      - [*tools_root, 'arm\inc\']
-      - 'src\'
-      - '..\src\'
-      - 'testdata/'
-      - *unit_tests_path
-      - 'vendor\unity\src\'
-      - 'iar\iar_v5\incIAR\'
-  defines:
-    prefix: '-D'
-    items:
-      - ewarm
-      - PART_LM3S9B92
-      - TARGET_IS_TEMPEST_RB1
-      - USE_ROM_DRIVERS
-      - UART_BUFFERED
-      - UNITY_SUPPORT_64
-  object_files:
-    prefix: '-o'
-    extension: '.r79'
-    destination: *build_path
-linker:
-  path: [*tools_root, 'arm\bin\ilinkarm.exe']
-  options:
-    - --redirect _Printf=_PrintfLarge
-    - --redirect _Scanf=_ScanfSmall
-    - --semihosting
-    - --entry __iar_program_start
-    - --config
-    - [*tools_root, 'arm\config\generic.icf']
-#    - ['C:\Temp\lm3s9b92.icf']
-  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, 'arm\bin\armproc.dll']
-    - [*tools_root, 'arm\bin\armsim2.dll']
-  post_support:
-    - --plugin
-    - [*tools_root, 'arm\bin\armbat.dll']
-    - --backend
-    - -B
-    - --endian=little
-    - --cpu=Cortex-M3
-    - --fpu=None
-    - -p
-    - [*tools_root, 'arm\config\debugger\TexasInstruments\iolm3sxxxx.ddf']
-    - --semihosting
-    - --device=LM3SxBxx
-    #- -d
-    #- sim
-colour: true
-:unity:
-  :plugins: []
diff --git a/Unity/test/targets/iar_cortexm3_v5.yml b/Unity/test/targets/iar_cortexm3_v5.yml
deleted file mode 100755
index 973de9475..000000000
--- a/Unity/test/targets/iar_cortexm3_v5.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-# unit testing under iar compiler / simulator for STM32 Cortex-M3
-
-tools_root: &tools_root 'C:\Program Files\IAR Systems\Embedded Workbench 5.4\'
-compiler:
- path: [*tools_root, 'arm\bin\iccarm.exe']
- source_path: '..\src\'
- unit_tests_path: &unit_tests_path 'tests\'
- build_path: &build_path 'build\'
- options:
-   - --dlib_config
-   - [*tools_root, 'arm\inc\DLib_Config_Normal.h']
-   - --no_cse
-   - --no_unroll
-   - --no_inline
-   - --no_code_motion
-   - --no_tbaa
-   - --no_clustering
-   - --no_scheduling
-   - --debug
-   - --cpu_mode thumb
-   - --endian=little
-   - --cpu=Cortex-M3
-   - --interwork
-   - --warnings_are_errors
-   - --fpu=None
-   - --diag_suppress=Pa050
-   - --diag_suppress=Pe111
-   - -e
-   - -On
- includes:
-   prefix: '-I'
-   items:
-     - [*tools_root, 'arm\inc\']
-     - 'src\'
-      - '..\src\'
-      - 'testdata/'
-     - *unit_tests_path
-     - 'vendor\unity\src\'
-     - 'iar\iar_v5\incIAR\'
- defines:
-   prefix: '-D'
-   items:
-     - 'IAR'
-     - 'UNITY_SUPPORT_64'
-     - 'UNITY_SUPPORT_TEST_CASES'
- object_files:
-   prefix: '-o'
-   extension: '.r79'
-   destination: *build_path
-linker:
- path: [*tools_root, 'arm\bin\ilinkarm.exe']
- options:
-   - --redirect _Printf=_PrintfLarge
-   - --redirect _Scanf=_ScanfSmall
-   - --semihosting
-   - --entry __iar_program_start
-   - --config
-   - [*tools_root, 'arm\config\generic_cortex.icf']
- 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, 'arm\bin\armproc.dll']
-   - [*tools_root, 'arm\bin\armsim.dll']
- post_support:
-   - --plugin
-   - [*tools_root, 'arm\bin\armbat.dll']
-   - --backend
-   - -B
-   - -p
-   - [*tools_root, 'arm\config\debugger\ST\iostm32f107xx.ddf']
-   - --cpu=Cortex-M3
-   - -d
-   - sim
-colour: true
-:unity:
-  :plugins: []
diff --git a/Unity/test/targets/iar_msp430.yml b/Unity/test/targets/iar_msp430.yml
deleted file mode 100755
index 4563af927..000000000
--- a/Unity/test/targets/iar_msp430.yml
+++ /dev/null
@@ -1,95 +0,0 @@
-tools_root:  &tools_root 'C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\'
-core_root:   &core_root [*tools_root, '430\']
-core_bin:    &core_bin [*core_root, 'bin\']
-core_config: &core_config [*core_root, 'config\']
-core_lib:    &core_lib [*core_root, 'lib\']
-core_inc:    &core_inc [*core_root, 'inc\']
-core_config: &core_config [*core_root, 'config\']
-
-compiler:
-  path:             [*core_bin, 'icc430.exe']
-  source_path:      '..\src\'
-  unit_tests_path:  &unit_tests_path 'tests\'
-  build_path:       &build_path 'build\'
-  options:
-    - --dlib_config
-    - [*core_lib, 'dlib\dl430fn.h']
-    - --no_cse
-    - --no_unroll
-    - --no_inline
-    - --no_code_motion
-    - --no_tbaa
-    - --debug
-    - -e
-    - -Ol
-    - --multiplier=16
-    - --double=32
-    - --diag_suppress Pa050
-    - --diag_suppress Pe111
-  includes:
-    prefix: '-I'
-    items:
-      - *core_inc
-      - [*core_inc, 'dlib']
-      - [*core_lib, 'dlib']
-      - 'src\'
-      - '../src/'
-      - 'testdata/'
-      - *unit_tests_path
-      - 'vendor\unity\src'
-  defines:
-    prefix: '-D'
-    items:
-      - '__MSP430F149__'
-      - 'INT_WIDTH=16'
-      - 'UNITY_EXCLUDE_FLOAT'
-      - 'UNITY_SUPPORT_TEST_CASES'
-  object_files:
-    prefix: '-o'
-    extension: '.r43'
-    destination: *build_path
-linker:
-  path: [*core_bin, 'xlink.exe']
-  options:
-    - -rt
-    - [*core_lib, 'dlib\dl430fn.r43']
-    - -e_PrintfTiny=_Printf
-    - -e_ScanfSmall=_Scanf
-    - -s __program_start
-    - -D_STACK_SIZE=50
-    - -D_DATA16_HEAP_SIZE=50
-    - -D_DATA20_HEAP_SIZE=50
-    - -f
-    - [*core_config, 'lnk430f5438.xcl']
-    - -f
-    - [*core_config, 'multiplier.xcl']
-  includes:
-    prefix: '-I'
-    items:
-      - *core_config
-      - *core_lib
-      - [*core_lib, 'dlib']
-  object_files:
-    path: *build_path
-    extension: '.r79'
-  bin_files:
-    prefix: '-o'
-    extension: '.d79'
-    destination: *build_path
-simulator:
-  path: [*tools_root, 'common\bin\CSpyBat.exe']
-  pre_support:
-    - --silent
-    - [*core_bin, '430proc.dll']
-    - [*core_bin, '430sim.dll']
-  post_support:
-    - --plugin
-    - [*core_bin, '430bat.dll']
-    - --backend -B
-    - --cpu MSP430F5438
-    - -p
-    - [*core_config, 'MSP430F5438.ddf']
-    - -d sim
-colour: true
-:unity:
-  :plugins: []
diff --git a/Unity/test/targets/iar_sh2a_v6.yml b/Unity/test/targets/iar_sh2a_v6.yml
deleted file mode 100755
index 27e6bee42..000000000
--- a/Unity/test/targets/iar_sh2a_v6.yml
+++ /dev/null
@@ -1,86 +0,0 @@
-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\'
-      - 'testdata/'
-      - *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: []
diff --git a/Unity/test/testdata/CException.h b/Unity/test/testdata/CException.h
deleted file mode 100755
index 91ad3e1bf..000000000
--- a/Unity/test/testdata/CException.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#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
diff --git a/Unity/test/testdata/Defs.h b/Unity/test/testdata/Defs.h
deleted file mode 100755
index d3a90c0d5..000000000
--- a/Unity/test/testdata/Defs.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef DEF_H
-#define DEF_H
-
-#define EXTERN_DECL
-
-extern int CounterSuiteSetup;
-
-#endif //DEF_H
diff --git a/Unity/test/testdata/cmock.h b/Unity/test/testdata/cmock.h
deleted file mode 100755
index c6149be1b..000000000
--- a/Unity/test/testdata/cmock.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#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
diff --git a/Unity/test/testdata/mockMock.h b/Unity/test/testdata/mockMock.h
deleted file mode 100755
index 0a2c616f7..000000000
--- a/Unity/test/testdata/mockMock.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#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
diff --git a/Unity/test/testdata/testRunnerGenerator.c b/Unity/test/testdata/testRunnerGenerator.c
deleted file mode 100755
index e036dd967..000000000
--- a/Unity/test/testdata/testRunnerGenerator.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/* 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");
-}
-
-
diff --git a/Unity/test/testdata/testRunnerGeneratorSmall.c b/Unity/test/testdata/testRunnerGeneratorSmall.c
deleted file mode 100755
index c68374948..000000000
--- a/Unity/test/testdata/testRunnerGeneratorSmall.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* 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"
-
-TEST_FILE("some_file.c")
-
-/* 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.
-*/
-
-/* 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_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 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");
-}
-
diff --git a/Unity/test/testdata/testRunnerGeneratorWithMocks.c b/Unity/test/testdata/testRunnerGeneratorWithMocks.c
deleted file mode 100755
index 7eb0b671f..000000000
--- a/Unity/test/testdata/testRunnerGeneratorWithMocks.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/* 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"
-#include "mockMock.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");
-}
-
-void test_ShouldCallMockInitAndVerifyFunctionsForEachTest(void)
-{
-    int passesOrIgnores = (int)(Unity.NumberOfTests - Unity.TestFailures);
-    TEST_ASSERT_EQUAL_MESSAGE(Unity.NumberOfTests,     mockMock_Init_Counter,    "Mock Init Should Be Called Once Per Test Started");
-    TEST_ASSERT_EQUAL_MESSAGE(passesOrIgnores,         mockMock_Verify_Counter,  "Mock Verify Should Be Called Once Per Test Passed");
-    TEST_ASSERT_EQUAL_MESSAGE(Unity.NumberOfTests - 1, mockMock_Destroy_Counter, "Mock Destroy Should Be Called Once Per Test Completed");
-    TEST_ASSERT_EQUAL_MESSAGE(0,                       CMockMemFreeFinalCounter, "Mock MemFreeFinal Should Not Be Called Until End");
-}
-
diff --git a/Unity/test/tests/test_generate_test_runner.rb b/Unity/test/tests/test_generate_test_runner.rb
deleted file mode 100755
index a3536d36d..000000000
--- a/Unity/test/tests/test_generate_test_runner.rb
+++ /dev/null
@@ -1,1252 +0,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'
-
-$generate_test_runner_tests = 0
-$generate_test_runner_failures = 0
-
-OUT_FILE  = 'build/testsample_'
-
-RUNNER_TESTS = [
-  { :name => 'DefaultsThroughOptions',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST'],
-    :options => nil, #defaults
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'spec_ThisTestPassesWhenNormalSetupRan',
-                    'spec_ThisTestPassesWhenNormalTeardownRan',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                    'should_RunTestsStartingWithShouldByDefault',
-                    'spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'DefaultsThroughCommandLine',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST'],
-    :cmdline => "", #defaults
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'spec_ThisTestPassesWhenNormalSetupRan',
-                    'spec_ThisTestPassesWhenNormalTeardownRan',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                    'should_RunTestsStartingWithShouldByDefault',
-                    'spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'DefaultsThroughYAMLFile',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST'],
-    :cmdline => "", #defaults
-    :yaml => {}, #defaults
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'spec_ThisTestPassesWhenNormalSetupRan',
-                    'spec_ThisTestPassesWhenNormalTeardownRan',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                    'should_RunTestsStartingWithShouldByDefault',
-                    'spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'ShorterFilterOfJustTest',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST'],
-    :options => {
-      :test_prefix => "test",
-    },
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'ShorterFilterOfJustShould',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST'],
-    :options => {
-      :test_prefix => "should",
-    },
-    :expected => {
-      :to_pass => [ 'should_RunTestsStartingWithShouldByDefault' ],
-      :to_fail => [  ],
-      :to_ignore => [  ],
-    }
-  },
-
-  { :name => 'ShorterFilterOfJustSpec',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST'],
-    :options => {
-      :test_prefix => "spec",
-    },
-    :expected => {
-      :to_pass => [ 'spec_ThisTestPassesWhenNormalSetupRan',
-                    'spec_ThisTestPassesWhenNormalTeardownRan',
-                    'spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan',
-                  ],
-      :to_fail => [  ],
-      :to_ignore => [  ],
-    }
-  },
-
-  { :name => 'InjectIncludes',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST'],
-    :options => {
-      :includes => ['Defs.h'],
-    },
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'spec_ThisTestPassesWhenNormalSetupRan',
-                    'spec_ThisTestPassesWhenNormalTeardownRan',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                    'should_RunTestsStartingWithShouldByDefault',
-                    'spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'ParameterizedThroughOptions',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST'],
-    :options => {
-      :test_prefix => "paratest",
-      :use_param_tests => true,
-    },
-    :expected => {
-      :to_pass => [ 'paratest_ShouldHandleParameterizedTests\(25\)',
-                    'paratest_ShouldHandleParameterizedTests\(125\)',
-                    'paratest_ShouldHandleParameterizedTests\(5\)',
-                    'paratest_ShouldHandleParameterizedTests2\(7\)',
-                    'paratest_ShouldHandleNonParameterizedTestsWhenParameterizationValid\(RUN_TEST_NO_ARGS\)',
-                  ],
-      :to_fail => [ 'paratest_ShouldHandleParameterizedTestsThatFail\(17\)' ],
-      :to_ignore => [ ],
-    }
-  },
-
-  { :name => 'ParameterizedThroughCommandLine',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST'],
-    :cmdline => " --test_prefix=\"paratest\" --use_param_tests=1",
-    :expected => {
-      :to_pass => [ 'paratest_ShouldHandleParameterizedTests\(25\)',
-                    'paratest_ShouldHandleParameterizedTests\(125\)',
-                    'paratest_ShouldHandleParameterizedTests\(5\)',
-                    'paratest_ShouldHandleParameterizedTests2\(7\)',
-                    'paratest_ShouldHandleNonParameterizedTestsWhenParameterizationValid\(RUN_TEST_NO_ARGS\)',
-                  ],
-      :to_fail => [ 'paratest_ShouldHandleParameterizedTestsThatFail\(17\)' ],
-      :to_ignore => [ ],
-    }
-  },
-
-  { :name => 'ParameterizedThroughCommandLineAndYaml',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST'],
-    :cmdline => "--use_param_tests=1",
-    :yaml => {
-      :test_prefix => "paratest"
-    },
-    :expected => {
-      :to_pass => [ 'paratest_ShouldHandleParameterizedTests\(25\)',
-                    'paratest_ShouldHandleParameterizedTests\(125\)',
-                    'paratest_ShouldHandleParameterizedTests\(5\)',
-                    'paratest_ShouldHandleParameterizedTests2\(7\)',
-                    'paratest_ShouldHandleNonParameterizedTestsWhenParameterizationValid\(RUN_TEST_NO_ARGS\)',
-                  ],
-      :to_fail => [ 'paratest_ShouldHandleParameterizedTestsThatFail\(17\)' ],
-      :to_ignore => [ ],
-    }
-  },
-
-  { :name => 'CException',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST', 'USE_CEXCEPTION'],
-    :options => {
-      :test_prefix => "extest",
-      :plugins => [ :cexception ],
-    },
-    :expected => {
-      :to_pass => [ 'extest_ShouldHandleCExceptionInTest' ],
-      :to_fail => [ ],
-      :to_ignore => [ ],
-    }
-  },
-
-  { :name => 'CustomSetupAndTeardownThroughOptions',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST'],
-    :options => {
-      :test_prefix => "custtest|test",
-      :setup_name => "custom_setup",
-      :teardown_name => "custom_teardown",
-    },
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                    'custtest_ThisTestPassesWhenCustomSetupRan',
-                    'custtest_ThisTestPassesWhenCustomTeardownRan',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'CustomSetupAndTeardownThroughCommandLine',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST'],
-    :cmdline => " --test_prefix=\"custtest|test\" --setup_name=\"custom_setup\" --teardown_name=\"custom_teardown\"",
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                    'custtest_ThisTestPassesWhenCustomSetupRan',
-                    'custtest_ThisTestPassesWhenCustomTeardownRan',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'CustomSetupAndTeardownThroughYaml',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST'],
-    :cmdline => " --test_prefix=\"custtest|test\"",
-    :yaml => {
-      :setup_name => "custom_setup",
-      :teardown_name => "custom_teardown",
-    },
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                    'custtest_ThisTestPassesWhenCustomSetupRan',
-                    'custtest_ThisTestPassesWhenCustomTeardownRan',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'CustomMain',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST', "USE_ANOTHER_MAIN"],
-    :options => {
-      :main_name => "custom_main",
-    },
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'spec_ThisTestPassesWhenNormalSetupRan',
-                    'spec_ThisTestPassesWhenNormalTeardownRan',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                    'should_RunTestsStartingWithShouldByDefault',
-                    'spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'CustomSuiteSetupAndTeardown',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST'],
-    :includes => ['Defs.h'],
-    :options => {
-      :test_prefix    => "suitetest|test",
-      :suite_setup    => "  CounterSuiteSetup = 1;",
-      :suite_teardown => "  return num_failures;",
-    },
-    :expected =>  {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                    'suitetest_ThisTestPassesWhenCustomSuiteSetupAndTeardownRan',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'MainExternDeclaration',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST'],
-    :includes => ['Defs.h'],
-    :options => {
-      :main_export_decl => "EXTERN_DECL",
-    },
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'spec_ThisTestPassesWhenNormalSetupRan',
-                    'spec_ThisTestPassesWhenNormalTeardownRan',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                    'should_RunTestsStartingWithShouldByDefault',
-                    'spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-
-  #### WITH MOCKS ##########################################
-
-  { :name => 'DefaultsThroughOptions',
-    :testfile => 'testdata/testRunnerGeneratorWithMocks.c',
-    :testdefines => ['TEST'],
-    :options => nil, #defaults
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'spec_ThisTestPassesWhenNormalSetupRan',
-                    'spec_ThisTestPassesWhenNormalTeardownRan',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                    'should_RunTestsStartingWithShouldByDefault',
-                    'spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan',
-                    'test_ShouldCallMockInitAndVerifyFunctionsForEachTest',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'DefaultsThroughCommandLine',
-    :testfile => 'testdata/testRunnerGeneratorWithMocks.c',
-    :testdefines => ['TEST'],
-    :cmdline => "", #defaults
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'spec_ThisTestPassesWhenNormalSetupRan',
-                    'spec_ThisTestPassesWhenNormalTeardownRan',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                    'should_RunTestsStartingWithShouldByDefault',
-                    'spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan',
-                    'test_ShouldCallMockInitAndVerifyFunctionsForEachTest',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'DefaultsThroughYAMLFile',
-    :testfile => 'testdata/testRunnerGeneratorWithMocks.c',
-    :testdefines => ['TEST'],
-    :cmdline => "", #defaults
-    :yaml => {}, #defaults
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'spec_ThisTestPassesWhenNormalSetupRan',
-                    'spec_ThisTestPassesWhenNormalTeardownRan',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                    'should_RunTestsStartingWithShouldByDefault',
-                    'spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan',
-                    'test_ShouldCallMockInitAndVerifyFunctionsForEachTest',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'ShorterFilterOfJustTest',
-    :testfile => 'testdata/testRunnerGeneratorWithMocks.c',
-    :testdefines => ['TEST'],
-    :options => {
-      :test_prefix => "test",
-    },
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                    'test_ShouldCallMockInitAndVerifyFunctionsForEachTest',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'ShorterFilterOfJustShould',
-    :testfile => 'testdata/testRunnerGeneratorWithMocks.c',
-    :testdefines => ['TEST'],
-    :options => {
-      :test_prefix => "should",
-    },
-    :expected => {
-      :to_pass => [ 'should_RunTestsStartingWithShouldByDefault' ],
-      :to_fail => [  ],
-      :to_ignore => [  ],
-    }
-  },
-
-  { :name => 'ShorterFilterOfJustSpec',
-    :testfile => 'testdata/testRunnerGeneratorWithMocks.c',
-    :testdefines => ['TEST'],
-    :options => {
-      :test_prefix => "spec",
-    },
-    :expected => {
-      :to_pass => [ 'spec_ThisTestPassesWhenNormalSetupRan',
-                    'spec_ThisTestPassesWhenNormalTeardownRan',
-                    'spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan',
-                  ],
-      :to_fail => [  ],
-      :to_ignore => [  ],
-    }
-  },
-
-  { :name => 'InjectIncludes',
-    :testfile => 'testdata/testRunnerGeneratorWithMocks.c',
-    :testdefines => ['TEST'],
-    :options => {
-      :includes => ['Defs.h'],
-    },
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'spec_ThisTestPassesWhenNormalSetupRan',
-                    'spec_ThisTestPassesWhenNormalTeardownRan',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                    'should_RunTestsStartingWithShouldByDefault',
-                    'spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan',
-                    'test_ShouldCallMockInitAndVerifyFunctionsForEachTest',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'ParameterizedThroughOptions',
-    :testfile => 'testdata/testRunnerGeneratorWithMocks.c',
-    :testdefines => ['TEST'],
-    :options => {
-      :test_prefix => "paratest",
-      :use_param_tests => true,
-    },
-    :expected => {
-      :to_pass => [ 'paratest_ShouldHandleParameterizedTests\(25\)',
-                    'paratest_ShouldHandleParameterizedTests\(125\)',
-                    'paratest_ShouldHandleParameterizedTests\(5\)',
-                    'paratest_ShouldHandleParameterizedTests2\(7\)',
-                    'paratest_ShouldHandleNonParameterizedTestsWhenParameterizationValid\(RUN_TEST_NO_ARGS\)',
-                  ],
-      :to_fail => [ 'paratest_ShouldHandleParameterizedTestsThatFail\(17\)' ],
-      :to_ignore => [ ],
-    }
-  },
-
-  { :name => 'ParameterizedThroughCommandLine',
-    :testfile => 'testdata/testRunnerGeneratorWithMocks.c',
-    :testdefines => ['TEST'],
-    :cmdline => " --test_prefix=\"paratest\" --use_param_tests=1",
-    :expected => {
-      :to_pass => [ 'paratest_ShouldHandleParameterizedTests\(25\)',
-                    'paratest_ShouldHandleParameterizedTests\(125\)',
-                    'paratest_ShouldHandleParameterizedTests\(5\)',
-                    'paratest_ShouldHandleParameterizedTests2\(7\)',
-                    'paratest_ShouldHandleNonParameterizedTestsWhenParameterizationValid\(RUN_TEST_NO_ARGS\)',
-                  ],
-      :to_fail => [ 'paratest_ShouldHandleParameterizedTestsThatFail\(17\)' ],
-      :to_ignore => [ ],
-    }
-  },
-
-  { :name => 'ParameterizedThroughCommandLineAndYaml',
-    :testfile => 'testdata/testRunnerGeneratorWithMocks.c',
-    :testdefines => ['TEST'],
-    :cmdline => "--use_param_tests=1",
-    :yaml => {
-      :test_prefix => "paratest"
-    },
-    :expected => {
-      :to_pass => [ 'paratest_ShouldHandleParameterizedTests\(25\)',
-                    'paratest_ShouldHandleParameterizedTests\(125\)',
-                    'paratest_ShouldHandleParameterizedTests\(5\)',
-                    'paratest_ShouldHandleParameterizedTests2\(7\)',
-                    'paratest_ShouldHandleNonParameterizedTestsWhenParameterizationValid\(RUN_TEST_NO_ARGS\)',
-                  ],
-      :to_fail => [ 'paratest_ShouldHandleParameterizedTestsThatFail\(17\)' ],
-      :to_ignore => [ ],
-    }
-  },
-
-  { :name => 'CException',
-    :testfile => 'testdata/testRunnerGeneratorWithMocks.c',
-    :testdefines => ['TEST', 'USE_CEXCEPTION'],
-    :options => {
-      :test_prefix => "extest",
-      :plugins => [ :cexception ],
-    },
-    :expected => {
-      :to_pass => [ 'extest_ShouldHandleCExceptionInTest' ],
-      :to_fail => [ ],
-      :to_ignore => [ ],
-    }
-  },
-
-  { :name => 'CustomSetupAndTeardownThroughOptions',
-    :testfile => 'testdata/testRunnerGeneratorWithMocks.c',
-    :testdefines => ['TEST'],
-    :options => {
-      :test_prefix => "custtest|test",
-      :setup_name => "custom_setup",
-      :teardown_name => "custom_teardown",
-    },
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                    'custtest_ThisTestPassesWhenCustomSetupRan',
-                    'custtest_ThisTestPassesWhenCustomTeardownRan',
-                    'test_ShouldCallMockInitAndVerifyFunctionsForEachTest',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'CustomSetupAndTeardownThroughCommandLine',
-    :testfile => 'testdata/testRunnerGeneratorWithMocks.c',
-    :testdefines => ['TEST'],
-    :cmdline => " --test_prefix=\"custtest|test\" --setup_name=\"custom_setup\" --teardown_name=\"custom_teardown\"",
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                    'custtest_ThisTestPassesWhenCustomSetupRan',
-                    'custtest_ThisTestPassesWhenCustomTeardownRan',
-                    'test_ShouldCallMockInitAndVerifyFunctionsForEachTest',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'CustomSetupAndTeardownThroughYaml',
-    :testfile => 'testdata/testRunnerGeneratorWithMocks.c',
-    :testdefines => ['TEST'],
-    :cmdline => " --test_prefix=\"custtest|test\"",
-    :yaml => {
-      :setup_name => "custom_setup",
-      :teardown_name => "custom_teardown",
-    },
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                    'custtest_ThisTestPassesWhenCustomSetupRan',
-                    'custtest_ThisTestPassesWhenCustomTeardownRan',
-                    'test_ShouldCallMockInitAndVerifyFunctionsForEachTest',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'CustomMain',
-    :testfile => 'testdata/testRunnerGeneratorWithMocks.c',
-    :testdefines => ['TEST', "USE_ANOTHER_MAIN"],
-    :options => {
-      :main_name => "custom_main",
-    },
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'spec_ThisTestPassesWhenNormalSetupRan',
-                    'spec_ThisTestPassesWhenNormalTeardownRan',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                    'should_RunTestsStartingWithShouldByDefault',
-                    'spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan',
-                    'test_ShouldCallMockInitAndVerifyFunctionsForEachTest',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'CustomSuiteSetupAndTeardown',
-    :testfile => 'testdata/testRunnerGeneratorWithMocks.c',
-    :testdefines => ['TEST'],
-    :includes => ['Defs.h'],
-    :options => {
-      :test_prefix    => "suitetest|test",
-      :suite_setup    => "  CounterSuiteSetup = 1;",
-      :suite_teardown => "  return num_failures;",
-    },
-    :expected =>  {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                    'suitetest_ThisTestPassesWhenCustomSuiteSetupAndTeardownRan',
-                    'test_ShouldCallMockInitAndVerifyFunctionsForEachTest',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'MainExternDeclaration',
-    :testfile => 'testdata/testRunnerGeneratorWithMocks.c',
-    :testdefines => ['TEST'],
-    :includes => ['Defs.h'],
-    :options => {
-      :main_export_decl => "EXTERN_DECL",
-    },
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'spec_ThisTestPassesWhenNormalSetupRan',
-                    'spec_ThisTestPassesWhenNormalTeardownRan',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                    'should_RunTestsStartingWithShouldByDefault',
-                    'spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan',
-                    'test_ShouldCallMockInitAndVerifyFunctionsForEachTest',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-
-
-  #### WITH ARGS ##########################################
-
-  { :name => 'ArgsThroughOptions',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :options => {
-      :cmdline_args => true,
-    },
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'spec_ThisTestPassesWhenNormalSetupRan',
-                    'spec_ThisTestPassesWhenNormalTeardownRan',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                    'should_RunTestsStartingWithShouldByDefault',
-                    'spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'ArgsThroughCommandLine',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :cmdline => "--cmdline_args=1",
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'spec_ThisTestPassesWhenNormalSetupRan',
-                    'spec_ThisTestPassesWhenNormalTeardownRan',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                    'should_RunTestsStartingWithShouldByDefault',
-                    'spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'ArgsThroughYAMLFile',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :cmdline => "",
-    :yaml => {
-      :cmdline_args => true,
-    },
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'spec_ThisTestPassesWhenNormalSetupRan',
-                    'spec_ThisTestPassesWhenNormalTeardownRan',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                    'should_RunTestsStartingWithShouldByDefault',
-                    'spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'ArgsNameFilterJustTest',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :options => {
-      :cmdline_args => true,
-    },
-    :cmdline_args => "-n test_",
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'ArgsNameFilterJustShould',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :options => {
-      :cmdline_args => true,
-    },
-    :cmdline_args => "-n should_",
-    :expected => {
-      :to_pass => [ 'should_RunTestsStartingWithShouldByDefault' ],
-      :to_fail => [  ],
-      :to_ignore => [  ],
-    }
-  },
-
-  { :name => 'ArgsNameFilterTestAndShould',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :options => {
-      :cmdline_args => true,
-    },
-    :cmdline_args => "-n should_,test_",
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                    'should_RunTestsStartingWithShouldByDefault' ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'ArgsNameFilterWithWildcardOnFile',
-    :testfile => 'testdata/testRunnerGeneratorSmall.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :options => {
-      :cmdline_args => true,
-    },
-    :cmdline_args => "-n testRunnerGeneratorSma*",
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'spec_ThisTestPassesWhenNormalSetupRan',
-                    'spec_ThisTestPassesWhenNormalTeardownRan' ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'ArgsNameFilterWithWildcardAsName',
-    :testfile => 'testdata/testRunnerGeneratorSmall.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :options => {
-      :cmdline_args => true,
-    },
-    :cmdline_args => "-n testRunnerGeneratorSmall:*",
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'spec_ThisTestPassesWhenNormalSetupRan',
-                    'spec_ThisTestPassesWhenNormalTeardownRan' ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'ArgsNameFilterWithWildcardOnName',
-    :testfile => 'testdata/testRunnerGeneratorSmall.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :options => {
-      :cmdline_args => true,
-    },
-    :cmdline_args => "-n testRunnerGeneratorSmall:test_*",
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses' ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'ArgsNameFilterWithWildcardAndShortName',
-    :testfile => 'testdata/testRunnerGeneratorSmall.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :options => {
-      :cmdline_args => true,
-    },
-    :cmdline_args => "-n testRunnerGeneratorSmall:te*",
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses' ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'ArgsNameFilterWithWildcardOnBoth',
-    :testfile => 'testdata/testRunnerGeneratorSmall.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :options => {
-      :cmdline_args => true,
-    },
-    :cmdline_args => "-n testRunnerGeneratorSm*:*",
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'spec_ThisTestPassesWhenNormalSetupRan',
-                    'spec_ThisTestPassesWhenNormalTeardownRan' ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'ArgsExcludeFilterJustTest',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :options => {
-      :cmdline_args => true,
-    },
-    :cmdline_args => "-x test_",
-    :expected => {
-      :to_pass => [ 'spec_ThisTestPassesWhenNormalSetupRan',
-                    'spec_ThisTestPassesWhenNormalTeardownRan',
-                    'spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan',
-                    'should_RunTestsStartingWithShouldByDefault',
-                  ],
-      :to_fail => [  ],
-      :to_ignore => [  ],
-    }
-  },
-
-  { :name => 'ArgsIncludeAndExcludeFilter',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :options => {
-      :cmdline_args => true,
-      :includes => ['Defs.h'],
-    },
-    :cmdline_args => "-n test_ -x Ignored",
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [  ],
-    }
-  },
-
-  { :name => 'ArgsIncludeSingleTest',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :options => {
-      :cmdline_args => true,
-    },
-    :cmdline_args => "-n ThisTestAlwaysPasses",
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses' ],
-      :to_fail => [ ],
-      :to_ignore => [ ],
-    }
-  },
-
-  { :name => 'ArgsIncludeSingleTestInSpecificFile',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :options => {
-      :cmdline_args => true,
-    },
-    :cmdline_args => "-n testRunnerGenerator:ThisTestAlwaysPasses",
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses' ],
-      :to_fail => [ ],
-      :to_ignore => [ ],
-    }
-  },
-
-  { :name => 'ArgsIncludeTestFileWithExtension',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :options => {
-      :cmdline_args => true,
-    },
-    :cmdline_args => "-n testRunnerGenerator.c:ThisTestAlwaysPasses",
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses' ],
-      :to_fail => [ ],
-      :to_ignore => [ ],
-    }
-  },
-
-  { :name => 'ArgsIncludeDoubleQuotes',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :options => {
-      :cmdline_args => true,
-    },
-    :cmdline_args => "-n \"testRunnerGenerator:ThisTestAlwaysPasses,test_ThisTestAlwaysFails\"",
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses' ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ ],
-    }
-  },
-
-  { :name => 'ArgsIncludeSingleQuotes',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :options => {
-      :cmdline_args => true,
-    },
-    :cmdline_args => "-n 'testRunnerGenerator:ThisTestAlwaysPasses,test_ThisTestAlwaysFails'",
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses' ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ ],
-    }
-  },
-
-  { :name => 'ArgsIncludeAValidTestForADifferentFile',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :options => {
-      :cmdline_args => true,
-    },
-    :cmdline_args => "-n AnotherFile:ThisTestDoesNotExist",
-    :expected => {
-      :to_pass => [ ],
-      :to_fail => [ ],
-      :to_ignore => [ ],
-    }
-  },
-
-  { :name => 'ArgsIncludeNoTests',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :options => {
-      :cmdline_args => true,
-    },
-    :cmdline_args => "-n ThisTestDoesNotExist",
-    :expected => {
-      :to_pass => [ ],
-      :to_fail => [ ],
-      :to_ignore => [ ],
-    }
-  },
-
-  { :name => 'ArgsExcludeAllTests',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :options => {
-      :cmdline_args => true,
-    },
-    :cmdline_args => "-x _",
-    :expected => {
-      :to_pass => [ ],
-      :to_fail => [ ],
-      :to_ignore => [ ],
-    }
-  },
-
-  { :name => 'ArgsIncludeFullFile',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :options => {
-      :cmdline_args => true,
-    },
-    :cmdline_args => "-n testRunnerGenerator",
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses',
-                    'spec_ThisTestPassesWhenNormalSetupRan',
-                    'spec_ThisTestPassesWhenNormalTeardownRan',
-                    'test_NotBeConfusedByLongComplicatedStrings',
-                    'test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings',
-                    'test_StillNotBeConfusedByLongComplicatedStrings',
-                    'should_RunTestsStartingWithShouldByDefault',
-                    'spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan',
-                  ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ 'test_ThisTestAlwaysIgnored' ],
-    }
-  },
-
-  { :name => 'ArgsIncludeWithAlternateFlag',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :options => {
-      :cmdline_args => true,
-    },
-    :cmdline_args => "-f=\"testRunnerGenerator:ThisTestAlwaysPasses,test_ThisTestAlwaysFails\"",
-    :expected => {
-      :to_pass => [ 'test_ThisTestAlwaysPasses' ],
-      :to_fail => [ 'test_ThisTestAlwaysFails' ],
-      :to_ignore => [ ],
-    }
-  },
-
-  { :name => 'ArgsIncludeWithParameterized',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :cmdline => "--use_param_tests=1",
-    :yaml => {
-      :cmdline_args => true,
-      :test_prefix => "paratest"
-    },
-    :cmdline_args => "-n ShouldHandleParameterizedTests",
-    :expected => {
-      :to_pass => [ 'paratest_ShouldHandleParameterizedTests\(25\)',
-                    'paratest_ShouldHandleParameterizedTests\(125\)',
-                    'paratest_ShouldHandleParameterizedTests\(5\)',
-                    'paratest_ShouldHandleParameterizedTests2\(7\)',
-                  ],
-      :to_fail => [ 'paratest_ShouldHandleParameterizedTestsThatFail\(17\)' ],
-      :to_ignore => [ ],
-    }
-  },
-
-  { :name => 'ArgsList',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :options => {
-      :cmdline_args => true,
-    },
-    :cmdline_args => "-l",
-    :expected => {
-      :to_pass => [ ],
-      :to_fail => [ ],
-      :to_ignore => [ ],
-      :text => [  "testRunnerGenerator",
-                  "test_ThisTestAlwaysPasses",
-                  "test_ThisTestAlwaysFails",
-                  "test_ThisTestAlwaysIgnored",
-                  "spec_ThisTestPassesWhenNormalSuiteSetupAndTeardownRan",
-                  "spec_ThisTestPassesWhenNormalSetupRan",
-                  "spec_ThisTestPassesWhenNormalTeardownRan",
-                  "test_NotBeConfusedByLongComplicatedStrings",
-                  "test_NotDisappearJustBecauseTheTestBeforeAndAfterHaveCrazyStrings",
-                  "test_StillNotBeConfusedByLongComplicatedStrings",
-                  "should_RunTestsStartingWithShouldByDefault"
-               ]
-    }
-  },
-
-  { :name => 'ArgsListParameterized',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :options => {
-      :test_prefix => "paratest",
-      :use_param_tests => true,
-      :cmdline_args => true,
-    },
-    :cmdline_args => "-l",
-    :expected => {
-      :to_pass => [ ],
-      :to_fail => [ ],
-      :to_ignore => [ ],
-      :text => [  "testRunnerGenerator",
-                  'paratest_ShouldHandleParameterizedTests\(25\)',
-                  'paratest_ShouldHandleParameterizedTests\(125\)',
-                  'paratest_ShouldHandleParameterizedTests\(5\)',
-                  'paratest_ShouldHandleParameterizedTests2\(7\)',
-                  'paratest_ShouldHandleNonParameterizedTestsWhenParameterizationValid\(RUN_TEST_NO_ARGS\)',
-                  'paratest_ShouldHandleParameterizedTestsThatFail\(17\)'
-               ],
-    }
-  },
-
-  { :name => 'ArgsIncompleteIncludeFlags',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :options => {
-      :cmdline_args => true,
-    },
-    :cmdline_args => "-n",
-    :expected => {
-      :to_pass => [ ],
-      :to_fail => [ ],
-      :to_ignore => [ ],
-      :text => [ "ERROR: No Test String to Include Matches For" ],
-    }
-  },
-
-  { :name => 'ArgsIncompleteExcludeFlags',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :options => {
-      :cmdline_args => true,
-    },
-    :cmdline_args => "-x",
-    :expected => {
-      :to_pass => [ ],
-      :to_fail => [ ],
-      :to_ignore => [ ],
-      :text => [ "ERROR: No Test String to Exclude Matches For" ],
-    }
-  },
-
-  { :name => 'ArgsIllegalFlags',
-    :testfile => 'testdata/testRunnerGenerator.c',
-    :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'],
-    :options => {
-      :cmdline_args => true,
-    },
-    :cmdline_args => "-z",
-    :expected => {
-      :to_pass => [ ],
-      :to_fail => [ ],
-      :to_ignore => [ ],
-      :text => [ "ERROR: Unknown Option z" ],
-    }
-  },
-]
-
-def runner_test(test, runner, expected, test_defines, cmdline_args)
-  # Tack on TEST define for compiling unit tests
-  load_configuration($cfg_file)
-
-  #compile objects
-  obj_list = [
-    compile(runner, test_defines),
-    compile(test, test_defines),
-    compile('../src/unity.c', test_defines),
-  ]
-
-  # Link the test executable
-  test_base = File.basename(test, C_EXTENSION)
-  link_it(test_base, obj_list)
-
-  # Execute unit test and generate results file
-  simulator = build_simulator_fields
-  cmdline_args ||= ""
-  executable = $cfg['linker']['bin_files']['destination'] + test_base + $cfg['linker']['bin_files']['extension'] + " #{cmdline_args}"
-  cmd_str = if simulator.nil?
-              executable
-            else
-              "#{simulator[:command]} #{simulator[:pre_support]} #{executable} #{simulator[:post_support]}"
-            end
-  output = execute(cmd_str, true)
-
-  #compare to the expected pass/fail
-  allgood = expected[:to_pass].inject(true)      {|s,v| s && verify_match(/#{v}:PASS/,   output) }
-  allgood = expected[:to_fail].inject(allgood)   {|s,v| s && verify_match(/#{v}:FAIL/,   output) }
-  allgood = expected[:to_ignore].inject(allgood) {|s,v| s && verify_match(/#{v}:IGNORE/, output) }
-
-  #verify there weren't more pass/fail/etc than expected
-  allgood &&= verify_number( expected[:to_pass],   /(:PASS)/,   output)
-  allgood &&= verify_number( expected[:to_fail],   /(:FAIL)/,   output)
-  allgood &&= verify_number( expected[:to_ignore], /(:IGNORE)/, output)
-
-  #if we care about any other text, check that too
-  if (expected[:text])
-    allgood = expected[:text].inject(allgood) {|s,v| s && verify_match(/#{v}/, output) }
-    allgood &&= verify_number( expected[:text], /.+/, output )
-  end
-
-  report output if (!allgood && !$verbose) #report failures if not already reporting everything
-  return allgood
-end
-
-def verify_match(expression, output)
-  if (expression =~ output)
-    return true
-  else
-    report "  FAIL: No Match For /#{expression.to_s}/"
-    return false
-  end
-end
-
-def verify_number(expected, expression, output)
-  exp = expected.length
-  act = output.scan(expression).length
-  if (exp == act)
-    return true
-  else
-    report "  FAIL: Expected #{exp} Matches For /#{expression.to_s}/. Was #{act}"
-    return false
-  end
-end
-
-RUNNER_TESTS.each do |testset|
-  basename = File.basename(testset[:testfile], C_EXTENSION)
-  testset_name = "Runner_#{basename}_#{testset[:name]}"
-  should testset_name do
-    runner_name = OUT_FILE + testset[:name] + '_runner.c'
-
-    #create a yaml file first if required
-    yaml_option = ""
-    if (testset[:yaml])
-      File.open("build/runner_options.yml",'w') {|f| f << { :unity => testset[:yaml] }.to_yaml }
-      yaml_option = "build/runner_options.yml"
-    end
-
-    #run script via command line or through hash function call, as requested
-    if (testset[:cmdline])
-      cmdstr = "ruby ../auto/generate_test_runner.rb #{yaml_option} #{testset[:cmdline]} \"#{testset[:testfile]}\" \"#{runner_name}\""
-      `#{cmdstr}`
-    else
-      UnityTestRunnerGenerator.new(testset[:options]).run(testset[:testfile], runner_name)
-    end
-
-    #test the script against the specified test file and check results
-    if (runner_test(testset[:testfile], runner_name, testset[:expected], testset[:testdefines], testset[:cmdline_args]))
-      report "#{testset_name}:PASS"
-    else
-      report "#{testset_name}:FAIL"
-      $generate_test_runner_failures += 1
-    end
-    $generate_test_runner_tests += 1
-  end
-end
-
-raise "There were #{$generate_test_runner_failures.to_s} failures while testing generate_test_runner.rb" if ($generate_test_runner_failures > 0)
diff --git a/Unity/test/tests/testparameterized.c b/Unity/test/tests/testparameterized.c
deleted file mode 100755
index aa6d1732c..000000000
--- a/Unity/test/tests/testparameterized.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* ==========================================
-    Unity Project - A Test Framework for C
-    Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
-    [Released under MIT License. Please refer to license.txt for details]
-========================================== */
-
-#include <setjmp.h>
-#include <stdio.h>
-#include "unity.h"
-
-void putcharSpy(int c) { (void)putchar(c);} // include passthrough for linking tests
-
-#define TEST_CASE(...)
-
-#define EXPECT_ABORT_BEGIN \
-    if (TEST_PROTECT())    \
-    {
-
-#define VERIFY_FAILS_END                                                       \
-    }                                                                          \
-    Unity.CurrentTestFailed = (Unity.CurrentTestFailed != 0) ? 0 : 1;          \
-    if (Unity.CurrentTestFailed == 1) {                                        \
-      SetToOneMeanWeAlreadyCheckedThisGuy = 1;                                 \
-      UnityPrintNumberUnsigned(Unity.CurrentTestLineNumber);                   \
-      UNITY_OUTPUT_CHAR(':');                                                  \
-      UnityPrint(Unity.CurrentTestName);                                       \
-      UnityPrint(":FAIL: [[[[ Test Should Have Failed But Did Not ]]]]");      \
-      UNITY_OUTPUT_CHAR('\n');                                                 \
-    }
-
-#define VERIFY_IGNORES_END                                                     \
-    }                                                                          \
-    Unity.CurrentTestFailed = (Unity.CurrentTestIgnored != 0) ? 0 : 1;         \
-    Unity.CurrentTestIgnored = 0;                                              \
-    if (Unity.CurrentTestFailed == 1) {                                        \
-      SetToOneMeanWeAlreadyCheckedThisGuy = 1;                                 \
-      UnityPrintNumberUnsigned(Unity.CurrentTestLineNumber);                   \
-      UNITY_OUTPUT_CHAR(':');                                                  \
-      UnityPrint(Unity.CurrentTestName);                                       \
-      UnityPrint(":FAIL: [[[[ Test Should Have Ignored But Did Not ]]]]");     \
-      UNITY_OUTPUT_CHAR('\n');                                                 \
-    }
-
-int SetToOneToFailInTearDown;
-int SetToOneMeanWeAlreadyCheckedThisGuy;
-
-void setUp(void)
-{
-  SetToOneToFailInTearDown = 0;
-  SetToOneMeanWeAlreadyCheckedThisGuy = 0;
-}
-
-void tearDown(void)
-{
-  if (SetToOneToFailInTearDown == 1)
-    TEST_FAIL_MESSAGE("<= Failed in tearDown");
-  if ((SetToOneMeanWeAlreadyCheckedThisGuy == 0) && (Unity.CurrentTestFailed > 0))
-  {
-    UnityPrint(": [[[[ Test Should Have Passed But Did Not ]]]]");
-    UNITY_OUTPUT_CHAR('\n');
-  }
-}
-
-TEST_CASE(0)
-TEST_CASE(44)
-TEST_CASE((90)+9)
-void test_TheseShouldAllPass(int Num)
-{
-    TEST_ASSERT_TRUE(Num < 100);
-}
-
-TEST_CASE(3)
-TEST_CASE(77)
-TEST_CASE( (99) + 1 - (1))
-void test_TheseShouldAllFail(int Num)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_TRUE(Num > 100);
-    VERIFY_FAILS_END
-}
-
-TEST_CASE(1)
-TEST_CASE(44)
-TEST_CASE(99)
-TEST_CASE(98)
-void test_TheseAreEveryOther(int Num)
-{
-    if (Num & 1)
-    {
-        EXPECT_ABORT_BEGIN
-        TEST_ASSERT_TRUE(Num > 100);
-        VERIFY_FAILS_END
-    }
-    else
-    {
-        TEST_ASSERT_TRUE(Num < 100);
-    }
-}
-
-void test_NormalPassesStillWork(void)
-{
-    TEST_ASSERT_TRUE(1);
-}
-
-void test_NormalFailsStillWork(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_TRUE(0);
-    VERIFY_FAILS_END
-}
diff --git a/Unity/test/tests/testunity.c b/Unity/test/tests/testunity.c
deleted file mode 100755
index af06647f8..000000000
--- a/Unity/test/tests/testunity.c
+++ /dev/null
@@ -1,5337 +0,0 @@
-/* ==========================================
-    Unity Project - A Test Framework for C
-    Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
-    [Released under MIT License. Please refer to license.txt for details]
-========================================== */
-
-#include "unity.h"
-#include <string.h>
-#include <stdint.h>
-
-// Dividing by these constants produces +/- infinity.
-// The rationale is given in UnityAssertFloatIsInf's body.
-#ifndef UNITY_EXCLUDE_FLOAT
-static const UNITY_FLOAT f_zero = 0.0f;
-#endif
-
-#ifndef UNITY_EXCLUDE_DOUBLE
-static const UNITY_DOUBLE d_zero = 0.0;
-#endif
-
-#define EXPECT_ABORT_BEGIN \
-    startPutcharSpy();     \
-    if (TEST_PROTECT())    \
-    {
-
-#define VERIFY_FAILS_END                                                       \
-    }                                                                          \
-    endPutcharSpy(); /* start/end Spy to suppress output of failure message */ \
-    Unity.CurrentTestFailed = (Unity.CurrentTestFailed == 1) ? 0 : 1;          \
-    if (Unity.CurrentTestFailed == 1) {                                        \
-      SetToOneMeanWeAlreadyCheckedThisGuy = 1;                                 \
-      UnityPrintNumberUnsigned(Unity.CurrentTestLineNumber);                   \
-      UNITY_OUTPUT_CHAR(':');                                                  \
-      UnityPrint(Unity.CurrentTestName);                                       \
-      UnityPrint(":FAIL: [[[[ Test Should Have Failed But Did Not ]]]]");      \
-      UNITY_OUTPUT_CHAR('\n');                                                 \
-    }
-
-#define VERIFY_IGNORES_END                                                     \
-    }                                                                          \
-    endPutcharSpy(); /* start/end Spy to suppress output of ignore message */  \
-    Unity.CurrentTestFailed = (Unity.CurrentTestIgnored == 1) ? 0 : 1;         \
-    Unity.CurrentTestIgnored = 0;                                              \
-    if (Unity.CurrentTestFailed == 1) {                                        \
-      SetToOneMeanWeAlreadyCheckedThisGuy = 1;                                 \
-      UnityPrintNumberUnsigned(Unity.CurrentTestLineNumber);                   \
-      UNITY_OUTPUT_CHAR(':');                                                  \
-      UnityPrint(Unity.CurrentTestName);                                       \
-      UnityPrint(":FAIL: [[[[ Test Should Have Ignored But Did Not ]]]]");     \
-      UNITY_OUTPUT_CHAR('\n');                                                 \
-    }
-
-void startPutcharSpy(void);
-void endPutcharSpy(void);
-char* getBufferPutcharSpy(void);
-
-static int SetToOneToFailInTearDown;
-static int SetToOneMeanWeAlreadyCheckedThisGuy;
-
-void setUp(void)
-{
-    SetToOneToFailInTearDown = 0;
-    SetToOneMeanWeAlreadyCheckedThisGuy = 0;
-}
-
-void tearDown(void)
-{
-    endPutcharSpy(); /* Stop suppressing test output */
-    if (SetToOneToFailInTearDown == 1)
-    {
-        /* These will be skipped internally if already failed/ignored */
-        TEST_FAIL_MESSAGE("<= Failed in tearDown");
-        TEST_IGNORE_MESSAGE("<= Ignored in tearDown");
-    }
-    if ((SetToOneMeanWeAlreadyCheckedThisGuy == 0) && (Unity.CurrentTestFailed > 0))
-    {
-        UnityPrint(": [[[[ Test Should Have Passed But Did Not ]]]]");
-        UNITY_OUTPUT_CHAR('\n');
-    }
-}
-
-void testUnitySizeInitializationReminder(void)
-{
-    /* This test ensures that sizeof(struct UNITY_STORAGE_T) doesn't change. If this
-     * test breaks, go look at the initialization of the Unity global variable
-     * in unity.c and make sure we're filling in the proper fields. */
-    const char* message = "Unexpected size for UNITY_STORAGE_T struct. Please check that "
-                     "the initialization of the Unity symbol in unity.c is "
-                     "still correct.";
-
-    /* Define a structure with all the same fields as `struct UNITY_STORAGE_T`. */
-#ifdef UNITY_EXCLUDE_DETAILS
-    struct {
-        const char* TestFile;
-        const char* CurrentTestName;
-        UNITY_LINE_TYPE CurrentTestLineNumber;
-        UNITY_COUNTER_TYPE NumberOfTests;
-        UNITY_COUNTER_TYPE TestFailures;
-        UNITY_COUNTER_TYPE TestIgnores;
-        UNITY_COUNTER_TYPE CurrentTestFailed;
-        UNITY_COUNTER_TYPE CurrentTestIgnored;
-#ifndef UNITY_EXCLUDE_SETJMP_H
-        jmp_buf AbortFrame;
-#endif
-    } _Expected_Unity;
-#else
-    struct {
-        const char* TestFile;
-        const char* CurrentTestName;
-        const char* CurrentDetails1;
-        const char* CurrentDetails2;
-        UNITY_LINE_TYPE CurrentTestLineNumber;
-        UNITY_COUNTER_TYPE NumberOfTests;
-        UNITY_COUNTER_TYPE TestFailures;
-        UNITY_COUNTER_TYPE TestIgnores;
-        UNITY_COUNTER_TYPE CurrentTestFailed;
-        UNITY_COUNTER_TYPE CurrentTestIgnored;
-#ifndef UNITY_EXCLUDE_SETJMP_H
-        jmp_buf AbortFrame;
-#endif
-    } _Expected_Unity;
-#endif
-
-    /* Compare our fake structure's size to the actual structure's size. They
-     * should be the same.
-     *
-     * This accounts for alignment, padding, and packing issues that might come
-     * up between different architectures. */
-    TEST_ASSERT_EQUAL_MESSAGE(sizeof(_Expected_Unity), sizeof(Unity), message);
-}
-
-void testPassShouldEndImmediatelyWithPass(void)
-{
-    TEST_PASS();
-    TEST_FAIL_MESSAGE("We should have passed already and finished this test");
-}
-
-void testTrue(void)
-{
-    TEST_ASSERT(1);
-
-    TEST_ASSERT_TRUE(1);
-}
-
-void testFalse(void)
-{
-    TEST_ASSERT_FALSE(0);
-
-    TEST_ASSERT_UNLESS(0);
-}
-
-void testPreviousPass(void)
-{
-    TEST_ASSERT_EQUAL_INT(0U, Unity.TestFailures);
-}
-
-void testNotVanilla(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT(0);
-    VERIFY_FAILS_END
-}
-
-void testNotTrue(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_TRUE(0);
-    VERIFY_FAILS_END
-}
-
-void testNotFalse(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_FALSE(1);
-    VERIFY_FAILS_END
-}
-
-void testNotUnless(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_UNLESS(1);
-    VERIFY_FAILS_END
-}
-
-void testNotNotEqual(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_NOT_EQUAL(10, 10);
-    VERIFY_FAILS_END
-}
-
-void testFail(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_FAIL_MESSAGE("Expected for testing");
-    VERIFY_FAILS_END
-}
-
-void testIsNull(void)
-{
-    char* ptr1 = NULL;
-    const char* ptr2 = "hello";
-
-    TEST_ASSERT_NULL(ptr1);
-    TEST_ASSERT_NOT_NULL(ptr2);
-}
-
-void testIsNullShouldFailIfNot(void)
-{
-    const char* ptr1 = "hello";
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_NULL(ptr1);
-    VERIFY_FAILS_END
-}
-
-void testNotNullShouldFailIfNULL(void)
-{
-    char* ptr1 = NULL;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_NOT_NULL(ptr1);
-    VERIFY_FAILS_END
-}
-
-void testIgnore(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_IGNORE();
-    TEST_FAIL_MESSAGE("This should not be reached");
-    VERIFY_IGNORES_END
-}
-
-void testIgnoreMessage(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_IGNORE_MESSAGE("This is an expected TEST_IGNORE_MESSAGE string!");
-    TEST_FAIL_MESSAGE("This should not be reached");
-    VERIFY_IGNORES_END
-}
-
-void testNotEqualInts(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_INT(3982, 3983);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualInt8s(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_INT8(-127, -126);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualInt16s(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_INT16(-16383, -16382);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualInt32s(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_INT32(-2147483647, -2147483648); //use largest 32 bit negative to test printability
-    VERIFY_FAILS_END
-}
-
-void testNotEqualBits(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_BITS(0xFF00, 0x5555, 0x5A55);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualUInts(void)
-{
-    UNITY_UINT16 v0, v1;
-
-    v0 = 9000;
-    v1 = 9001;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_UINT(v0, v1);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualUInt8s(void)
-{
-    UNITY_UINT8 v0, v1;
-
-    v0 = 254;
-    v1 = 255;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_UINT8(v0, v1);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualUInt16s(void)
-{
-    UNITY_UINT16 v0, v1;
-
-    v0 = 65535;
-    v1 = 65534;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_UINT16(v0, v1);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualUInt32s(void)
-{
-    UNITY_UINT32 v0, v1;
-
-    v0 = 4294967295;
-    v1 = 4294967294;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_UINT32(v0, v1);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualHex8s(void)
-{
-    UNITY_UINT8 v0, v1;
-
-    v0 = 0x23;
-    v1 = 0x22;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_HEX8(v0, v1);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualHex8sIfSigned(void)
-{
-    UNITY_INT8 v0, v1;
-
-    v0 = -2;
-    v1 = 2;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_HEX8(v0, v1);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualHex16s(void)
-{
-    UNITY_UINT16 v0, v1;
-
-    v0 = 0x1234;
-    v1 = 0x1235;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_HEX16(v0, v1);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualHex16sIfSigned(void)
-{
-    UNITY_INT16 v0, v1;
-
-    v0 = -1024;
-    v1 = -1028;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_HEX16(v0, v1);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualHex32s(void)
-{
-    UNITY_UINT32 v0, v1;
-
-    v0 = 900000;
-    v1 = 900001;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_HEX32(v0, v1);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualHex32sIfSigned(void)
-{
-    UNITY_INT32 v0, v1;
-
-    v0 = -900000;
-    v1 = 900001;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_HEX32(v0, v1);
-    VERIFY_FAILS_END
-}
-
-void testEqualInts(void)
-{
-    int v0, v1;
-    int *p0, *p1;
-
-    v0 = 19467;
-    v1 = 19467;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_EQUAL_INT(1837, 1837);
-    TEST_ASSERT_EQUAL_INT(-27365, -27365);
-    TEST_ASSERT_EQUAL_INT(v0, v1);
-    TEST_ASSERT_EQUAL_INT(19467, v1);
-    TEST_ASSERT_EQUAL_INT(v0, 19467);
-    TEST_ASSERT_EQUAL_INT(*p0, v1);
-    TEST_ASSERT_EQUAL_INT(*p0, *p1);
-    TEST_ASSERT_EQUAL_INT(*p0, 19467);
-}
-
-void testEqualInt8s(void)
-{
-    UNITY_INT8 v0, v1;
-    UNITY_INT8 *p0, *p1;
-
-    v0 = 0x22;
-    v1 = 0x22;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_EQUAL_INT8(0x22, 0x22);
-    TEST_ASSERT_EQUAL_INT8(v0, v1);
-    TEST_ASSERT_EQUAL_INT8(0x22, v1);
-    TEST_ASSERT_EQUAL_INT8(v0, 0x22);
-    TEST_ASSERT_EQUAL_INT8(*p0, v1);
-    TEST_ASSERT_EQUAL_INT8(*p0, *p1);
-    TEST_ASSERT_EQUAL_INT8(*p0, 0x22);
-}
-
-void testEqualInt8sWhenThereAreDifferencesOutside8Bits(void)
-{
-    TEST_ASSERT_EQUAL_INT8(0x321,0x421);
-    TEST_ASSERT_EQUAL_INT8(0xFF21,0x0021);
-}
-
-void testEqualInt16s(void)
-{
-    UNITY_INT16 v0, v1;
-    UNITY_INT16 *p0, *p1;
-
-    v0 = 0x7876;
-    v1 = 0x7876;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_EQUAL_INT16(0x7876, 0x7876);
-    TEST_ASSERT_EQUAL_INT16(v0, v1);
-    TEST_ASSERT_EQUAL_INT16(0x7876, v1);
-    TEST_ASSERT_EQUAL_INT16(v0, 0x7876);
-    TEST_ASSERT_EQUAL_INT16(*p0, v1);
-    TEST_ASSERT_EQUAL_INT16(*p0, *p1);
-    TEST_ASSERT_EQUAL_INT16(*p0, 0x7876);
-}
-
-void testEqualInt16sNegatives(void)
-{
-    UNITY_INT16 v0, v1;
-    UNITY_INT16 *p0, *p1;
-
-    v0 = -7876;
-    v1 = -7876;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_EQUAL_INT16(-7876, -7876);
-    TEST_ASSERT_EQUAL_INT16(v0, v1);
-    TEST_ASSERT_EQUAL_INT16(-7876, v1);
-    TEST_ASSERT_EQUAL_INT16(v0, -7876);
-    TEST_ASSERT_EQUAL_INT16(*p0, v1);
-    TEST_ASSERT_EQUAL_INT16(*p0, *p1);
-    TEST_ASSERT_EQUAL_INT16(*p0, -7876);
-}
-
-void testEqualInt16sWhenThereAreDifferencesOutside16Bits(void)
-{
-    TEST_ASSERT_EQUAL_INT16(0x54321,0x64321);
-    TEST_ASSERT_EQUAL_INT16(0xFFFF4321,0x00004321);
-}
-
-void testEqualInt32s(void)
-{
-    UNITY_INT32 v0, v1;
-    UNITY_INT32 *p0, *p1;
-
-    v0 = 0x78760000;
-    v1 = 0x78760000;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_EQUAL_INT32(0x78760000, 0x78760000);
-    TEST_ASSERT_EQUAL_INT32(v0, v1);
-    TEST_ASSERT_EQUAL_INT32(0x78760000, v1);
-    TEST_ASSERT_EQUAL_INT32(v0, 0x78760000);
-    TEST_ASSERT_EQUAL_INT32(*p0, v1);
-    TEST_ASSERT_EQUAL_INT32(*p0, *p1);
-    TEST_ASSERT_EQUAL_INT32(*p0, 0x78760000);
-}
-
-void testEqualInt32sNegatives(void)
-{
-    UNITY_INT32 v0, v1;
-    UNITY_INT32 *p0, *p1;
-
-    v0 = -123456789;
-    v1 = -123456789;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_EQUAL_INT32(-123456789, -123456789);
-    TEST_ASSERT_EQUAL_INT32(v0, v1);
-    TEST_ASSERT_EQUAL_INT32(-123456789, v1);
-    TEST_ASSERT_EQUAL_INT32(v0, -123456789);
-    TEST_ASSERT_EQUAL_INT32(*p0, v1);
-    TEST_ASSERT_EQUAL_INT32(*p0, *p1);
-    TEST_ASSERT_EQUAL_INT32(*p0, -123456789);
-}
-
-
-void testEqualUints(void)
-{
-    unsigned int v0, v1;
-    unsigned int *p0, *p1;
-
-    v0 = 19467;
-    v1 = 19467;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_EQUAL_UINT(1837, 1837);
-    TEST_ASSERT_EQUAL_UINT(v0, v1);
-    TEST_ASSERT_EQUAL_UINT(19467, v1);
-    TEST_ASSERT_EQUAL_UINT(v0, 19467);
-    TEST_ASSERT_EQUAL_UINT(*p0, v1);
-    TEST_ASSERT_EQUAL_UINT(*p0, *p1);
-    TEST_ASSERT_EQUAL_UINT(*p0, 19467);
-    TEST_ASSERT_EQUAL_UINT(60872u, 60872u);
-}
-
-
-void testEqualUint8s(void)
-{
-    UNITY_UINT8 v0, v1;
-    UNITY_UINT8 *p0, *p1;
-
-    v0 = 0x22;
-    v1 = 0x22;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_EQUAL_UINT8(0x22, 0x22);
-    TEST_ASSERT_EQUAL_UINT8(v0, v1);
-    TEST_ASSERT_EQUAL_UINT8(0x22, v1);
-    TEST_ASSERT_EQUAL_UINT8(v0, 0x22);
-    TEST_ASSERT_EQUAL_UINT8(*p0, v1);
-    TEST_ASSERT_EQUAL_UINT8(*p0, *p1);
-    TEST_ASSERT_EQUAL_UINT8(*p0, 0x22);
-}
-
-void testEqualUint8sWhenThereAreDifferencesOutside8Bits(void)
-{
-    TEST_ASSERT_EQUAL_UINT8(0x321,0x421);
-    TEST_ASSERT_EQUAL_UINT8(0xFF21,0x0021);
-}
-
-void testEqualUint16s(void)
-{
-    UNITY_UINT16 v0, v1;
-    UNITY_UINT16 *p0, *p1;
-
-    v0 = 0x9876;
-    v1 = 0x9876;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_EQUAL_UINT16(0x9876, 0x9876);
-    TEST_ASSERT_EQUAL_UINT16(v0, v1);
-    TEST_ASSERT_EQUAL_UINT16(0x9876, v1);
-    TEST_ASSERT_EQUAL_UINT16(v0, 0x9876);
-    TEST_ASSERT_EQUAL_UINT16(*p0, v1);
-    TEST_ASSERT_EQUAL_UINT16(*p0, *p1);
-    TEST_ASSERT_EQUAL_UINT16(*p0, 0x9876);
-}
-
-void testEqualUint16sWhenThereAreDifferencesOutside16Bits(void)
-{
-    TEST_ASSERT_EQUAL_UINT16(0x54321,0x64321);
-    TEST_ASSERT_EQUAL_UINT16(0xFFFF4321,0x00004321);
-}
-
-void testEqualUint32s(void)
-{
-    UNITY_UINT32 v0, v1;
-    UNITY_UINT32 *p0, *p1;
-
-    v0 = 0x98760000;
-    v1 = 0x98760000;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_EQUAL_UINT32(0x98760000, 0x98760000);
-    TEST_ASSERT_EQUAL_UINT32(v0, v1);
-    TEST_ASSERT_EQUAL_UINT32(0x98760000, v1);
-    TEST_ASSERT_EQUAL_UINT32(v0, 0x98760000);
-    TEST_ASSERT_EQUAL_UINT32(*p0, v1);
-    TEST_ASSERT_EQUAL_UINT32(*p0, *p1);
-    TEST_ASSERT_EQUAL_UINT32(*p0, 0x98760000);
-}
-
-void testNotEqual(void)
-{
-    TEST_ASSERT_NOT_EQUAL(0, 1);
-    TEST_ASSERT_NOT_EQUAL(1, 0);
-    TEST_ASSERT_NOT_EQUAL(100, 101);
-    TEST_ASSERT_NOT_EQUAL(0, -1);
-    TEST_ASSERT_NOT_EQUAL(65535, -65535);
-    TEST_ASSERT_NOT_EQUAL(75, 900);
-    TEST_ASSERT_NOT_EQUAL(-100, -101);
-}
-
-void testEqualHex8s(void)
-{
-    UNITY_UINT8 v0, v1;
-    UNITY_UINT8 *p0, *p1;
-
-    v0 = 0x22;
-    v1 = 0x22;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_EQUAL_HEX8(0x22, 0x22);
-    TEST_ASSERT_EQUAL_HEX8(v0, v1);
-    TEST_ASSERT_EQUAL_HEX8(0x22, v1);
-    TEST_ASSERT_EQUAL_HEX8(v0, 0x22);
-    TEST_ASSERT_EQUAL_HEX8(*p0, v1);
-    TEST_ASSERT_EQUAL_HEX8(*p0, *p1);
-    TEST_ASSERT_EQUAL_HEX8(*p0, 0x22);
-}
-
-void testEqualHex8sWhenThereAreDifferencesOutside8Bits(void)
-{
-    TEST_ASSERT_EQUAL_HEX8(0x321,0x421);
-    TEST_ASSERT_EQUAL_HEX8(0xFF21,0x0021);
-}
-
-void testEqualHex8sNegatives(void)
-{
-    UNITY_UINT8 v0, v1;
-    UNITY_UINT8 *p0, *p1;
-
-    v0 = 0xDD;
-    v1 = 0xDD;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_EQUAL_HEX8(0xDD, 0xDD);
-    TEST_ASSERT_EQUAL_HEX8(v0, v1);
-    TEST_ASSERT_EQUAL_HEX8(0xDD, v1);
-    TEST_ASSERT_EQUAL_HEX8(v0, 0xDD);
-    TEST_ASSERT_EQUAL_HEX8(*p0, v1);
-    TEST_ASSERT_EQUAL_HEX8(*p0, *p1);
-    TEST_ASSERT_EQUAL_HEX8(*p0, 0xDD);
-}
-
-void testEqualHex16s(void)
-{
-    UNITY_UINT16 v0, v1;
-    UNITY_UINT16 *p0, *p1;
-
-    v0 = 0x9876;
-    v1 = 0x9876;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_EQUAL_HEX16(0x9876, 0x9876);
-    TEST_ASSERT_EQUAL_HEX16(v0, v1);
-    TEST_ASSERT_EQUAL_HEX16(0x9876, v1);
-    TEST_ASSERT_EQUAL_HEX16(v0, 0x9876);
-    TEST_ASSERT_EQUAL_HEX16(*p0, v1);
-    TEST_ASSERT_EQUAL_HEX16(*p0, *p1);
-    TEST_ASSERT_EQUAL_HEX16(*p0, 0x9876);
-}
-
-void testEqualHex16sWhenThereAreDifferencesOutside16Bits(void)
-{
-    TEST_ASSERT_EQUAL_HEX16(0x54321,0x64321);
-    TEST_ASSERT_EQUAL_HEX16(0xFFFF4321,0x00004321);
-}
-
-void testEqualHex32s(void)
-{
-    UNITY_UINT32 v0, v1;
-    UNITY_UINT32 *p0, *p1;
-
-    v0 = 0x98765432ul;
-    v1 = 0x98765432ul;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_EQUAL_HEX32(0x98765432ul, 0x98765432ul);
-    TEST_ASSERT_EQUAL_HEX32(v0, v1);
-    TEST_ASSERT_EQUAL_HEX32(0x98765432ul, v1);
-    TEST_ASSERT_EQUAL_HEX32(v0, 0x98765432ul);
-    TEST_ASSERT_EQUAL_HEX32(*p0, v1);
-    TEST_ASSERT_EQUAL_HEX32(*p0, *p1);
-    TEST_ASSERT_EQUAL_HEX32(*p0, 0x98765432ul);
-}
-
-void testEqualBits(void)
-{
-    UNITY_UINT32 v0 = 0xFF55AA00;
-    UNITY_UINT32 v1 = 0x55550000;
-
-    TEST_ASSERT_BITS(v1, v0, 0x55550000);
-    TEST_ASSERT_BITS(v1, v0, 0xFF55CC00);
-    TEST_ASSERT_BITS(0xFFFFFFFF, v0, 0xFF55AA00);
-    TEST_ASSERT_BITS(0xFFFFFFFF, v0, v0);
-    TEST_ASSERT_BITS(0xF0F0F0F0, v0, 0xFC5DAE0F);
-    TEST_ASSERT_BITS_HIGH(v1, v0);
-    TEST_ASSERT_BITS_LOW(0x000055FF, v0);
-    TEST_ASSERT_BIT_HIGH(30, v0);
-    TEST_ASSERT_BIT_LOW(5, v0);
-}
-
-void testNotEqualBitHigh(void)
-{
-    UNITY_UINT32 v0 = 0x7F55AA00;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_BIT_HIGH(31, v0);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualBitLow(void)
-{
-    UNITY_UINT32 v0 = 0xFF55AA00;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_BIT_LOW(30, v0);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualBitsHigh(void)
-{
-    UNITY_UINT32 v0 = 0xFF55AA00;
-    UNITY_UINT32 v1 = 0x55550000;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_BITS_HIGH(v0, v1);
-    VERIFY_FAILS_END
-
-}
-
-void testNotEqualBitsLow(void)
-{
-    UNITY_UINT32 v0 = 0xFF55AA00;
-    UNITY_UINT32 v1 = 0x55550000;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_BITS_LOW(v0, v1);
-    VERIFY_FAILS_END
-}
-
-
-void testEqualShorts(void)
-{
-    short v0, v1;
-    short *p0, *p1;
-
-    v0 = 19467;
-    v1 = 19467;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_EQUAL_INT(1837, 1837);
-    TEST_ASSERT_EQUAL_INT(-2987, -2987);
-    TEST_ASSERT_EQUAL_INT(v0, v1);
-    TEST_ASSERT_EQUAL_INT(19467, v1);
-    TEST_ASSERT_EQUAL_INT(v0, 19467);
-    TEST_ASSERT_EQUAL_INT(*p0, v1);
-    TEST_ASSERT_EQUAL_INT(*p0, *p1);
-    TEST_ASSERT_EQUAL_INT(*p0, 19467);
-}
-
-void testEqualUShorts(void)
-{
-    unsigned short v0, v1;
-    unsigned short *p0, *p1;
-
-    v0 = 19467;
-    v1 = 19467;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_EQUAL_UINT(1837, 1837);
-    TEST_ASSERT_EQUAL_UINT(2987, 2987);
-    TEST_ASSERT_EQUAL_UINT(v0, v1);
-    TEST_ASSERT_EQUAL_UINT(19467, v1);
-    TEST_ASSERT_EQUAL_UINT(v0, 19467);
-    TEST_ASSERT_EQUAL_UINT(*p0, v1);
-    TEST_ASSERT_EQUAL_UINT(*p0, *p1);
-    TEST_ASSERT_EQUAL_UINT(*p0, 19467);
-}
-
-void testEqualChars(void)
-{
-    signed char v0, v1;
-    signed char *p0, *p1;
-
-    v0 = 109;
-    v1 = 109;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_EQUAL_INT(42, 42);
-    TEST_ASSERT_EQUAL_INT(-116, -116);
-    TEST_ASSERT_EQUAL_INT(v0, v1);
-    TEST_ASSERT_EQUAL_INT(109, v1);
-    TEST_ASSERT_EQUAL_INT(v0, 109);
-    TEST_ASSERT_EQUAL_INT(*p0, v1);
-    TEST_ASSERT_EQUAL_INT(*p0, *p1);
-    TEST_ASSERT_EQUAL_INT(*p0, 109);
-}
-
-void testEqualUChars(void)
-{
-    unsigned char v0, v1;
-    unsigned char *p0, *p1;
-
-    v0 = 251;
-    v1 = 251;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_EQUAL_INT(42, 42);
-    TEST_ASSERT_EQUAL_INT(v0, v1);
-    TEST_ASSERT_EQUAL_INT(251, v1);
-    TEST_ASSERT_EQUAL_INT(v0, 251);
-    TEST_ASSERT_EQUAL_INT(*p0, v1);
-    TEST_ASSERT_EQUAL_INT(*p0, *p1);
-    TEST_ASSERT_EQUAL_INT(*p0, 251);
-}
-
-void testEqualPointers(void)
-{
-    int v0, v1;
-    int *p0, *p1, *p2;
-
-    v0 = 19467;
-    v1 = 18271;
-    p0 = &v0;
-    p1 = &v1;
-    p2 = &v1;
-
-    TEST_ASSERT_EQUAL_PTR(p0, &v0);
-    TEST_ASSERT_EQUAL_PTR(&v1, p1);
-    TEST_ASSERT_EQUAL_PTR(p2, p1);
-    TEST_ASSERT_EQUAL_PTR(&v0, &v0);
-}
-
-void testNotEqualPointers(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_PTR(0x12345678, 0x12345677);
-    VERIFY_FAILS_END
-}
-
-void testIntsWithinDelta(void)
-{
-    TEST_ASSERT_INT_WITHIN(1, 5000, 5001);
-    TEST_ASSERT_INT_WITHIN(5, 5000, 4996);
-    TEST_ASSERT_INT_WITHIN(5, 5000, 5005);
-    TEST_ASSERT_INT_WITHIN(500, 50, -440);
-
-    TEST_ASSERT_INT_WITHIN(2, -1, -1);
-    TEST_ASSERT_INT_WITHIN(5, 1, -1);
-    TEST_ASSERT_INT_WITHIN(5, -1, 1);
-}
-
-void testIntsWithinDeltaAndCustomMessage(void)
-{
-    TEST_ASSERT_INT_WITHIN_MESSAGE(1, 5000, 5001, "Custom Message.");
-    TEST_ASSERT_INT_WITHIN_MESSAGE(5, 5000, 4996, "Custom Message.");
-    TEST_ASSERT_INT_WITHIN_MESSAGE(5, 5000, 5005, "Custom Message.");
-    TEST_ASSERT_INT_WITHIN_MESSAGE(500, 50, -440, "Custom Message.");
-
-    TEST_ASSERT_INT_WITHIN_MESSAGE(2, -1, -1, "Custom Message.");
-    TEST_ASSERT_INT_WITHIN_MESSAGE(5, 1, -1, "Custom Message.");
-    TEST_ASSERT_INT_WITHIN_MESSAGE(5, -1, 1, "Custom Message.");
-}
-
-void testIntsNotWithinDelta(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_INT_WITHIN(5, 5000, 5006);
-    VERIFY_FAILS_END
-}
-
-void testIntsNotWithinDeltaAndCustomMessage(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_INT_WITHIN_MESSAGE(5, 5000, 5006, "Custom Message.");
-    VERIFY_FAILS_END
-}
-
-void testUIntsWithinDelta(void)
-{
-    TEST_ASSERT_UINT_WITHIN(1, 5000, 5001);
-    TEST_ASSERT_UINT_WITHIN(5, 5000, 4996);
-    TEST_ASSERT_UINT_WITHIN(5, 5000, 5005);
-}
-
-void testUIntsWithinDeltaAndCustomMessage(void)
-{
-    TEST_ASSERT_UINT_WITHIN_MESSAGE(1, 5000, 5001, "Custom Message.");
-    TEST_ASSERT_UINT_WITHIN_MESSAGE(5, 5000, 4996, "Custom Message.");
-    TEST_ASSERT_UINT_WITHIN_MESSAGE(5, 5000, 5005, "Custom Message.");
-}
-
-void testUIntsNotWithinDelta(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_UINT_WITHIN(1, 2147483647u, 2147483649u);
-    VERIFY_FAILS_END
-}
-
-void testUIntsNotWithinDeltaAndCustomMessage(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_UINT_WITHIN_MESSAGE(1, 2147483647u, 2147483649u, "Custom Message.");
-    VERIFY_FAILS_END
-}
-
-void testUIntsNotWithinDeltaEvenThoughASignedIntWouldPassSmallFirst(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_UINT_WITHIN(5, 1, -1);
-    VERIFY_FAILS_END
-}
-
-void testUIntsNotWithinDeltaEvenThoughASignedIntWouldPassSmallFirstAndCustomMessage(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_UINT_WITHIN_MESSAGE(5, 1, -1, "Custom Message.");
-    VERIFY_FAILS_END
-}
-
-void testUIntsNotWithinDeltaEvenThoughASignedIntWouldPassBigFirst(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_UINT_WITHIN(5, -1, 1);
-    VERIFY_FAILS_END
-}
-
-void testUIntsNotWithinDeltaEvenThoughASignedIntWouldPassBigFirstAndCustomMessage(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_UINT_WITHIN_MESSAGE(5, -1, 1, "Custom Message.");
-    VERIFY_FAILS_END
-}
-
-void testHEX32sWithinDelta(void)
-{
-    TEST_ASSERT_HEX32_WITHIN(1, 5000, 5001);
-    TEST_ASSERT_HEX32_WITHIN(5, 5000, 4996);
-    TEST_ASSERT_HEX32_WITHIN(5, 5000, 5005);
-}
-
-void testHEX32sWithinDeltaAndCustomMessage(void)
-{
-    TEST_ASSERT_HEX32_WITHIN_MESSAGE(1, 5000, 5001, "Custom Message.");
-    TEST_ASSERT_HEX32_WITHIN_MESSAGE(5, 5000, 4996, "Custom Message.");
-    TEST_ASSERT_HEX32_WITHIN_MESSAGE(5, 5000, 5005, "Custom Message.");
-}
-
-void testHEX32sNotWithinDelta(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_HEX32_WITHIN(1, 2147483647u, 2147483649u);
-    VERIFY_FAILS_END
-}
-
-void testHEX32sNotWithinDeltaAndCustomMessage(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_HEX32_WITHIN_MESSAGE(1, 2147483647u, 2147483649u, "Custom Message.");
-    VERIFY_FAILS_END
-}
-
-void testHEX32sNotWithinDeltaEvenThoughASignedIntWouldPass(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_HEX32_WITHIN(5, 1, -1);
-    VERIFY_FAILS_END
-}
-
-void testHEX32sNotWithinDeltaEvenThoughASignedIntWouldPassAndCustomMessage(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_HEX32_WITHIN_MESSAGE(5, 1, -1, "Custom Message.");
-    VERIFY_FAILS_END
-}
-
-void testHEX16sWithinDelta(void)
-{
-    TEST_ASSERT_HEX16_WITHIN(1, 5000, 5001);
-    TEST_ASSERT_HEX16_WITHIN(5, 5000, 4996);
-    TEST_ASSERT_HEX16_WITHIN(5, 5000, 5005);
-}
-
-void testHEX16sWithinDeltaAndCustomMessage(void)
-{
-    TEST_ASSERT_HEX16_WITHIN_MESSAGE(1, 5000, 5001, "Custom Message.");
-    TEST_ASSERT_HEX16_WITHIN_MESSAGE(5, 5000, 4996, "Custom Message.");
-    TEST_ASSERT_HEX16_WITHIN_MESSAGE(5, 5000, 5005, "Custom Message.");
-}
-
-void testHEX16sWithinDeltaWhenThereAreDifferenceOutsideOf16Bits(void)
-{
-    TEST_ASSERT_HEX16_WITHIN(5, 0x54321, 0x44321);
-}
-
-void testHEX16sWithinDeltaWhenThereAreDifferenceOutsideOf16BitsAndCustomMessage(void)
-{
-    TEST_ASSERT_HEX16_WITHIN_MESSAGE(5, 0x54321, 0x44321, "Custom Message.");
-}
-
-void testHEX16sNotWithinDelta(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_HEX16_WITHIN(2, 65535, 0);
-    VERIFY_FAILS_END
-}
-
-void testHEX16sNotWithinDeltaAndCustomMessage(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_HEX16_WITHIN_MESSAGE(2, 65535, 0, "Custom Message.");
-    VERIFY_FAILS_END
-}
-
-void testHEX8sWithinDelta(void)
-{
-    TEST_ASSERT_HEX8_WITHIN(1, 254, 255);
-    TEST_ASSERT_HEX8_WITHIN(5, 251, 255);
-    TEST_ASSERT_HEX8_WITHIN(5, 1, 4);
-}
-
-void testHEX8sWithinDeltaAndCustomMessage(void)
-{
-    TEST_ASSERT_HEX8_WITHIN_MESSAGE(1, 254, 255, "Custom Message.");
-    TEST_ASSERT_HEX8_WITHIN_MESSAGE(5, 251, 255, "Custom Message.");
-    TEST_ASSERT_HEX8_WITHIN_MESSAGE(5, 1, 4, "Custom Message.");
-}
-
-void testHEX8sWithinDeltaWhenThereAreDifferenceOutsideOf8Bits(void)
-{
-    TEST_ASSERT_HEX8_WITHIN(5, 0x123, 0xF23);
-}
-
-void testHEX8sWithinDeltaWhenThereAreDifferenceOutsideOf8BitsAndCustomMessage(void)
-{
-    TEST_ASSERT_HEX8_WITHIN_MESSAGE(5, 0x123, 0xF23, "Custom Message.");
-}
-
-void testHEX8sNotWithinDelta(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_HEX8_WITHIN(2, 255, 0);
-    VERIFY_FAILS_END
-}
-
-void testHEX8sNotWithinDeltaAndCustomMessage(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_HEX8_WITHIN_MESSAGE(2, 255, 0, "Custom Message.");
-    VERIFY_FAILS_END
-}
-
-//-----------------
-
-void testUINT32sWithinDelta(void)
-{
-    TEST_ASSERT_UINT32_WITHIN(1, 5000, 5001);
-    TEST_ASSERT_UINT32_WITHIN(5, 5000, 4996);
-    TEST_ASSERT_UINT32_WITHIN(5, 5000, 5005);
-}
-
-void testUINT32sWithinDeltaAndCustomMessage(void)
-{
-    TEST_ASSERT_UINT32_WITHIN_MESSAGE(1, 5000, 5001, "Custom Message.");
-    TEST_ASSERT_UINT32_WITHIN_MESSAGE(5, 5000, 4996, "Custom Message.");
-    TEST_ASSERT_UINT32_WITHIN_MESSAGE(5, 5000, 5005, "Custom Message.");
-}
-
-void testUINT32sNotWithinDelta(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_UINT32_WITHIN(1, 2147483647u, 2147483649u);
-    VERIFY_FAILS_END
-}
-
-void testUINT32sNotWithinDeltaAndCustomMessage(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_UINT32_WITHIN_MESSAGE(1, 2147483647u, 2147483649u, "Custom Message.");
-    VERIFY_FAILS_END
-}
-
-void testUINT32sNotWithinDeltaEvenThoughASignedIntWouldPass(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_UINT32_WITHIN(5, 1, -1);
-    VERIFY_FAILS_END
-}
-
-void testUINT32sNotWithinDeltaEvenThoughASignedIntWouldPassAndCustomMessage(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_UINT32_WITHIN_MESSAGE(5, 1, -1, "Custom Message.");
-    VERIFY_FAILS_END
-}
-
-void testUINT16sWithinDelta(void)
-{
-    TEST_ASSERT_UINT16_WITHIN(1, 5000, 5001);
-    TEST_ASSERT_UINT16_WITHIN(5, 5000, 4996);
-    TEST_ASSERT_UINT16_WITHIN(5, 5000, 5005);
-}
-
-void testUINT16sWithinDeltaAndCustomMessage(void)
-{
-    TEST_ASSERT_UINT16_WITHIN_MESSAGE(1, 5000, 5001, "Custom Message.");
-    TEST_ASSERT_UINT16_WITHIN_MESSAGE(5, 5000, 4996, "Custom Message.");
-    TEST_ASSERT_UINT16_WITHIN_MESSAGE(5, 5000, 5005, "Custom Message.");
-}
-
-void testUINT16sWithinDeltaWhenThereAreDifferenceOutsideOf16Bits(void)
-{
-    TEST_ASSERT_UINT16_WITHIN(5, 0x54321, 0x44321);
-}
-
-void testUINT16sWithinDeltaWhenThereAreDifferenceOutsideOf16BitsAndCustomMessage(void)
-{
-    TEST_ASSERT_UINT16_WITHIN_MESSAGE(5, 0x54321, 0x44321, "Custom Message.");
-}
-
-void testUINT16sNotWithinDelta(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_UINT16_WITHIN(2, 65535, 0);
-    VERIFY_FAILS_END
-}
-
-void testUINT16sNotWithinDeltaAndCustomMessage(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_UINT16_WITHIN_MESSAGE(2, 65535, 0, "Custom Message.");
-    VERIFY_FAILS_END
-}
-
-void testUINT8sWithinDelta(void)
-{
-    TEST_ASSERT_UINT8_WITHIN(1, 254, 255);
-    TEST_ASSERT_UINT8_WITHIN(5, 251, 255);
-    TEST_ASSERT_UINT8_WITHIN(5, 1, 4);
-}
-
-void testUINT8sWithinDeltaAndCustomMessage(void)
-{
-    TEST_ASSERT_UINT8_WITHIN_MESSAGE(1, 254, 255, "Custom Message.");
-    TEST_ASSERT_UINT8_WITHIN_MESSAGE(5, 251, 255, "Custom Message.");
-    TEST_ASSERT_UINT8_WITHIN_MESSAGE(5, 1, 4, "Custom Message.");
-}
-
-void testUINT8sWithinDeltaWhenThereAreDifferenceOutsideOf8Bits(void)
-{
-    TEST_ASSERT_UINT8_WITHIN(5, 0x123, 0xF23);
-}
-
-void testUINT8sWithinDeltaWhenThereAreDifferenceOutsideOf8BitsAndCustomMessage(void)
-{
-    TEST_ASSERT_UINT8_WITHIN_MESSAGE(5, 0x123, 0xF23, "Custom Message.");
-}
-
-void testUINT8sNotWithinDelta(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_UINT8_WITHIN(2, 255, 0);
-    VERIFY_FAILS_END
-}
-
-void testUINT8sNotWithinDeltaAndCustomMessage(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_UINT8_WITHIN_MESSAGE(2, 255, 0, "Custom Message.");
-    VERIFY_FAILS_END
-}
-
-void testINT32sWithinDelta(void)
-{
-    TEST_ASSERT_INT32_WITHIN(1, 5000, 5001);
-    TEST_ASSERT_INT32_WITHIN(5, 1, -2);
-    TEST_ASSERT_INT32_WITHIN(5, -2, 1);
-}
-
-void testINT32sWithinDeltaAndCustomMessage(void)
-{
-    TEST_ASSERT_INT32_WITHIN_MESSAGE(1, 5000, 5001, "Custom Message.");
-}
-
-void testINT32sNotWithinDelta(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_INT32_WITHIN(1, -3, 1);
-    VERIFY_FAILS_END
-}
-
-void testINT32sNotWithinDeltaAndDifferenceOverflows(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_INT32_WITHIN(1, -1, 0x7FFFFFFF);
-    VERIFY_FAILS_END
-}
-void testINT32sNotWithinDeltaAndCustomMessage(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_INT32_WITHIN_MESSAGE(1, -2, 1, "Custom Message.");
-    VERIFY_FAILS_END
-}
-
-void testINT16sWithinDelta(void)
-{
-    TEST_ASSERT_INT16_WITHIN(1, 5000, 5001);
-    TEST_ASSERT_INT16_WITHIN(5, 2, -2);
-    TEST_ASSERT_INT16_WITHIN(5, -2, 2);
-}
-
-void testINT16sWithinDeltaAndCustomMessage(void)
-{
-    TEST_ASSERT_INT16_WITHIN_MESSAGE(1, 5000, 5001, "Custom Message.");
-}
-
-void testINT16sWithinDeltaWhenThereAreDifferenceOutsideOf16Bits(void)
-{
-    TEST_ASSERT_INT16_WITHIN(5, 0x54321, 0x44321);
-}
-
-void testINT16sWithinDeltaWhenThereAreDifferenceOutsideOf16BitsAndCustomMessage(void)
-{
-    TEST_ASSERT_INT16_WITHIN_MESSAGE(5, 0x54321, 0x44321, "Custom Message.");
-}
-
-void testINT16sNotWithinDelta(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_INT16_WITHIN(2, 4, -2);
-    VERIFY_FAILS_END
-}
-
-void testINT16sNotWithinDeltaAndCustomMessage(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_INT16_WITHIN_MESSAGE(2, 3, 0, "Custom Message.");
-    VERIFY_FAILS_END
-}
-
-void testINT8sWithinDelta(void)
-{
-    TEST_ASSERT_INT8_WITHIN(1, 127, 126);
-    TEST_ASSERT_INT8_WITHIN(5, -2, 2);
-    TEST_ASSERT_INT8_WITHIN(5, 2, -2);
-}
-
-void testINT8sWithinDeltaAndCustomMessage(void)
-{
-    TEST_ASSERT_INT8_WITHIN_MESSAGE(5, 1, 4, "Custom Message.");
-}
-
-void testINT8sWithinDeltaWhenThereAreDifferenceOutsideOf8Bits(void)
-{
-    TEST_ASSERT_INT8_WITHIN(5, 0x123, 0xF23);
-}
-
-void testINT8sWithinDeltaWhenThereAreDifferenceOutsideOf8BitsAndCustomMessage(void)
-{
-    TEST_ASSERT_INT8_WITHIN_MESSAGE(5, 0x123, 0xF23, "Custom Message.");
-}
-
-void testINT8sNotWithinDelta(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_INT8_WITHIN(2, -3, 0);
-    VERIFY_FAILS_END
-}
-
-void testINT8sNotWithinDeltaAndCustomMessage(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_INT8_WITHIN_MESSAGE(2, -4, 0, "Custom Message.");
-    VERIFY_FAILS_END
-}
-
-
-//-----------------
-void testGreaterThan(void)
-{
-    UNITY_INT v0, v1;
-    UNITY_INT *p0, *p1;
-
-    v0 = 0;
-    v1 = 1;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_GREATER_THAN(v0, v1);
-    TEST_ASSERT_GREATER_THAN(*p0, v1);
-    TEST_ASSERT_GREATER_THAN(v0, *p1);
-    TEST_ASSERT_GREATER_THAN(*p0, *p1);
-}
-
-void testGreaterThanINT(void)
-{
-    UNITY_INT v0, v1;
-    UNITY_INT *p0, *p1;
-
-    v0 = 302;
-    v1 = 3334;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_GREATER_THAN_INT(v0, v1);
-    TEST_ASSERT_GREATER_THAN_INT(*p0, v1);
-    TEST_ASSERT_GREATER_THAN_INT(v0, *p1);
-    TEST_ASSERT_GREATER_THAN_INT(*p0, *p1);
-}
-
-
-void testGreaterThanINT8(void)
-{
-    UNITY_INT8 v0, v1;
-    UNITY_INT8 *p0, *p1;
-
-    v0 = -128;
-    v1 = 127;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_GREATER_THAN_INT8(v0, v1);
-    TEST_ASSERT_GREATER_THAN_INT8(*p0, v1);
-    TEST_ASSERT_GREATER_THAN_INT8(v0, *p1);
-    TEST_ASSERT_GREATER_THAN_INT8(*p0, *p1);
-}
-
-void testGreaterThanINT16(void)
-{
-    UNITY_INT16 v0, v1;
-    UNITY_INT16 *p0, *p1;
-
-    v0 = -32768;
-    v1 = 32767;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_GREATER_THAN_INT16(v0, v1);
-    TEST_ASSERT_GREATER_THAN_INT16(*p0, v1);
-    TEST_ASSERT_GREATER_THAN_INT16(v0, *p1);
-    TEST_ASSERT_GREATER_THAN_INT16(*p0, *p1);
-}
-
-void testGreaterThanINT32(void)
-{
-    UNITY_INT32 v0, v1;
-    UNITY_INT32 *p0, *p1;
-
-    v0 = -214783648;
-    v1 = 214783647;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_GREATER_THAN_INT32(v0, v1);
-    TEST_ASSERT_GREATER_THAN_INT32(*p0, v1);
-    TEST_ASSERT_GREATER_THAN_INT32(v0, *p1);
-    TEST_ASSERT_GREATER_THAN_INT32(*p0, *p1);
-}
-
-void testGreaterThanUINT(void)
-{
-    UNITY_UINT v0, v1;
-    UNITY_UINT *p0, *p1;
-
-    v0 = 0;
-    v1 = 1;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_GREATER_THAN_UINT(v0, v1);
-    TEST_ASSERT_GREATER_THAN_UINT(*p0, v1);
-    TEST_ASSERT_GREATER_THAN_UINT(v0, *p1);
-    TEST_ASSERT_GREATER_THAN_UINT(*p0, *p1);
-}
-
-
-void testGreaterThanUINT8(void)
-{
-    UNITY_UINT8 v0, v1;
-    UNITY_UINT8 *p0, *p1;
-
-    v0 = 0;
-    v1 = 255;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_GREATER_THAN_UINT8(v0, v1);
-    TEST_ASSERT_GREATER_THAN_UINT8(*p0, v1);
-    TEST_ASSERT_GREATER_THAN_UINT8(v0, *p1);
-    TEST_ASSERT_GREATER_THAN_UINT8(*p0, *p1);
-}
-
-void testGreaterThanUINT16(void)
-{
-    UNITY_UINT16 v0, v1;
-    UNITY_UINT16 *p0, *p1;
-
-    v0 = 0;
-    v1 = 65535;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_GREATER_THAN_UINT16(v0, v1);
-    TEST_ASSERT_GREATER_THAN_UINT16(*p0, v1);
-    TEST_ASSERT_GREATER_THAN_UINT16(v0, *p1);
-    TEST_ASSERT_GREATER_THAN_UINT16(*p0, *p1);
-}
-
-void testGreaterThanUINT32(void)
-{
-    UNITY_UINT32 v0, v1;
-    UNITY_UINT32 *p0, *p1;
-
-    v0 = 0;
-    v1 = 4294967295;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_GREATER_THAN_UINT32(v0, v1);
-    TEST_ASSERT_GREATER_THAN_UINT32(*p0, v1);
-    TEST_ASSERT_GREATER_THAN_UINT32(v0, *p1);
-    TEST_ASSERT_GREATER_THAN_UINT32(*p0, *p1);
-}
-
-void testGreaterThanHEX8(void)
-{
-    UNITY_UINT8 v0, v1;
-    UNITY_UINT8 *p0, *p1;
-
-    v0 = 0x00;
-    v1 = 0xFF;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_GREATER_THAN_HEX8(v0, v1);
-    TEST_ASSERT_GREATER_THAN_HEX8(*p0, v1);
-    TEST_ASSERT_GREATER_THAN_HEX8(v0, *p1);
-    TEST_ASSERT_GREATER_THAN_HEX8(*p0, *p1);
-}
-
-void testGreaterThanHEX16(void)
-{
-    UNITY_UINT16 v0, v1;
-    UNITY_UINT16 *p0, *p1;
-
-    v0 = 0x0000;
-    v1 = 0xFFFF;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_GREATER_THAN_HEX16(v0, v1);
-    TEST_ASSERT_GREATER_THAN_HEX16(*p0, v1);
-    TEST_ASSERT_GREATER_THAN_HEX16(v0, *p1);
-    TEST_ASSERT_GREATER_THAN_HEX16(*p0, *p1);
-}
-
-void testGreaterThanHEX32(void)
-{
-    UNITY_UINT32 v0, v1;
-    UNITY_UINT32 *p0, *p1;
-
-    v0 = 0x00000000;
-    v1 = 0xFFFFFFFF;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_GREATER_THAN_HEX32(v0, v1);
-    TEST_ASSERT_GREATER_THAN_HEX32(*p0, v1);
-    TEST_ASSERT_GREATER_THAN_HEX32(v0, *p1);
-    TEST_ASSERT_GREATER_THAN_HEX32(*p0, *p1);
-}
-
-
-void testNotGreaterThan(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_GREATER_THAN(0, -1);
-    VERIFY_FAILS_END
-}
-
-void testLessThan(void)
-{
-    UNITY_INT v0, v1;
-    UNITY_INT *p0, *p1;
-
-    v0 = 0;
-    v1 = -1;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_LESS_THAN(v0, v1);
-    TEST_ASSERT_LESS_THAN(*p0, v1);
-    TEST_ASSERT_LESS_THAN(v0, *p1);
-    TEST_ASSERT_LESS_THAN(*p0, *p1);
-}
-
-void testLessThanINT(void)
-{
-    UNITY_INT v0, v1;
-    UNITY_INT *p0, *p1;
-
-    v0 = 3334;
-    v1 = 302;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_LESS_THAN_INT(v0, v1);
-    TEST_ASSERT_LESS_THAN_INT(*p0, v1);
-    TEST_ASSERT_LESS_THAN_INT(v0, *p1);
-    TEST_ASSERT_LESS_THAN_INT(*p0, *p1);
-}
-
-
-void testLessThanINT8(void)
-{
-    UNITY_INT8 v0, v1;
-    UNITY_INT8 *p0, *p1;
-
-    v0 = 127;
-    v1 = -128;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_LESS_THAN_INT8(v0, v1);
-    TEST_ASSERT_LESS_THAN_INT8(*p0, v1);
-    TEST_ASSERT_LESS_THAN_INT8(v0, *p1);
-    TEST_ASSERT_LESS_THAN_INT8(*p0, *p1);
-}
-
-void testLessThanINT16(void)
-{
-    UNITY_INT16 v0, v1;
-    UNITY_INT16 *p0, *p1;
-
-    v0 = 32767;
-    v1 = -32768;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_LESS_THAN_INT16(v0, v1);
-    TEST_ASSERT_LESS_THAN_INT16(*p0, v1);
-    TEST_ASSERT_LESS_THAN_INT16(v0, *p1);
-    TEST_ASSERT_LESS_THAN_INT16(*p0, *p1);
-}
-
-void testLessThanINT32(void)
-{
-    UNITY_INT32 v0, v1;
-    UNITY_INT32 *p0, *p1;
-
-    v0 = 214783647;
-    v1 = -214783648;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_LESS_THAN_INT32(v0, v1);
-    TEST_ASSERT_LESS_THAN_INT32(*p0, v1);
-    TEST_ASSERT_LESS_THAN_INT32(v0, *p1);
-    TEST_ASSERT_LESS_THAN_INT32(*p0, *p1);
-}
-
-void testLessThanUINT(void)
-{
-    UNITY_UINT v0, v1;
-    UNITY_UINT *p0, *p1;
-
-    v0 = 1;
-    v1 = 0;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_LESS_THAN_UINT(v0, v1);
-    TEST_ASSERT_LESS_THAN_UINT(*p0, v1);
-    TEST_ASSERT_LESS_THAN_UINT(v0, *p1);
-    TEST_ASSERT_LESS_THAN_UINT(*p0, *p1);
-}
-
-
-void testLessThanUINT8(void)
-{
-    UNITY_UINT8 v0, v1;
-    UNITY_UINT8 *p0, *p1;
-
-    v0 = 255;
-    v1 = 0;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_LESS_THAN_UINT8(v0, v1);
-    TEST_ASSERT_LESS_THAN_UINT8(*p0, v1);
-    TEST_ASSERT_LESS_THAN_UINT8(v0, *p1);
-    TEST_ASSERT_LESS_THAN_UINT8(*p0, *p1);
-}
-
-void testLessThanUINT16(void)
-{
-    UNITY_UINT16 v0, v1;
-    UNITY_UINT16 *p0, *p1;
-
-    v0 = 65535;
-    v1 = 0;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_LESS_THAN_UINT16(v0, v1);
-    TEST_ASSERT_LESS_THAN_UINT16(*p0, v1);
-    TEST_ASSERT_LESS_THAN_UINT16(v0, *p1);
-    TEST_ASSERT_LESS_THAN_UINT16(*p0, *p1);
-}
-
-void testLessThanUINT32(void)
-{
-    UNITY_UINT32 v0, v1;
-    UNITY_UINT32 *p0, *p1;
-
-    v0 = 4294967295;
-    v1 = 0;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_LESS_THAN_UINT32(v0, v1);
-    TEST_ASSERT_LESS_THAN_UINT32(*p0, v1);
-    TEST_ASSERT_LESS_THAN_UINT32(v0, *p1);
-    TEST_ASSERT_LESS_THAN_UINT32(*p0, *p1);
-}
-
-void testLessThanHEX8(void)
-{
-    UNITY_UINT8 v0, v1;
-    UNITY_UINT8 *p0, *p1;
-
-    v0 = 0xFF;
-    v1 = 0x00;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_LESS_THAN_HEX8(v0, v1);
-    TEST_ASSERT_LESS_THAN_HEX8(*p0, v1);
-    TEST_ASSERT_LESS_THAN_HEX8(v0, *p1);
-    TEST_ASSERT_LESS_THAN_HEX8(*p0, *p1);
-}
-
-void testLessThanHEX16(void)
-{
-    UNITY_UINT16 v0, v1;
-    UNITY_UINT16 *p0, *p1;
-
-    v0 = 0xFFFF;
-    v1 = 0x0000;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_LESS_THAN_HEX16(v0, v1);
-    TEST_ASSERT_LESS_THAN_HEX16(*p0, v1);
-    TEST_ASSERT_LESS_THAN_HEX16(v0, *p1);
-    TEST_ASSERT_LESS_THAN_HEX16(*p0, *p1);
-}
-
-void testLessThanHEX32(void)
-{
-    UNITY_UINT32 v0, v1;
-    UNITY_UINT32 *p0, *p1;
-
-    v0 = 0xFFFFFFFF;
-    v1 = 0x00000000;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_LESS_THAN_HEX32(v0, v1);
-    TEST_ASSERT_LESS_THAN_HEX32(*p0, v1);
-    TEST_ASSERT_LESS_THAN_HEX32(v0, *p1);
-    TEST_ASSERT_LESS_THAN_HEX32(*p0, *p1);
-}
-
-
-void testNotLessThan(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_LESS_THAN(0, 1);
-    VERIFY_FAILS_END
-}
-
-
-
-//-----------------
-void testEqualStrings(void)
-{
-    const char *testString = "foo";
-
-    TEST_ASSERT_EQUAL_STRING(testString, testString);
-    TEST_ASSERT_EQUAL_STRING_MESSAGE("foo", "foo", "foo isn't foo");
-    TEST_ASSERT_EQUAL_STRING("foo", testString);
-    TEST_ASSERT_EQUAL_STRING(testString, "foo");
-    TEST_ASSERT_EQUAL_STRING("", "");
-}
-
-void testEqualStringsLen(void)
-{
-    const char *testString = "foobar";
-    TEST_ASSERT_EQUAL_STRING_LEN(testString, testString, strlen(testString));
-    TEST_ASSERT_EQUAL_STRING_LEN_MESSAGE("foobar", "foobaz", 5, "fooba isn't fooba");
-    TEST_ASSERT_EQUAL_STRING_LEN("foo", testString, 3);
-    TEST_ASSERT_EQUAL_STRING_LEN(testString, "foo", 3);
-    TEST_ASSERT_EQUAL_STRING_LEN("", "", 3);
-}
-
-void testEqualStringsWithCarriageReturnsAndLineFeeds(void)
-{
-    const char *testString = "foo\r\nbar";
-
-    TEST_ASSERT_EQUAL_STRING(testString, testString);
-    TEST_ASSERT_EQUAL_STRING("foo\r\nbar", "foo\r\nbar");
-    TEST_ASSERT_EQUAL_STRING("foo\r\nbar", testString);
-    TEST_ASSERT_EQUAL_STRING(testString, "foo\r\nbar");
-    TEST_ASSERT_EQUAL_STRING("", "");
-}
-
-void testNotEqualString1(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_STRING("foo", "bar");
-    VERIFY_FAILS_END
-}
-
-void testNotEqualStringLen1(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_STRING_LEN("foobar", "foobaz", 6);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualString2(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_STRING("foo", "");
-    VERIFY_FAILS_END
-}
-
-void testNotEqualStringLen2(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_STRING_LEN("foo", "", 3);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualString3(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_STRING("", "bar");
-    VERIFY_FAILS_END
-}
-
-void testNotEqualStringLen3(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_STRING_LEN("", "bar", 3);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualString4(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_STRING("bar\r", "bar\n");
-    VERIFY_FAILS_END
-}
-
-void testNotEqualStringLen4(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_STRING_LEN("ba\r\x16", "ba\r\n", 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualString5(void)
-{
-    const char str1[] = { 0x41, 0x42, 0x03, 0x00 };
-    const char str2[] = { 0x41, 0x42, 0x04, 0x00 };
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_STRING(str1, str2);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualString_ExpectedStringIsNull(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_STRING(NULL, "bar");
-    VERIFY_FAILS_END
-}
-
-void testNotEqualStringLen_ExpectedStringIsNull(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_STRING_LEN(NULL, "bar", 1);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualString_ActualStringIsNull(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_STRING("foo", NULL);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualStringLen_ActualStringIsNull(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_STRING_LEN("foo", NULL, 1);
-    VERIFY_FAILS_END
-}
-
-void testEqualStringArrays(void)
-{
-    const char *testStrings[] = { "foo", "boo", "woo", "moo" };
-    const char *expStrings[] = { "foo", "boo", "woo", "zoo" };
-
-    TEST_ASSERT_EQUAL_STRING_ARRAY(expStrings, expStrings, 3);
-    TEST_ASSERT_EQUAL_STRING_ARRAY(expStrings, testStrings, 3);
-    TEST_ASSERT_EQUAL_STRING_ARRAY(expStrings, testStrings, 2);
-    TEST_ASSERT_EQUAL_STRING_ARRAY(expStrings, testStrings, 1);
-}
-
-void testNotEqualStringArray1(void)
-{
-    const char *testStrings[] = { "foo", "boo", "woo", "moo" };
-    const char *expStrings[] = { "foo", "boo", "woo", "zoo" };
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_STRING_ARRAY(expStrings, testStrings, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualStringArray2(void)
-{
-    const char *testStrings[] = { "zoo", "boo", "woo", "moo" };
-    const char *expStrings[] = { "foo", "boo", "woo", "moo" };
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_STRING_ARRAY(expStrings, testStrings, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualStringArray3(void)
-{
-    const char *testStrings[] = { "foo", "boo", "woo", NULL };
-    const char *expStrings[] = { "foo", "boo", "woo", "zoo" };
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_STRING_ARRAY(expStrings, testStrings, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualStringArray4(void)
-{
-    const char *testStrings[] = { "foo", "boo", "woo", "moo" };
-    const char *expStrings[] = { "foo", NULL, "woo", "moo" };
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_STRING_ARRAY(expStrings, testStrings, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualStringArray5(void)
-{
-    const char **testStrings = NULL;
-    const char *expStrings[] = { "foo", "boo", "woo", "zoo" };
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_STRING_ARRAY(expStrings, testStrings, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualStringArray6(void)
-{
-    const char *testStrings[] = { "foo", "boo", "woo", "zoo" };
-    const char **expStrings = NULL;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_STRING_ARRAY(expStrings, testStrings, 4);
-    VERIFY_FAILS_END
-}
-
-void testEqualStringArrayIfBothNulls(void)
-{
-    const char **testStrings = NULL;
-    const char **expStrings = NULL;
-
-    TEST_ASSERT_EQUAL_STRING_ARRAY(expStrings, testStrings, 4);
-}
-
-void testNotEqualStringArrayLengthZero(void)
-{
-    const char *testStrings[] = {NULL};
-    const char **expStrings = NULL;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_STRING_ARRAY(expStrings, testStrings, 0);
-    VERIFY_FAILS_END
-}
-
-void testEqualStringEachEqual(void)
-{
-    const char *testStrings1[] = { "foo", "foo", "foo", "foo" };
-    const char *testStrings2[] = { "boo", "boo", "boo", "zoo" };
-    const char *testStrings3[] = { "", "", "", "" };
-
-    TEST_ASSERT_EACH_EQUAL_STRING("foo", testStrings1, 4);
-    TEST_ASSERT_EACH_EQUAL_STRING("foo", testStrings1, 1);
-    TEST_ASSERT_EACH_EQUAL_STRING("boo", testStrings2, 3);
-    TEST_ASSERT_EACH_EQUAL_STRING("", testStrings3, 4);
-}
-
-void testNotEqualStringEachEqual1(void)
-{
-    const char *testStrings[] = { "foo", "foo", "foo", "moo" };
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_STRING("foo", testStrings, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualStringEachEqual2(void)
-{
-    const char *testStrings[] = { "boo", "foo", "foo", "foo" };
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_STRING("foo", testStrings, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualStringEachEqual3(void)
-{
-    const char *testStrings[] = { "foo", "foo", "foo", NULL };
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_STRING("foo", testStrings, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualStringEachEqual4(void)
-{
-    const char *testStrings[] = { "foo", "foo", "woo", "foo" };
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_STRING("foo", testStrings, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualStringEachEqual5(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_STRING("foo", NULL, 1);
-    VERIFY_FAILS_END
-}
-
-void testEqualMemory(void)
-{
-    const char *testString = "whatever";
-
-    TEST_ASSERT_EQUAL_MEMORY(testString, testString, 8);
-    TEST_ASSERT_EQUAL_MEMORY("whatever", "whatever", 8);
-    TEST_ASSERT_EQUAL_MEMORY("whatever", testString, 8);
-    TEST_ASSERT_EQUAL_MEMORY(testString, "whatever", 8);
-    TEST_ASSERT_EQUAL_MEMORY(testString, "whatever", 2);
-    TEST_ASSERT_EQUAL_MEMORY(NULL, NULL, 1);
-}
-
-void testNotEqualMemory1(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_MEMORY("foo", "bar", 3);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualMemory2(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_MEMORY("fool", "food", 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualMemory3(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_MEMORY(NULL, "food", 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualMemory4(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_MEMORY("fool", NULL, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualMemoryLengthZero(void)
-{
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_MEMORY(NULL, NULL, 0);
-    VERIFY_FAILS_END
-}
-
-void testEqualIntArrays(void)
-{
-    int p0[] = {1, 8, 987, -2};
-    int p1[] = {1, 8, 987, -2};
-    int p2[] = {1, 8, 987, 2};
-    int p3[] = {1, 500, 600, 700};
-
-    TEST_ASSERT_EQUAL_INT_ARRAY(p0, p0, 1);
-    TEST_ASSERT_EQUAL_INT_ARRAY(p0, p0, 4);
-    TEST_ASSERT_EQUAL_INT_ARRAY(p0, p1, 4);
-    TEST_ASSERT_EQUAL_INT_ARRAY(p0, p2, 3);
-    TEST_ASSERT_EQUAL_INT_ARRAY(p0, p3, 1);
-    TEST_ASSERT_EQUAL_INT_ARRAY(NULL, NULL, 1);
-}
-
-void testNotEqualIntArraysNullExpected(void)
-{
-    int* p0 = NULL;
-    int p1[] = {1, 8, 987, 2};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_INT_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualIntArraysNullActual(void)
-{
-    int* p1 = NULL;
-    int p0[] = {1, 8, 987, 2};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_INT_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualIntArrays1(void)
-{
-    int p0[] = {1, 8, 987, -2};
-    int p1[] = {1, 8, 987, 2};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_INT_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualIntArrays2(void)
-{
-    int p0[] = {1, 8, 987, -2};
-    int p1[] = {2, 8, 987, -2};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_INT_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualIntArrays3(void)
-{
-    int p0[] = {1, 8, 987, -2};
-    int p1[] = {1, 8, 986, -2};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_INT_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualIntArraysLengthZero(void)
-{
-    UNITY_UINT32 p0[1] = {1};
-    UNITY_UINT32 p1[1] = {1};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_INT_ARRAY(p0, p1, 0);
-    VERIFY_FAILS_END
-}
-
-void testEqualIntEachEqual(void)
-{
-    int p0[] = {1, 1, 1, 1};
-    int p1[] = {987, 987, 987, 987};
-    int p2[] = {-2, -2, -2, -3};
-    int p3[] = {1, 5, 600, 700};
-
-    TEST_ASSERT_EACH_EQUAL_INT(1, p0, 1);
-    TEST_ASSERT_EACH_EQUAL_INT(1, p0, 4);
-    TEST_ASSERT_EACH_EQUAL_INT(987, p1, 4);
-    TEST_ASSERT_EACH_EQUAL_INT(-2, p2, 3);
-    TEST_ASSERT_EACH_EQUAL_INT(1, p3, 1);
-}
-
-void testNotEqualIntEachEqualNullActual(void)
-{
-    int* p1 = NULL;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_INT(1, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualIntEachEqual1(void)
-{
-    int p0[] = {1, 1, 1, -2};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_INT(1, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualIntEachEqual2(void)
-{
-    int p0[] = {-5, -5, -1, -5};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_INT(-5, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualIntEachEqual3(void)
-{
-    int p0[] = {1, 88, 88, 88};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_INT(88, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualEachEqualLengthZero(void)
-{
-    UNITY_UINT32 p0[1] = {1};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_INT(0, p0, 0);
-    VERIFY_FAILS_END
-}
-
-void testEqualPtrArrays(void)
-{
-    char A = 1;
-    char B = 2;
-    char C = 3;
-    char* p0[] = {&A, &B, &C};
-    char* p1[] = {&A, &B, &C, &A};
-    char* p2[] = {&A, &B};
-    char* p3[] = {&A};
-
-    TEST_ASSERT_EQUAL_PTR_ARRAY(p0, p0, 1);
-    TEST_ASSERT_EQUAL_PTR_ARRAY(p0, p0, 3);
-    TEST_ASSERT_EQUAL_PTR_ARRAY(p0, p1, 3);
-    TEST_ASSERT_EQUAL_PTR_ARRAY(p1, p2, 2);
-    TEST_ASSERT_EQUAL_PTR_ARRAY(p3, p0, 1);
-}
-
-void testNotEqualPtrArraysNullExpected(void)
-{
-    char A = 1;
-    char B = 2;
-    char** p0 = NULL;
-    char* p1[] = {&A, &B};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_PTR_ARRAY(p0, p1, 2);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualPtrArraysNullActual(void)
-{
-    char A = 1;
-    char B = 2;
-    char** p0 = NULL;
-    char* p1[] = {&A, &B};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_PTR_ARRAY(p1, p0, 2);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualPtrArrays1(void)
-{
-    char A = 1;
-    char B = 2;
-    char C = 3;
-    char* p0[] = {&A, &B, &C, &B};
-    char* p1[] = {&A, &B, &C, &A};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_PTR_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualPtrArrays2(void)
-{
-    char A = 1;
-    char B = 2;
-    char C = 3;
-    char* p0[] = {&B, &B, &C, &A};
-    char* p1[] = {&A, &B, &C, &A};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_PTR_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualPtrArrays3(void)
-{
-    char A = 1;
-    char B = 2;
-    char C = 3;
-    char* p0[] = {&A, &B, &B, &A};
-    char* p1[] = {&A, &B, &C, &A};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_PTR_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testEqualPtrEachEqual(void)
-{
-    char A = 1;
-    char B = 2;
-    char C = 3;
-    char* p0[] = {&A, &A, &A};
-    char* p1[] = {&A, &B, &C, &A};
-    char* p2[] = {&B, &B};
-    char* p3[] = {&C};
-
-    TEST_ASSERT_EACH_EQUAL_PTR(&A, p0, 1);
-    TEST_ASSERT_EACH_EQUAL_PTR(&A, p0, 3);
-    TEST_ASSERT_EACH_EQUAL_PTR(&A, p1, 1);
-    TEST_ASSERT_EACH_EQUAL_PTR(&B, p2, 2);
-    TEST_ASSERT_EACH_EQUAL_PTR(&C, p3, 1);
-}
-
-void testNotEqualPtrEachEqualNullExpected(void)
-{
-    char A = 1;
-    char B = 1;
-    char* p0[] = {&A, &B};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_PTR(&A, p0, 2);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualPtrEachEqualNullActual(void)
-{
-    char A = 1;
-    char** p0 = NULL;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_PTR(&A, p0, 2);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualPtrEachEqual1(void)
-{
-    char A = 1;
-    char B = 1;
-    char* p0[] = {&A, &A, &A, &B};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_PTR(&A, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualPtrEachEqual2(void)
-{
-    char A = 1;
-    char B = 1;
-    char* p0[] = {&B, &B, &A, &B};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_PTR(&B, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualPtrEachEqual3(void)
-{
-    char A = 1;
-    char B = 1;
-    char* p0[] = {&A, &B, &B, &B};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_PTR(&B, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testEqualInt8Arrays(void)
-{
-    UNITY_INT8 p0[] = {1, 8, 117, -2};
-    UNITY_INT8 p1[] = {1, 8, 117, -2};
-    UNITY_INT8 p2[] = {1, 8, 117, 2};
-    UNITY_INT8 p3[] = {1, 50, 60, 70};
-
-    TEST_ASSERT_EQUAL_INT8_ARRAY(p0, p0, 1);
-    TEST_ASSERT_EQUAL_INT8_ARRAY(p0, p0, 4);
-    TEST_ASSERT_EQUAL_INT8_ARRAY(p0, p1, 4);
-    TEST_ASSERT_EQUAL_INT8_ARRAY(p0, p2, 3);
-    TEST_ASSERT_EQUAL_INT8_ARRAY(p0, p3, 1);
-}
-
-void testNotEqualInt8Arrays(void)
-{
-    UNITY_INT8 p0[] = {1, 8, 36, -2};
-    UNITY_INT8 p1[] = {1, 8, 36, 2};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_INT8_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testEqualInt8EachEqual(void)
-{
-    UNITY_INT8 p0[] = {1, 1, 1, 1};
-    UNITY_INT8 p1[] = {117, 117, 117, -2};
-    UNITY_INT8 p2[] = {-1, -1, 117, 2};
-    UNITY_INT8 p3[] = {1, 50, 60, 70};
-
-    TEST_ASSERT_EACH_EQUAL_INT8(1, p0, 1);
-    TEST_ASSERT_EACH_EQUAL_INT8(1, p0, 4);
-    TEST_ASSERT_EACH_EQUAL_INT8(117, p1, 3);
-    TEST_ASSERT_EACH_EQUAL_INT8(-1, p2, 2);
-    TEST_ASSERT_EACH_EQUAL_INT8(1, p3, 1);
-}
-
-void testNotEqualInt8EachEqual(void)
-{
-    UNITY_INT8 p0[] = {1, 8, 36, -2};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_INT8(1, p0, 2);
-    VERIFY_FAILS_END
-}
-
-void testEqualUIntArrays(void)
-{
-    unsigned int p0[] = {1, 8, 987, 65132u};
-    unsigned int p1[] = {1, 8, 987, 65132u};
-    unsigned int p2[] = {1, 8, 987, 2};
-    unsigned int p3[] = {1, 500, 600, 700};
-
-    TEST_ASSERT_EQUAL_UINT_ARRAY(p0, p0, 1);
-    TEST_ASSERT_EQUAL_UINT_ARRAY(p0, p0, 4);
-    TEST_ASSERT_EQUAL_UINT_ARRAY(p0, p1, 4);
-    TEST_ASSERT_EQUAL_UINT_ARRAY(p0, p2, 3);
-    TEST_ASSERT_EQUAL_UINT_ARRAY(p0, p3, 1);
-}
-
-void testNotEqualUIntArrays1(void)
-{
-    unsigned int p0[] = {1, 8, 987, 65132u};
-    unsigned int p1[] = {1, 8, 987, 65131u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_UINT_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualUIntArrays2(void)
-{
-    unsigned int p0[] = {1, 8, 987, 65132u};
-    unsigned int p1[] = {2, 8, 987, 65132u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_UINT_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualUIntArrays3(void)
-{
-    unsigned int p0[] = {1, 8, 987, 65132u};
-    unsigned int p1[] = {1, 8, 986, 65132u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_UINT_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testEqualUIntEachEqual(void)
-{
-    unsigned int p0[] = {1, 1, 1, 1};
-    unsigned int p1[] = {65132u, 65132u, 65132u, 65132u};
-    unsigned int p2[] = {8, 8, 987, 2};
-    unsigned int p3[] = {1, 500, 600, 700};
-
-    TEST_ASSERT_EACH_EQUAL_UINT(1, p0, 1);
-    TEST_ASSERT_EACH_EQUAL_UINT(1, p0, 4);
-    TEST_ASSERT_EACH_EQUAL_UINT(65132u, p1, 4);
-    TEST_ASSERT_EACH_EQUAL_UINT(8, p2, 2);
-    TEST_ASSERT_EACH_EQUAL_UINT(1, p3, 1);
-}
-
-void testNotEqualUIntEachEqual1(void)
-{
-    unsigned int p0[] = {1, 65132u, 65132u, 65132u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_UINT(65132u, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualUIntEachEqual2(void)
-{
-    unsigned int p0[] = {987, 8, 987, 987};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_UINT(987, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualUIntEachEqual3(void)
-{
-    unsigned int p0[] = {1, 1, 1, 65132u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_UINT(1, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testEqualInt16Arrays(void)
-{
-    UNITY_INT16 p0[] = {1, 8, 117, 3};
-    UNITY_INT16 p1[] = {1, 8, 117, 3};
-    UNITY_INT16 p2[] = {1, 8, 117, 2};
-    UNITY_INT16 p3[] = {1, 50, 60, 70};
-
-    TEST_ASSERT_EQUAL_INT16_ARRAY(p0, p0, 1);
-    TEST_ASSERT_EQUAL_INT16_ARRAY(p0, p0, 4);
-    TEST_ASSERT_EQUAL_INT16_ARRAY(p0, p1, 4);
-    TEST_ASSERT_EQUAL_INT16_ARRAY(p0, p2, 3);
-    TEST_ASSERT_EQUAL_INT16_ARRAY(p0, p3, 1);
-}
-
-void testNotEqualInt16Arrays(void)
-{
-    UNITY_INT16 p0[] = {1, 8, 127, 3};
-    UNITY_INT16 p1[] = {1, 8, 127, 2};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_INT16_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testEqualInt16EachEqual(void)
-{
-    UNITY_INT16 p0[] = {1, 1, 1, 1};
-    UNITY_INT16 p1[] = {32111, 32111, 32111, 3};
-    UNITY_INT16 p2[] = {-1, -1, -1, 2};
-    UNITY_INT16 p3[] = {1, 50, 60, 70};
-
-    TEST_ASSERT_EACH_EQUAL_INT16(1, p0, 1);
-    TEST_ASSERT_EACH_EQUAL_INT16(1, p0, 4);
-    TEST_ASSERT_EACH_EQUAL_INT16(32111, p1, 3);
-    TEST_ASSERT_EACH_EQUAL_INT16(-1, p2, 3);
-    TEST_ASSERT_EACH_EQUAL_INT16(1, p3, 1);
-}
-
-void testNotEqualInt16EachEqual(void)
-{
-    UNITY_INT16 p0[] = {127, 127, 127, 3};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_INT16(127, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testEqualInt32Arrays(void)
-{
-    UNITY_INT32 p0[] = {1, 8, 117, 3};
-    UNITY_INT32 p1[] = {1, 8, 117, 3};
-    UNITY_INT32 p2[] = {1, 8, 117, 2};
-    UNITY_INT32 p3[] = {1, 50, 60, 70};
-
-    TEST_ASSERT_EQUAL_INT32_ARRAY(p0, p0, 1);
-    TEST_ASSERT_EQUAL_INT32_ARRAY(p0, p0, 4);
-    TEST_ASSERT_EQUAL_INT32_ARRAY(p0, p1, 4);
-    TEST_ASSERT_EQUAL_INT32_ARRAY(p0, p2, 3);
-    TEST_ASSERT_EQUAL_INT32_ARRAY(p0, p3, 1);
-}
-
-void testNotEqualInt32Arrays(void)
-{
-    UNITY_INT32 p0[] = {1, 8, 127, 3};
-    UNITY_INT32 p1[] = {1, 8, 127, 2};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_INT32_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testEqualInt32EachEqual(void)
-{
-    UNITY_INT32 p0[] = {8, 8, 8, 8};
-    UNITY_INT32 p1[] = {65537, 65537, 65537, 65537};
-    UNITY_INT32 p2[] = {-3, -3, -3, 2};
-    UNITY_INT32 p3[] = {1, 50, 60, 70};
-
-    TEST_ASSERT_EACH_EQUAL_INT32(8, p0, 1);
-    TEST_ASSERT_EACH_EQUAL_INT32(8, p0, 4);
-    TEST_ASSERT_EACH_EQUAL_INT32(65537, p1, 4);
-    TEST_ASSERT_EACH_EQUAL_INT32(-3, p2, 3);
-    TEST_ASSERT_EACH_EQUAL_INT32(1, p3, 1);
-}
-
-void testNotEqualInt32EachEqual(void)
-{
-    UNITY_INT32 p0[] = {127, 8, 127, 127};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_INT32(127, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testEqualUINT8Arrays(void)
-{
-    UNITY_UINT8 p0[] = {1, 8, 100, 127};
-    UNITY_UINT8 p1[] = {1, 8, 100, 127};
-    UNITY_UINT8 p2[] = {1, 8, 100, 2};
-    UNITY_UINT8 p3[] = {1, 50, 60, 70};
-
-    TEST_ASSERT_EQUAL_UINT8_ARRAY(p0, p0, 1);
-    TEST_ASSERT_EQUAL_UINT8_ARRAY(p0, p0, 4);
-    TEST_ASSERT_EQUAL_UINT8_ARRAY(p0, p1, 4);
-    TEST_ASSERT_EQUAL_UINT8_ARRAY(p0, p2, 3);
-    TEST_ASSERT_EQUAL_UINT8_ARRAY(p0, p3, 1);
-}
-
-void testNotEqualUINT8Arrays1(void)
-{
-    unsigned char p0[] = {1, 8, 100, 127u};
-    unsigned char p1[] = {1, 8, 100, 255u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_UINT8_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualUINT8Arrays2(void)
-{
-    unsigned char p0[] = {1, 8, 100, 127u};
-    unsigned char p1[] = {1, 8, 100, 255u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_UINT8_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualUINT8Arrays3(void)
-{
-    unsigned char p0[] = {1, 8, 100, 127u};
-    unsigned char p1[] = {1, 8, 100, 255u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_UINT8_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-
-void testEqualUINT16Arrays(void)
-{
-    unsigned short p0[] = {1, 8, 987, 65132u};
-    unsigned short p1[] = {1, 8, 987, 65132u};
-    unsigned short p2[] = {1, 8, 987, 2};
-    unsigned short p3[] = {1, 500, 600, 700};
-
-    TEST_ASSERT_EQUAL_UINT16_ARRAY(p0, p0, 1);
-    TEST_ASSERT_EQUAL_UINT16_ARRAY(p0, p0, 4);
-    TEST_ASSERT_EQUAL_UINT16_ARRAY(p0, p1, 4);
-    TEST_ASSERT_EQUAL_UINT16_ARRAY(p0, p2, 3);
-    TEST_ASSERT_EQUAL_UINT16_ARRAY(p0, p3, 1);
-}
-
-void testNotEqualUINT16Arrays1(void)
-{
-    unsigned short p0[] = {1, 8, 987, 65132u};
-    unsigned short p1[] = {1, 8, 987, 65131u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_UINT16_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualUINT16Arrays2(void)
-{
-    unsigned short p0[] = {1, 8, 987, 65132u};
-    unsigned short p1[] = {2, 8, 987, 65132u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_UINT16_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualUINT16Arrays3(void)
-{
-    unsigned short p0[] = {1, 8, 987, 65132u};
-    unsigned short p1[] = {1, 8, 986, 65132u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_UINT16_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testEqualUINT32Arrays(void)
-{
-    UNITY_UINT32 p0[] = {1, 8, 987, 65132u};
-    UNITY_UINT32 p1[] = {1, 8, 987, 65132u};
-    UNITY_UINT32 p2[] = {1, 8, 987, 2};
-    UNITY_UINT32 p3[] = {1, 500, 600, 700};
-
-    TEST_ASSERT_EQUAL_UINT32_ARRAY(p0, p0, 1);
-    TEST_ASSERT_EQUAL_UINT32_ARRAY(p0, p0, 4);
-    TEST_ASSERT_EQUAL_UINT32_ARRAY(p0, p1, 4);
-    TEST_ASSERT_EQUAL_UINT32_ARRAY(p0, p2, 3);
-    TEST_ASSERT_EQUAL_UINT32_ARRAY(p0, p3, 1);
-}
-
-void testNotEqualUINT32Arrays1(void)
-{
-    UNITY_UINT32 p0[] = {1, 8, 987, 65132u};
-    UNITY_UINT32 p1[] = {1, 8, 987, 65131u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_UINT32_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualUINT32Arrays2(void)
-{
-    UNITY_UINT32 p0[] = {1, 8, 987, 65132u};
-    UNITY_UINT32 p1[] = {2, 8, 987, 65132u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_UINT32_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualUINT32Arrays3(void)
-{
-    UNITY_UINT32 p0[] = {1, 8, 987, 65132u};
-    UNITY_UINT32 p1[] = {1, 8, 986, 65132u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_UINT32_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testEqualHEXArrays(void)
-{
-    UNITY_UINT32 p0[] = {1, 8, 987, 65132u};
-    UNITY_UINT32 p1[] = {1, 8, 987, 65132u};
-    UNITY_UINT32 p2[] = {1, 8, 987, 2};
-    UNITY_UINT32 p3[] = {1, 500, 600, 700};
-
-    TEST_ASSERT_EQUAL_HEX_ARRAY(p0, p0, 1);
-    TEST_ASSERT_EQUAL_HEX_ARRAY(p0, p0, 4);
-    TEST_ASSERT_EQUAL_HEX_ARRAY(p0, p1, 4);
-    TEST_ASSERT_EQUAL_HEX32_ARRAY(p0, p2, 3);
-    TEST_ASSERT_EQUAL_HEX32_ARRAY(p0, p3, 1);
-}
-
-void testNotEqualHEXArrays1(void)
-{
-    UNITY_UINT32 p0[] = {1, 8, 987, 65132u};
-    UNITY_UINT32 p1[] = {1, 8, 987, 65131u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_HEX32_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualHEXArrays2(void)
-{
-    UNITY_UINT32 p0[] = {1, 8, 987, 65132u};
-    UNITY_UINT32 p1[] = {2, 8, 987, 65132u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_HEX32_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualHEXArrays3(void)
-{
-    UNITY_UINT32 p0[] = {1, 8, 987, 65132u};
-    UNITY_UINT32 p1[] = {1, 8, 986, 65132u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_HEX_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testEqualHEX32Arrays(void)
-{
-    UNITY_UINT32 p0[] = {1, 8, 987, 65132u};
-    UNITY_UINT32 p1[] = {1, 8, 987, 65132u};
-    UNITY_UINT32 p2[] = {1, 8, 987, 2};
-    UNITY_UINT32 p3[] = {1, 500, 600, 700};
-
-    TEST_ASSERT_EQUAL_HEX32_ARRAY(p0, p0, 1);
-    TEST_ASSERT_EQUAL_HEX32_ARRAY(p0, p0, 4);
-    TEST_ASSERT_EQUAL_HEX32_ARRAY(p0, p1, 4);
-    TEST_ASSERT_EQUAL_HEX32_ARRAY(p0, p2, 3);
-    TEST_ASSERT_EQUAL_HEX32_ARRAY(p0, p3, 1);
-}
-
-void testNotEqualHEX32Arrays1(void)
-{
-    UNITY_UINT32 p0[] = {1, 8, 987, 65132u};
-    UNITY_UINT32 p1[] = {1, 8, 987, 65131u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_HEX32_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualHEX32Arrays2(void)
-{
-    UNITY_UINT32 p0[] = {1, 8, 987, 65132u};
-    UNITY_UINT32 p1[] = {2, 8, 987, 65132u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_HEX32_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualHEX32Arrays3(void)
-{
-    UNITY_UINT32 p0[] = {1, 8, 987, 65132u};
-    UNITY_UINT32 p1[] = {1, 8, 986, 65132u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_HEX32_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testEqualHEX16Arrays(void)
-{
-    unsigned short p0[] = {1, 8, 987, 65132u};
-    unsigned short p1[] = {1, 8, 987, 65132u};
-    unsigned short p2[] = {1, 8, 987, 2};
-    unsigned short p3[] = {1, 500, 600, 700};
-
-    TEST_ASSERT_EQUAL_HEX16_ARRAY(p0, p0, 1);
-    TEST_ASSERT_EQUAL_HEX16_ARRAY(p0, p0, 4);
-    TEST_ASSERT_EQUAL_HEX16_ARRAY(p0, p1, 4);
-    TEST_ASSERT_EQUAL_HEX16_ARRAY(p0, p2, 3);
-    TEST_ASSERT_EQUAL_HEX16_ARRAY(p0, p3, 1);
-}
-
-void testNotEqualHEX16Arrays1(void)
-{
-    unsigned short p0[] = {1, 8, 987, 65132u};
-    unsigned short p1[] = {1, 8, 987, 65131u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_HEX16_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualHEX16Arrays2(void)
-{
-    unsigned short p0[] = {1, 8, 987, 65132u};
-    unsigned short p1[] = {2, 8, 987, 65132u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_HEX16_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualHEX16Arrays3(void)
-{
-    unsigned short p0[] = {1, 8, 987, 65132u};
-    unsigned short p1[] = {1, 8, 986, 65132u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_HEX16_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testEqualHEX8Arrays(void)
-{
-    unsigned char p0[] = {1, 8, 254u, 123};
-    unsigned char p1[] = {1, 8, 254u, 123};
-    unsigned char p2[] = {1, 8, 254u, 2};
-    unsigned char p3[] = {1, 23, 25, 26};
-
-    TEST_ASSERT_EQUAL_HEX8_ARRAY(p0, p0, 1);
-    TEST_ASSERT_EQUAL_HEX8_ARRAY(p0, p0, 4);
-    TEST_ASSERT_EQUAL_HEX8_ARRAY(p0, p1, 4);
-    TEST_ASSERT_EQUAL_HEX8_ARRAY(p0, p2, 3);
-    TEST_ASSERT_EQUAL_HEX8_ARRAY(p0, p3, 1);
-}
-
-void testNotEqualHEX8Arrays1(void)
-{
-    unsigned char p0[] = {1, 8, 254u, 253u};
-    unsigned char p1[] = {1, 8, 254u, 252u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_HEX8_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualHEX8Arrays2(void)
-{
-    unsigned char p0[] = {1, 8, 254u, 253u};
-    unsigned char p1[] = {2, 8, 254u, 253u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_HEX8_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualHEX8Arrays3(void)
-{
-    unsigned char p0[] = {1, 8, 254u, 253u};
-    unsigned char p1[] = {1, 8, 255u, 253u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_HEX8_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-}
-
-void testEqualUINT8EachEqual(void)
-{
-    UNITY_UINT8 p0[] = {127u, 127u, 127u, 127u};
-    UNITY_UINT8 p1[] = {1u, 1u, 1u, 1u};
-    UNITY_UINT8 p2[] = {128u, 128u, 128u, 2u};
-    UNITY_UINT8 p3[] = {1u, 50u, 60u, 70u};
-
-    TEST_ASSERT_EACH_EQUAL_UINT8(127u, p0, 1);
-    TEST_ASSERT_EACH_EQUAL_UINT8(127u, p0, 4);
-    TEST_ASSERT_EACH_EQUAL_UINT8(1u, p1, 4);
-    TEST_ASSERT_EACH_EQUAL_UINT8(128u, p2, 3);
-    TEST_ASSERT_EACH_EQUAL_UINT8(1u, p3, 1);
-}
-
-void testNotEqualUINT8EachEqual1(void)
-{
-    unsigned char p0[] = {127u, 127u, 128u, 127u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_UINT8(127u, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualUINT8EachEqual2(void)
-{
-    unsigned char p0[] = {1, 1, 1, 127u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_UINT8(1, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualUINT8EachEqual3(void)
-{
-    unsigned char p0[] = {54u, 55u, 55u, 55u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_UINT8(55u, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testEqualUINT16EachEqual(void)
-{
-    unsigned short p0[] = {65132u, 65132u, 65132u, 65132u};
-    unsigned short p1[] = {987, 987, 987, 987};
-    unsigned short p2[] = {1, 1, 1, 2};
-    unsigned short p3[] = {1, 500, 600, 700};
-
-    TEST_ASSERT_EACH_EQUAL_UINT16(65132u, p0, 1);
-    TEST_ASSERT_EACH_EQUAL_UINT16(65132u, p0, 4);
-    TEST_ASSERT_EACH_EQUAL_UINT16(987, p1, 4);
-    TEST_ASSERT_EACH_EQUAL_UINT16(1, p2, 3);
-    TEST_ASSERT_EACH_EQUAL_UINT16(1, p3, 1);
-}
-
-void testNotEqualUINT16EachEqual1(void)
-{
-    unsigned short p0[] = {1, 65132u, 65132u, 65132u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_UINT16(65132u, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualUINT16EachEqual2(void)
-{
-    unsigned short p0[] = {65132u, 65132u, 987, 65132u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_UINT16(65132u, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualUINT16EachEqual3(void)
-{
-    unsigned short p0[] = {65132u, 65132u, 65132u, 65133u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_UINT16(65132u, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testEqualUINT32EachEqual(void)
-{
-    UNITY_UINT32 p0[] = {65132u, 65132u, 65132u, 65132u};
-    UNITY_UINT32 p1[] = {987, 987, 987, 987};
-    UNITY_UINT32 p2[] = {8, 8, 8, 2};
-    UNITY_UINT32 p3[] = {1, 500, 600, 700};
-
-    TEST_ASSERT_EACH_EQUAL_UINT32(65132u, p0, 1);
-    TEST_ASSERT_EACH_EQUAL_UINT32(65132u, p0, 4);
-    TEST_ASSERT_EACH_EQUAL_UINT32(987, p1, 4);
-    TEST_ASSERT_EACH_EQUAL_UINT32(8, p2, 3);
-    TEST_ASSERT_EACH_EQUAL_UINT32(1, p3, 1);
-}
-
-void testNotEqualUINT32EachEqual1(void)
-{
-    UNITY_UINT32 p0[] = {65132u, 65132u, 987, 65132u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_UINT32(65132u, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualUINT32EachEqual2(void)
-{
-    UNITY_UINT32 p0[] = {1, 987, 987, 987};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_UINT32(987, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualUINT32EachEqual3(void)
-{
-    UNITY_UINT32 p0[] = {1, 1, 1, 65132u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_UINT32(1, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testEqualHEXEachEqual(void)
-{
-    UNITY_UINT32 p0[] = {65132u, 65132u, 65132u, 65132u};
-    UNITY_UINT32 p1[] = {987, 987, 987, 987};
-    UNITY_UINT32 p2[] = {8, 8, 8, 2};
-    UNITY_UINT32 p3[] = {1, 500, 600, 700};
-
-    TEST_ASSERT_EACH_EQUAL_HEX(65132u, p0, 1);
-    TEST_ASSERT_EACH_EQUAL_HEX(65132u, p0, 4);
-    TEST_ASSERT_EACH_EQUAL_HEX(987, p1, 4);
-    TEST_ASSERT_EACH_EQUAL_HEX(8, p2, 3);
-    TEST_ASSERT_EACH_EQUAL_HEX(1, p3, 1);
-}
-
-void testNotEqualHEXEachEqual1(void)
-{
-    UNITY_UINT32 p0[] = {1, 65132u, 65132u, 65132u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_HEX32(65132u, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualHEXEachEqual2(void)
-{
-    UNITY_UINT32 p0[] = {987, 987, 987, 65132u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_HEX32(987, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualHEXEachEqual3(void)
-{
-    UNITY_UINT32 p0[] = {8, 8, 987, 8};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_HEX(8, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testEqualHEX32EachEqual(void)
-{
-    UNITY_UINT32 p0[] = {65132u, 65132u, 65132u, 65132u};
-    UNITY_UINT32 p1[] = {987, 987, 987, 987};
-    UNITY_UINT32 p2[] = {8, 8, 8, 2};
-    UNITY_UINT32 p3[] = {1, 500, 600, 700};
-
-    TEST_ASSERT_EACH_EQUAL_HEX32(65132u, p0, 1);
-    TEST_ASSERT_EACH_EQUAL_HEX32(65132u, p0, 4);
-    TEST_ASSERT_EACH_EQUAL_HEX32(987, p1, 4);
-    TEST_ASSERT_EACH_EQUAL_HEX32(8, p2, 3);
-    TEST_ASSERT_EACH_EQUAL_HEX32(1, p3, 1);
-}
-
-void testNotEqualHEX32EachEqual1(void)
-{
-    UNITY_UINT32 p0[] = {65132u, 8, 65132u, 65132u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_HEX32(65132u, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualHEX32EachEqual2(void)
-{
-    UNITY_UINT32 p0[] = {1, 987, 987, 987};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_HEX32(987, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualHEX32EachEqual3(void)
-{
-    UNITY_UINT32 p0[] = {8, 8, 8, 65132u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_HEX32(8, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testEqualHEX16EachEqual(void)
-{
-    UNITY_UINT16 p0[] = {65132u, 65132u, 65132u, 65132u};
-    UNITY_UINT16 p1[] = {987, 987, 987, 987};
-    UNITY_UINT16 p2[] = {8, 8, 8, 2};
-    UNITY_UINT16 p3[] = {1, 500, 600, 700};
-
-    TEST_ASSERT_EACH_EQUAL_HEX16(65132u, p0, 1);
-    TEST_ASSERT_EACH_EQUAL_HEX16(65132u, p0, 4);
-    TEST_ASSERT_EACH_EQUAL_HEX16(987, p1, 4);
-    TEST_ASSERT_EACH_EQUAL_HEX16(8, p2, 3);
-    TEST_ASSERT_EACH_EQUAL_HEX16(1, p3, 1);
-}
-
-void testNotEqualHEX16EachEqual1(void)
-{
-    unsigned short p0[] = {65132u, 65132u, 987, 65132u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_HEX16(65132u, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualHEX16EachEqual2(void)
-{
-    unsigned short p0[] = {1, 987, 987, 987};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_HEX16(987, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualHEX16EachEqual3(void)
-{
-    unsigned short p0[] = {8, 8, 8, 65132u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_HEX16(8, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testEqualHEX8EachEqual(void)
-{
-    unsigned char p0[] = {254u, 254u, 254u, 254u};
-    unsigned char p1[] = {123, 123, 123, 123};
-    unsigned char p2[] = {8, 8, 8, 2};
-    unsigned char p3[] = {1, 23, 25, 26};
-
-    TEST_ASSERT_EACH_EQUAL_HEX8(254u, p0, 1);
-    TEST_ASSERT_EACH_EQUAL_HEX8(254u, p0, 4);
-    TEST_ASSERT_EACH_EQUAL_HEX8(123, p1, 4);
-    TEST_ASSERT_EACH_EQUAL_HEX8(8, p2, 3);
-    TEST_ASSERT_EACH_EQUAL_HEX8(1, p3, 1);
-}
-
-void testNotEqualHEX8EachEqual1(void)
-{
-    unsigned char p0[] = {253u, 253u, 254u, 253u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_HEX8(253u, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualHEX8EachEqual2(void)
-{
-    unsigned char p0[] = {254u, 254u, 254u, 253u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_HEX8(254u, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualHEX8EachEqual3(void)
-{
-    unsigned char p0[] = {1, 8, 8, 8};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_HEX8(8, p0, 4);
-    VERIFY_FAILS_END
-}
-
-void testEqualMemoryArrays(void)
-{
-    int p0[] = {1, 8, 987, -2};
-    int p1[] = {1, 8, 987, -2};
-    int p2[] = {1, 8, 987, 2};
-    int p3[] = {1, 500, 600, 700};
-
-    TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p0, sizeof(int), 1);
-    TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p0, sizeof(int), 4);
-    TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p1, sizeof(int), 4);
-    TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p2, sizeof(int), 3);
-    TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p3, sizeof(int), 1);
-}
-
-void testNotEqualMemoryArraysExpectedNull(void)
-{
-    int* p0 = NULL;
-    int p1[] = {1, 8, 987, 2};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p1, sizeof(int), 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualMemoryArraysActualNull(void)
-{
-    int p0[] = {1, 8, 987, -2};
-    int* p1 = NULL;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p1, sizeof(int), 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualMemoryArrays1(void)
-{
-    int p0[] = {1, 8, 987, -2};
-    int p1[] = {1, 8, 987, 2};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p1, sizeof(int), 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualMemoryArrays2(void)
-{
-    int p0[] = {1, 8, 987, -2};
-    int p1[] = {2, 8, 987, -2};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p1, sizeof(int), 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualMemoryArrays3(void)
-{
-    int p0[] = {1, 8, 987, -2};
-    int p1[] = {1, 8, 986, -2};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_MEMORY_ARRAY(p0, p1, sizeof(int), 4);
-    VERIFY_FAILS_END
-}
-
-void testEqualMemoryEachEqual(void)
-{
-    int p0[] = {1, 8, 987, -2};
-    int p1[] = {1, 8, 987, -2, 1, 8, 987, -2};
-    int p2[] = {8, 8, 8, 2};
-    int p3[] = {8, 500, 600, 700};
-    int v = 8;
-
-    TEST_ASSERT_EACH_EQUAL_MEMORY(p0, p0, sizeof(int)*4, 1);
-    TEST_ASSERT_EACH_EQUAL_MEMORY(p0, p1, sizeof(int)*4, 2);
-    TEST_ASSERT_EACH_EQUAL_MEMORY(p0, p1, sizeof(int)*4, 1);
-    TEST_ASSERT_EACH_EQUAL_MEMORY(&v, p2, sizeof(int), 3);
-    TEST_ASSERT_EACH_EQUAL_MEMORY(&v, p3, sizeof(int), 1);
-}
-
-void testNotEqualMemoryEachEqualExpectedNull(void)
-{
-    int* p0 = NULL;
-    int p1[] = {1, 8, 987, 2};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_MEMORY(p0, p1, sizeof(int), 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualMemoryEachEqualActualNull(void)
-{
-    int p0[] = {1, 8, 987, -2};
-    int* p1 = NULL;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_MEMORY(p0, p1, sizeof(int), 4);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualMemoryEachEqual1(void)
-{
-    int p0[] = {1, 8, 987, -2};
-    int p1[] = {9, 8, 987, -2, 1, 8, 987, -2, 1, 8, 987, -2};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_MEMORY(p0, p1, sizeof(int)*4, 3);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualMemoryEachEqual2(void)
-{
-    int p0[] = {1, 8, 987, -2};
-    int p1[] = {1, 8, 987, -2, 1, 8, 987, -2, 1, 8, 987, 9};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_MEMORY(p0, p1, sizeof(int)*4, 3);
-    VERIFY_FAILS_END
-}
-
-void testNotEqualMemoryEachEqual3(void)
-{
-    int p0[] = {1, 8, 987, -2};
-    int p1[] = {1, 8, 987, -2, 1, 9, 987, -2, 1, 8, 987, -2};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_MEMORY(p0, p1, sizeof(int)*4, 3);
-    VERIFY_FAILS_END
-}
-
-void testProtection(void)
-{
-    volatile int mask = 0;
-
-    if (TEST_PROTECT())
-    {
-        mask |= 1;
-        TEST_ABORT();
-    }
-    else
-    {
-        Unity.CurrentTestFailed = 0;
-        mask |= 2;
-    }
-
-    TEST_ASSERT_EQUAL(3, mask);
-}
-
-void testIgnoredAndThenFailInTearDown(void)
-{
-    SetToOneToFailInTearDown = 1;
-    TEST_IGNORE();
-}
-
-// Tricky series of macros to set USING_OUTPUT_SPY
-#define USING_SPY_AS(a)           EXPAND_AND_USE_2ND(ASSIGN_VALUE(a), 0)
-#define ASSIGN_VALUE(a)           VAL_##a
-#define VAL_putcharSpy            0, 1
-#define EXPAND_AND_USE_2ND(a, b)  SECOND_PARAM(a, b, throwaway)
-#define SECOND_PARAM(a, b, ...)   b
-#if USING_SPY_AS(UNITY_OUTPUT_CHAR)
-  #define USING_OUTPUT_SPY // true only if UNITY_OUTPUT_CHAR = putcharSpy
-#endif
-
-#ifdef USING_OUTPUT_SPY
-#include <stdio.h>
-#define SPY_BUFFER_MAX 40
-static char putcharSpyBuffer[SPY_BUFFER_MAX];
-#endif
-static int indexSpyBuffer;
-static int putcharSpyEnabled;
-
-void startPutcharSpy(void) {indexSpyBuffer = 0; putcharSpyEnabled = 1;}
-
-void endPutcharSpy(void) {putcharSpyEnabled = 0;}
-
-char* getBufferPutcharSpy(void)
-{
-#ifdef USING_OUTPUT_SPY
-    putcharSpyBuffer[indexSpyBuffer] = '\0';
-    return putcharSpyBuffer;
-#else
-    return NULL;
-#endif
-}
-
-void putcharSpy(int c)
-{
-#ifdef USING_OUTPUT_SPY
-    if (putcharSpyEnabled)
-    {
-        if (indexSpyBuffer < SPY_BUFFER_MAX - 1)
-            putcharSpyBuffer[indexSpyBuffer++] = (char)c;
-    } else
-        putchar((char)c);
-#endif
-}
-
-void testFailureCountIncrementsAndIsReturnedAtEnd(void)
-{
-    UNITY_UINT savedFailures = Unity.TestFailures;
-    Unity.CurrentTestFailed = 1;
-    startPutcharSpy(); // Suppress output
-    UnityConcludeTest();
-    endPutcharSpy();
-    TEST_ASSERT_EQUAL(savedFailures + 1, Unity.TestFailures);
-
-    startPutcharSpy(); // Suppress output
-    int failures = UnityEnd();
-    Unity.TestFailures--;
-    endPutcharSpy();
-    TEST_ASSERT_EQUAL(savedFailures + 1, failures);
-}
-
-void testCstringsEscapeSequence(void)
-{
-#ifndef USING_OUTPUT_SPY
-    TEST_IGNORE();
-#else
-    startPutcharSpy();
-    UnityPrint("\x16\x10");
-    endPutcharSpy();
-    TEST_ASSERT_EQUAL_STRING("\\x16\\x10", getBufferPutcharSpy());
-#endif
-}
-
-void testHexPrintsUpToMaxNumberOfNibbles(void)
-{
-#ifndef USING_OUTPUT_SPY
-    TEST_IGNORE();
-#else
-    startPutcharSpy();
-    UnityPrintNumberHex(0xBEE, 21);
-    endPutcharSpy();
-    TEST_ASSERT_EQUAL_INT(sizeof(UNITY_INT)*2, strlen(getBufferPutcharSpy()));
-#endif
-}
-
-#define TEST_ASSERT_EQUAL_PRINT_NUMBERS(expected, actual) {             \
-        startPutcharSpy(); UnityPrintNumber((actual)); endPutcharSpy(); \
-        TEST_ASSERT_EQUAL_STRING((expected), getBufferPutcharSpy());    \
-        }
-
-#define TEST_ASSERT_EQUAL_PRINT_UNSIGNED_NUMBERS(expected, actual) {            \
-        startPutcharSpy(); UnityPrintNumberUnsigned((actual)); endPutcharSpy(); \
-        TEST_ASSERT_EQUAL_STRING((expected), getBufferPutcharSpy());            \
-        }
-
-void testPrintNumbers32(void)
-{
-#ifndef USING_OUTPUT_SPY
-    TEST_IGNORE_MESSAGE("Compile with '-D UNITY_OUTPUT_CHAR=putcharSpy' to enable print testing");
-#else
-    TEST_ASSERT_EQUAL_PRINT_NUMBERS("0", 0);
-    TEST_ASSERT_EQUAL_PRINT_NUMBERS("1", 1);
-    TEST_ASSERT_EQUAL_PRINT_NUMBERS("-1", -1);
-    TEST_ASSERT_EQUAL_PRINT_NUMBERS("2000000000", 2000000000);
-    TEST_ASSERT_EQUAL_PRINT_NUMBERS("-2147483648", (UNITY_INT32)0x80000000);
-    TEST_ASSERT_EQUAL_PRINT_NUMBERS("-1",          (UNITY_INT32)0xFFFFFFFF);
-#endif
-}
-
-void testPrintNumbersUnsigned32(void)
-{
-#ifndef USING_OUTPUT_SPY
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_EQUAL_PRINT_UNSIGNED_NUMBERS("0", 0);
-    TEST_ASSERT_EQUAL_PRINT_UNSIGNED_NUMBERS("1", 1);
-    TEST_ASSERT_EQUAL_PRINT_UNSIGNED_NUMBERS("1500000000", 1500000000);
-    TEST_ASSERT_EQUAL_PRINT_UNSIGNED_NUMBERS("2147483648", (UNITY_UINT32)0x80000000);
-    TEST_ASSERT_EQUAL_PRINT_UNSIGNED_NUMBERS("4294967295", (UNITY_UINT32)0xFFFFFFFF);
-#endif
-}
-
-// ===================== THESE TEST WILL RUN IF YOUR CONFIG INCLUDES 64 BIT SUPPORT ==================
-
-void testPrintNumbersInt64(void)
-{
-#ifndef UNITY_SUPPORT_64
-    TEST_IGNORE();
-#else
-  #ifndef USING_OUTPUT_SPY
-    TEST_IGNORE();
-  #else
-    TEST_ASSERT_EQUAL_PRINT_NUMBERS("0", 0);
-    TEST_ASSERT_EQUAL_PRINT_NUMBERS("10000000000", 10000000000);
-    TEST_ASSERT_EQUAL_PRINT_NUMBERS("-9223372036854775808", (UNITY_INT)0x8000000000000000);
-    TEST_ASSERT_EQUAL_PRINT_NUMBERS("-1", (UNITY_INT)0xFFFFFFFFFFFFFFFF);
-  #endif
-#endif
-}
-
-void testPrintNumbersUInt64(void)
-{
-#ifndef UNITY_SUPPORT_64
-    TEST_IGNORE();
-#else
-  #ifndef USING_OUTPUT_SPY
-    TEST_IGNORE();
-  #else
-    TEST_ASSERT_EQUAL_PRINT_UNSIGNED_NUMBERS("0", 0);
-    TEST_ASSERT_EQUAL_PRINT_UNSIGNED_NUMBERS("70000000000", 70000000000);
-    TEST_ASSERT_EQUAL_PRINT_UNSIGNED_NUMBERS("9223372036854775808",  (UNITY_UINT)0x8000000000000000);
-    TEST_ASSERT_EQUAL_PRINT_UNSIGNED_NUMBERS("18446744073709551615", (UNITY_UINT)0xFFFFFFFFFFFFFFFF);
-  #endif
-#endif
-}
-
-void testEqualHex64s(void)
-{
-#ifndef UNITY_SUPPORT_64
-    TEST_IGNORE();
-#else
-    UNITY_UINT64 v0, v1;
-    UNITY_UINT64 *p0, *p1;
-
-    v0 = 0x9876543201234567;
-    v1 = 0x9876543201234567;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_EQUAL_HEX64(0x9876543201234567, 0x9876543201234567);
-    TEST_ASSERT_EQUAL_HEX64(v0, v1);
-    TEST_ASSERT_EQUAL_HEX64(0x9876543201234567, v1);
-    TEST_ASSERT_EQUAL_HEX64(v0, 0x9876543201234567);
-    TEST_ASSERT_EQUAL_HEX64(*p0, v1);
-    TEST_ASSERT_EQUAL_HEX64(*p0, *p1);
-    TEST_ASSERT_EQUAL_HEX64(*p0, 0x9876543201234567);
-#endif
-}
-
-void testEqualUint64s(void)
-{
-#ifndef UNITY_SUPPORT_64
-    TEST_IGNORE();
-#else
-    UNITY_UINT64 v0, v1;
-    UNITY_UINT64 *p0, *p1;
-
-    v0 = 0x9876543201234567;
-    v1 = 0x9876543201234567;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_EQUAL_UINT64(0x9876543201234567, 0x9876543201234567);
-    TEST_ASSERT_EQUAL_UINT64(v0, v1);
-    TEST_ASSERT_EQUAL_UINT64(0x9876543201234567, v1);
-    TEST_ASSERT_EQUAL_UINT64(v0, 0x9876543201234567);
-    TEST_ASSERT_EQUAL_UINT64(*p0, v1);
-    TEST_ASSERT_EQUAL_UINT64(*p0, *p1);
-    TEST_ASSERT_EQUAL_UINT64(*p0, 0x9876543201234567);
-#endif
-}
-
-void testEqualInt64s(void)
-{
-#ifndef UNITY_SUPPORT_64
-    TEST_IGNORE();
-#else
-    UNITY_INT64 v0, v1;
-    UNITY_INT64 *p0, *p1;
-
-    v0 = (UNITY_INT64)0x9876543201234567;
-    v1 = (UNITY_INT64)0x9876543201234567;
-    p0 = &v0;
-    p1 = &v1;
-
-    TEST_ASSERT_EQUAL_INT64(0x9876543201234567, 0x9876543201234567);
-    TEST_ASSERT_EQUAL_INT64(v0, v1);
-    TEST_ASSERT_EQUAL_INT64(0x9876543201234567, v1);
-    TEST_ASSERT_EQUAL_INT64(v0, 0x9876543201234567);
-    TEST_ASSERT_EQUAL_INT64(*p0, v1);
-    TEST_ASSERT_EQUAL_INT64(*p0, *p1);
-    TEST_ASSERT_EQUAL_INT64(*p0, 0x9876543201234567);
-#endif
-}
-
-
-void testNotEqualHex64s(void)
-{
-#ifndef UNITY_SUPPORT_64
-    TEST_IGNORE();
-#else
-    UNITY_UINT64 v0, v1;
-
-    v0 = 9000000000;
-    v1 = 9100000000;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_HEX64(v0, v1);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualUint64s(void)
-{
-#ifndef UNITY_SUPPORT_64
-    TEST_IGNORE();
-#else
-    UNITY_UINT64 v0, v1;
-
-    v0 = 9000000000;
-    v1 = 9100000000;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_UINT64(v0, v1);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualInt64s(void)
-{
-#ifndef UNITY_SUPPORT_64
-    TEST_IGNORE();
-#else
-    UNITY_INT64 v0, v1;
-
-    v0 = -9000000000;
-    v1 = 9100000000;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_INT64(v0, v1);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualHex64sIfSigned(void)
-{
-#ifndef UNITY_SUPPORT_64
-    TEST_IGNORE();
-#else
-    UNITY_INT64 v0, v1;
-
-    v0 = -9000000000;
-    v1 = 9000000000;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_HEX64(v0, v1);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testHEX64sWithinDelta(void)
-{
-#ifndef UNITY_SUPPORT_64
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_HEX64_WITHIN(1, 0x7FFFFFFFFFFFFFFF,0x7FFFFFFFFFFFFFFE);
-    TEST_ASSERT_HEX64_WITHIN(5, 5000, 4996);
-    TEST_ASSERT_HEX64_WITHIN(5, 5000, 5005);
-#endif
-}
-
-void testHEX64sNotWithinDelta(void)
-{
-#ifndef UNITY_SUPPORT_64
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_HEX64_WITHIN(1, 0x7FFFFFFFFFFFFFFF, 0x7FFFFFFFFFFFFFFC);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testHEX64sNotWithinDeltaEvenThoughASignedIntWouldPass(void)
-{
-#ifndef UNITY_SUPPORT_64
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_HEX64_WITHIN(5, 1, -1);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testUINT64sWithinDelta(void)
-{
-#ifndef UNITY_SUPPORT_64
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_UINT64_WITHIN(1, 0x7FFFFFFFFFFFFFFF,0x7FFFFFFFFFFFFFFE);
-    TEST_ASSERT_UINT64_WITHIN(5, 5000, 4996);
-    TEST_ASSERT_UINT64_WITHIN(5, 5000, 5005);
-#endif
-}
-
-void testUINT64sNotWithinDelta(void)
-{
-#ifndef UNITY_SUPPORT_64
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_UINT64_WITHIN(1, 0x7FFFFFFFFFFFFFFF, 0x7FFFFFFFFFFFFFFC);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testUINT64sNotWithinDeltaEvenThoughASignedIntWouldPass(void)
-{
-#ifndef UNITY_SUPPORT_64
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_UINT64_WITHIN(5, 1, -1);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testINT64sWithinDelta(void)
-{
-#ifndef UNITY_SUPPORT_64
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_INT64_WITHIN(1, 0x7FFFFFFFFFFFFFFF,0x7FFFFFFFFFFFFFFE);
-    TEST_ASSERT_INT64_WITHIN(5, 5000, 4996);
-    TEST_ASSERT_INT64_WITHIN(5, 5000, 5005);
-#endif
-}
-
-void testINT64sNotWithinDelta(void)
-{
-#ifndef UNITY_SUPPORT_64
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_INT64_WITHIN(1, 0x7FFFFFFFFFFFFFFF, 0x7FFFFFFFFFFFFFFC);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testINT64sNotWithinDeltaAndDifferenceOverflows(void)
-{
-#ifndef UNITY_SUPPORT_64
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_INT64_WITHIN(1, 0x8000000000000000, 0x7FFFFFFFFFFFFFFF);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testEqualHEX64Arrays(void)
-{
-#ifndef UNITY_SUPPORT_64
-    TEST_IGNORE();
-#else
-    UNITY_UINT64 p0[] = {1, 8, 987, 65132u};
-    UNITY_UINT64 p1[] = {1, 8, 987, 65132u};
-    UNITY_UINT64 p2[] = {1, 8, 987, 2};
-    UNITY_UINT64 p3[] = {1, 500, 600, 700};
-
-    TEST_ASSERT_EQUAL_HEX64_ARRAY(p0, p0, 1);
-    TEST_ASSERT_EQUAL_HEX64_ARRAY(p0, p0, 4);
-    TEST_ASSERT_EQUAL_HEX64_ARRAY(p0, p1, 4);
-    TEST_ASSERT_EQUAL_HEX64_ARRAY(p0, p2, 3);
-    TEST_ASSERT_EQUAL_HEX64_ARRAY(p0, p3, 1);
-#endif
-}
-
-void testEqualUint64Arrays(void)
-{
-#ifndef UNITY_SUPPORT_64
-    TEST_IGNORE();
-#else
-    UNITY_UINT64 p0[] = {1, 8, 987, 65132u};
-    UNITY_UINT64 p1[] = {1, 8, 987, 65132u};
-    UNITY_UINT64 p2[] = {1, 8, 987, 2};
-    UNITY_UINT64 p3[] = {1, 500, 600, 700};
-
-    TEST_ASSERT_EQUAL_UINT64_ARRAY(p0, p0, 1);
-    TEST_ASSERT_EQUAL_UINT64_ARRAY(p0, p0, 4);
-    TEST_ASSERT_EQUAL_UINT64_ARRAY(p0, p1, 4);
-    TEST_ASSERT_EQUAL_UINT64_ARRAY(p0, p2, 3);
-    TEST_ASSERT_EQUAL_UINT64_ARRAY(p0, p3, 1);
-#endif
-}
-
-void testEqualInt64Arrays(void)
-{
-#ifndef UNITY_SUPPORT_64
-    TEST_IGNORE();
-#else
-    UNITY_INT64 p0[] = {1, 8, 987, -65132};
-    UNITY_INT64 p1[] = {1, 8, 987, -65132};
-    UNITY_INT64 p2[] = {1, 8, 987, -2};
-    UNITY_INT64 p3[] = {1, 500, 600, 700};
-
-    TEST_ASSERT_EQUAL_INT64_ARRAY(p0, p0, 1);
-    TEST_ASSERT_EQUAL_INT64_ARRAY(p0, p0, 4);
-    TEST_ASSERT_EQUAL_INT64_ARRAY(p0, p1, 4);
-    TEST_ASSERT_EQUAL_INT64_ARRAY(p0, p2, 3);
-    TEST_ASSERT_EQUAL_INT64_ARRAY(p0, p3, 1);
-#endif
-}
-
-
-void testNotEqualHEX64Arrays1(void)
-{
-#ifndef UNITY_SUPPORT_64
-    TEST_IGNORE();
-#else
-    UNITY_UINT64 p0[] = {1, 8, 987, 65132u};
-    UNITY_UINT64 p1[] = {1, 8, 987, 65131u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_HEX64_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualHEX64Arrays2(void)
-{
-#ifndef UNITY_SUPPORT_64
-    TEST_IGNORE();
-#else
-    UNITY_UINT64 p0[] = {1, 8, 987, 65132u};
-    UNITY_UINT64 p1[] = {2, 8, 987, 65132u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_HEX64_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualUint64Arrays(void)
-{
-#ifndef UNITY_SUPPORT_64
-    TEST_IGNORE();
-#else
-    UNITY_UINT64 p0[] = {1, 8, 987, 65132u};
-    UNITY_UINT64 p1[] = {1, 8, 987, 65131u};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_UINT64_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualInt64Arrays(void)
-{
-#ifndef UNITY_SUPPORT_64
-    TEST_IGNORE();
-#else
-    UNITY_INT64 p0[] = {1, 8, 987, -65132};
-    UNITY_INT64 p1[] = {1, 8, 987, -65131};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_INT64_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-#endif
-}
-// ===================== THESE TEST WILL RUN IF YOUR CONFIG INCLUDES FLOAT SUPPORT ==================
-
-void testFloatsWithinDelta(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_FLOAT_WITHIN(0.00003f, 187245.03485f, 187245.03488f);
-    TEST_ASSERT_FLOAT_WITHIN(1.0f, 187245.0f, 187246.0f);
-    TEST_ASSERT_FLOAT_WITHIN(0.05f, 9273.2549f, 9273.2049f);
-    TEST_ASSERT_FLOAT_WITHIN(0.007f, -726.93724f, -726.94424f);
-#endif
-}
-
-void testFloatsNotWithinDelta(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_FLOAT_WITHIN(0.05f, 9273.2649f, 9273.2049f);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testFloatsEqual(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_EQUAL_FLOAT(187245.0f, 187246.0f);
-    TEST_ASSERT_EQUAL_FLOAT(18724.5f, 18724.6f);
-    TEST_ASSERT_EQUAL_FLOAT(9273.2549f, 9273.2599f);
-    TEST_ASSERT_EQUAL_FLOAT(-726.93724f, -726.9374f);
-#endif
-}
-
-void testFloatsNotEqual(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_FLOAT(9273.9649f, 9273.0049f);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testFloatsNotEqualNegative1(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_FLOAT(-9273.9649f, -9273.0049f);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testFloatsNotEqualNegative2(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_FLOAT(-9273.0049f, -9273.9649f);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testFloatsNotEqualActualNaN(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_FLOAT(85.963f, 0.0f / f_zero);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testFloatsNotEqualExpectedNaN(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_FLOAT(0.0f / f_zero, 85.963f);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testFloatsEqualBothNaN(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_EQUAL_FLOAT(0.0f / f_zero, 0.0f / f_zero);
-#endif
-}
-
-void testFloatsNotEqualInfNaN(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_FLOAT(1.0f / f_zero, 0.0f / f_zero);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testFloatsNotEqualNaNInf(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_FLOAT(0.0f / f_zero, 1.0f / f_zero);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testFloatsNotEqualActualInf(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_FLOAT(321.642f, 1.0f / f_zero);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testFloatsNotEqualExpectedInf(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_FLOAT(1.0f / f_zero, 321.642f);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testFloatsEqualBothInf(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_EQUAL_FLOAT(1.0f / f_zero, 1.0f / f_zero);
-#endif
-}
-
-void testFloatsNotEqualPlusMinusInf(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_FLOAT(1.0f / f_zero, -1.0f / f_zero);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testFloatIsPosInf1(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_FLOAT_IS_INF(2.0f / f_zero);
-#endif
-}
-
-void testFloatIsPosInf2(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_FLOAT_IS_NOT_INF(2.0f / f_zero);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testFloatIsNegInf1(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_FLOAT_IS_NEG_INF(-3.0f / f_zero);
-#endif
-}
-
-void testFloatIsNegInf2(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_FLOAT_IS_NOT_NEG_INF(-3.0f / f_zero);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testFloatIsNotPosInf1(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_FLOAT_IS_INF(2.0f);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testFloatIsNotPosInf2(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_FLOAT_IS_NOT_INF(2.0f);
-#endif
-}
-
-void testFloatIsNotNegInf(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_FLOAT_IS_NEG_INF(-999.876f);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testFloatIsNan1(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_FLOAT_IS_NAN(0.0f / f_zero);
-#endif
-}
-
-void testFloatIsNan2(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_FLOAT_IS_NOT_NAN(0.0f / f_zero);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testFloatIsNotNan1(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_FLOAT_IS_NAN(234.9f);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testFloatIsNotNan2(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_FLOAT_IS_NOT_NAN(234.9f);
-#endif
-}
-
-void testFloatInfIsNotNan(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_FLOAT_IS_NAN(1.0f / f_zero);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testFloatNanIsNotInf(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_FLOAT_IS_INF(0.0f / f_zero);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testFloatIsDeterminate1(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_FLOAT_IS_DETERMINATE(0.0f);
-    TEST_ASSERT_FLOAT_IS_DETERMINATE(123.3f);
-    TEST_ASSERT_FLOAT_IS_DETERMINATE(-88.3f);
-#endif
-}
-
-void testFloatIsDeterminate2(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE(-88.3f);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testFloatIsNotDeterminate1(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE(1.0f / f_zero);
-    TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE(-1.0f / f_zero);
-    TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE(0.0f / f_zero);
-#endif
-}
-
-void testFloatIsNotDeterminate2(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_FLOAT_IS_DETERMINATE(-1.0f / f_zero);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testFloatTraitFailsOnInvalidTrait(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    UnityAssertFloatSpecial(1.0f, NULL, __LINE__, UNITY_FLOAT_INVALID_TRAIT);
-    VERIFY_FAILS_END
-#endif
-}
-
-
-void testEqualFloatArrays(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    float p0[] = {1.0f, -8.0f,  25.4f, -0.123f};
-    float p1[] = {1.0f, -8.0f,  25.4f, -0.123f};
-    float p2[] = {1.0f, -8.0f,  25.4f, -0.2f};
-    float p3[] = {1.0f, -23.0f, 25.0f, -0.26f};
-
-    TEST_ASSERT_EQUAL_FLOAT_ARRAY(p0, p0, 1);
-    TEST_ASSERT_EQUAL_FLOAT_ARRAY(p0, p0, 4);
-    TEST_ASSERT_EQUAL_FLOAT_ARRAY(p0, p1, 4);
-    TEST_ASSERT_EQUAL_FLOAT_ARRAY(p0, p2, 3);
-    TEST_ASSERT_EQUAL_FLOAT_ARRAY(p0, p3, 1);
-    TEST_ASSERT_EQUAL_FLOAT_ARRAY(NULL, NULL, 1);
-#endif
-}
-
-void testNotEqualFloatArraysExpectedNull(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    float* p0 = NULL;
-    float p1[] = {1.0f, 8.0f, 25.4f, 0.252f};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_FLOAT_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualFloatArraysActualNull(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    float p0[] = {1.0f, 8.0f, 25.4f, 0.253f};
-    float* p1 = NULL;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_FLOAT_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualFloatArrays1(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    float p0[] = {1.0f, 8.0f, 25.4f, 0.253f};
-    float p1[] = {1.0f, 8.0f, 25.4f, 0.252f};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_FLOAT_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualFloatArrays2(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    float p0[] = {1.0f, 8.0f, 25.4f, 0.253f};
-    float p1[] = {2.0f, 8.0f, 25.4f, 0.253f};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_FLOAT_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualFloatArrays3(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    float p0[] = {1.0f, 8.0f, 25.4f, 0.253f};
-    float p1[] = {1.0f, 8.0f, 25.5f, 0.253f};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_FLOAT_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualFloatArraysNegative1(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    float p0[] = {-1.0f, -8.0f, -25.4f, -0.253f};
-    float p1[] = {-1.0f, -8.0f, -25.4f, -0.252f};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_FLOAT_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualFloatArraysNegative2(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    float p0[] = {-1.0f, -8.0f, -25.4f, -0.253f};
-    float p1[] = {-2.0f, -8.0f, -25.4f, -0.253f};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_FLOAT_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualFloatArraysNegative3(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    float p0[] = {-1.0f, -8.0f, -25.4f, -0.253f};
-    float p1[] = {-1.0f, -8.0f, -25.5f, -0.253f};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_FLOAT_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testEqualFloatArraysNaN(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    float p0[] = {1.0f, 0.0f / f_zero, 25.4f, 0.253f};
-    float p1[] = {1.0f, 0.0f / f_zero, 25.4f, 0.253f};
-
-    TEST_ASSERT_EQUAL_FLOAT_ARRAY(p0, p1, 4);
-#endif
-}
-
-void testEqualFloatArraysInf(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    float p0[] = {1.0f, 1.0f / f_zero, 25.4f, 0.253f};
-    float p1[] = {1.0f, 1.0f / f_zero, 25.4f, 0.253f};
-
-    TEST_ASSERT_EQUAL_FLOAT_ARRAY(p0, p1, 4);
-#endif
-}
-
-void testNotEqualFloatArraysLengthZero(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    float p0[1] = {0.0f};
-    float p1[1] = {0.0f};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_FLOAT_ARRAY(p0, p1, 0);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testEqualFloatEachEqual(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    float p0[] = {1.0f, 1.0f, 1.0f, 1.0f};
-    float p1[] = {-0.123f, -0.123f, -0.123f, -0.123f};
-    float p2[] = {25.4f, 25.4f, 25.4f, -0.2f};
-    float p3[] = {1.0f, -23.0f, 25.0f, -0.26f};
-
-    TEST_ASSERT_EACH_EQUAL_FLOAT(1.0f, p0, 1);
-    TEST_ASSERT_EACH_EQUAL_FLOAT(1.0f, p0, 4);
-    TEST_ASSERT_EACH_EQUAL_FLOAT(-0.123f, p1, 4);
-    TEST_ASSERT_EACH_EQUAL_FLOAT(25.4f, p2, 3);
-    TEST_ASSERT_EACH_EQUAL_FLOAT(1.0f, p3, 1);
-#endif
-}
-
-void testNotEqualFloatEachEqualActualNull(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    float* p0 = NULL;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_FLOAT(5, p0, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualFloatEachEqual1(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    float p0[] = {0.253f, 8.0f, 0.253f, 0.253f};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_FLOAT(0.253f, p0, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualFloatEachEqual2(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    float p0[] = {8.0f, 8.0f, 8.0f, 0.253f};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_FLOAT(8.0f, p0, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualFloatEachEqual3(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    float p0[] = {1.0f, 1.0f, 1.0f, 0.253f};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_FLOAT(1.0f, p0, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualFloatEachEqualNegative1(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    float p0[] = {-1.0f, -0.253f, -0.253f, -0.253f};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_FLOAT(-0.253f, p0, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualFloatEachEqualNegative2(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    float p0[] = {-25.4f, -8.0f, -25.4f, -25.4f};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_FLOAT(-25.4f, p0, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualFloatEachEqualNegative3(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    float p0[] = {-8.0f, -8.0f, -8.0f, -0.253f};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_FLOAT(-8.0f, p0, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testEqualFloatEachEqualNaN(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    float p0[] = {0.0f / f_zero, 0.0f / f_zero, 0.0f / f_zero, 0.0f / f_zero};
-
-    TEST_ASSERT_EACH_EQUAL_FLOAT(0.0f / f_zero, p0, 4);
-#endif
-}
-
-void testEqualFloatEachEqualInf(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    float p0[] = {1.0f / f_zero, 1.0f / f_zero, 25.4f, 0.253f};
-
-    TEST_ASSERT_EACH_EQUAL_FLOAT(1.0f / f_zero, p0, 2);
-#endif
-}
-
-void testNotEqualFloatEachEqualLengthZero(void)
-{
-#ifdef UNITY_EXCLUDE_FLOAT
-    TEST_IGNORE();
-#else
-    float p0[1] = {0.0f};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_FLOAT(0.0f, p0, 0);
-    VERIFY_FAILS_END
-#endif
-}
-
-#define TEST_ASSERT_EQUAL_PRINT_FLOATING(expected, actual) {            \
-        startPutcharSpy(); UnityPrintFloat((actual)); endPutcharSpy();  \
-        TEST_ASSERT_EQUAL_STRING((expected), getBufferPutcharSpy());    \
-        }
-
-void testFloatPrinting(void)
-{
-#if defined(UNITY_EXCLUDE_FLOAT_PRINT) || !defined(USING_OUTPUT_SPY)
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("0",         0.0f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("4.99e-07",  0.000000499f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("5e-07",     0.00000050000005f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("0.100469",  0.100469499f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("1",         0.9999995f); /*Rounding to int place*/
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("1",         1.0f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("1.25",      1.25f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("7.99999",   7.99999f); /*Not rounding*/
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("16.0002",   16.0002f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("16.0004",   16.0004f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("16.0006",   16.0006f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("999999",    999999.0f); /*Last full print integer*/
-
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("-0",         -0.0f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("-4.99e-07",  -0.000000499f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("-5e-07",     -0.00000050000005f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("-0.100469",  -0.100469499f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("-1",         -0.9999995f); /*Rounding to int place*/
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("-1",         -1.0f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("-1.25",      -1.25f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("-7.99999",   -7.99999f); /*Not rounding*/
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("-16.0002",   -16.0002f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("-16.0004",   -16.0004f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("-16.0006",   -16.0006f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("-999999",    -999999.0f); /*Last full print integer*/
-
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("4.29497e+09", 4294967296.0f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("5e+09",       5000000000.0f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("8e+09",       8.0e+09f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("8.31e+09",    8309999104.0f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("1e+10",       1.0e+10f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("1e+10",       10000000000.0f);
-    /* Some compilers have trouble with inexact float constants, a float cast works generally */
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("1.00005e+10", (float)1.000054e+10f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("1.1e+38",     (float)1.10000005e+38f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("1.6353e+10",  1.63529943e+10f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("3.40282e+38", 3.40282346638e38f);
-
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("-1e+10",       -1.0e+10f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("-3.40282e+38", -3.40282346638e38f);
-#endif
-}
-
-void testFloatPrintingInfinityAndNaN(void)
-{
-#if defined(UNITY_EXCLUDE_FLOAT_PRINT) || !defined(USING_OUTPUT_SPY)
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("inf",   1.0f / f_zero);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("-inf", -1.0f / f_zero);
-
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("nan",   0.0f / f_zero);
-#endif
-}
-
-#if defined(UNITY_TEST_ALL_FLOATS_PRINT_OK) && defined(USING_OUTPUT_SPY)
-static void printFloatValue(float f)
-{
-    char expected[18];
-    char expected_lower[18];
-    char expected_higher[18];
-
-    startPutcharSpy();
-
-    UnityPrintFloat(f);
-
-    sprintf(expected, "%.6g", f);
-
-    /* We print all NaN's as "nan", not "-nan" */
-    if(strcmp(expected, "-nan") == 0) strcpy(expected, "nan");
-
-    /* Allow for rounding differences in last digit */
-    double lower = (double)f * 0.9999995;
-    double higher = (double)f * 1.0000005;
-
-    if (isfinite(lower)) sprintf(expected_lower, "%.6g", lower); else strcpy(expected_lower, expected);
-    if (isfinite(higher)) sprintf(expected_higher, "%.6g", higher); else strcpy(expected_higher, expected);
-
-    if (strcmp(expected, getBufferPutcharSpy()) != 0 &&
-        strcmp(expected_lower, getBufferPutcharSpy()) != 0 &&
-        strcmp(expected_higher, getBufferPutcharSpy()) != 0)
-    {
-        /* Fail with diagnostic printing */
-        TEST_ASSERT_EQUAL_PRINT_FLOATING(expected, f);
-    }
-}
-#endif
-
-void testFloatPrintingRandomSamples(void)
-{
-#if !defined(UNITY_TEST_ALL_FLOATS_PRINT_OK) || !defined(USING_OUTPUT_SPY)
-    TEST_IGNORE();
-#else
-    union { float f_value; uint32_t int_value; } u;
-
-    /* These values are not covered by the MINSTD generator */
-    u.int_value = 0x00000000; printFloatValue(u.f_value);
-    u.int_value = 0x80000000; printFloatValue(u.f_value);
-    u.int_value = 0x7fffffff; printFloatValue(u.f_value);
-    u.int_value = 0xffffffff; printFloatValue(u.f_value);
-
-    uint32_t a = 1;
-    for(int num_tested = 0; num_tested < 1000000; num_tested++)
-    {
-        /* MINSTD pseudo-random number generator */
-        a = (uint32_t)(((uint64_t)a * 48271u) % 2147483647u);
-
-        /* MINSTD does not set the highest bit; test both possibilities */
-        u.int_value = a;              printFloatValue(u.f_value);
-        u.int_value = a | 0x80000000; printFloatValue(u.f_value);
-    }
-#endif
-}
-
-// ===================== THESE TEST WILL RUN IF YOUR CONFIG INCLUDES DOUBLE SUPPORT ==================
-
-void testDoublesWithinDelta(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_DOUBLE_WITHIN(0.00003, 187245.03485, 187245.03488);
-    TEST_ASSERT_DOUBLE_WITHIN(1.0, 187245.0, 187246.0);
-    TEST_ASSERT_DOUBLE_WITHIN(0.05, 9273.2549, 9273.2049);
-    TEST_ASSERT_DOUBLE_WITHIN(0.007, -726.93725, -726.94424);
-#endif
-}
-
-void testDoublesNotWithinDelta(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_DOUBLE_WITHIN(0.05, 9273.2649, 9273.2049);
-    VERIFY_FAILS_END
-#endif
-}
-
-
-void testDoublesEqual(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_EQUAL_DOUBLE(187245123456.0, 187245123456.0);
-    TEST_ASSERT_EQUAL_DOUBLE(187241234567.5, 187241234567.6);
-    TEST_ASSERT_EQUAL_DOUBLE(9273.2512345649, 9273.25123455699);
-    TEST_ASSERT_EQUAL_DOUBLE(-726.12345693724, -726.1234569374);
-#endif
-}
-
-void testDoublesNotEqual(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_DOUBLE(9273.9649, 9273.0049);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testDoublesNotEqualNegative1(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_DOUBLE(-9273.9649, -9273.0049);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testDoublesNotEqualNegative2(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_DOUBLE(-9273.0049, -9273.9649);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testDoublesNotEqualActualNaN(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_DOUBLE(85.963, 0.0 / d_zero);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testDoublesNotEqualExpectedNaN(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_DOUBLE(0.0 / d_zero, 85.963);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testDoublesEqualBothNaN(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_EQUAL_DOUBLE(0.0 / d_zero, 0.0 / d_zero);
-#endif
-}
-
-void testDoublesNotEqualInfNaN(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_DOUBLE(1.0 / d_zero, 0.0 / d_zero);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testDoublesNotEqualNaNInf(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_DOUBLE(0.0 / d_zero, 1.0 / d_zero);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testDoublesNotEqualActualInf(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_DOUBLE(321.642, 1.0 / d_zero);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testDoublesNotEqualExpectedInf(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_DOUBLE(1.0 / d_zero, 321.642);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testDoublesEqualBothInf(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_EQUAL_DOUBLE(1.0 / d_zero, 1.0 / d_zero);
-#endif
-}
-
-void testDoublesNotEqualPlusMinusInf(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_DOUBLE(1.0 / d_zero, -1.0 / d_zero);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testDoubleIsPosInf1(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_DOUBLE_IS_INF(2.0 / d_zero);
-#endif
-}
-
-void testDoubleIsPosInf2(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_DOUBLE_IS_NOT_INF(2.0 / d_zero);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testDoubleIsNegInf1(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_DOUBLE_IS_NEG_INF(-3.0 / d_zero);
-#endif
-}
-
-void testDoubleIsNegInf2(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF(-3.0 / d_zero);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testDoubleIsNotPosInf1(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_DOUBLE_IS_INF(2.0);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testDoubleIsNotPosInf2(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_DOUBLE_IS_NOT_INF(2.0);
-#endif
-}
-
-void testDoubleIsNotNegInf(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_DOUBLE_IS_NEG_INF(-999.876);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testDoubleIsNan1(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_DOUBLE_IS_NAN(0.0 / d_zero);
-#endif
-}
-
-void testDoubleIsNan2(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_DOUBLE_IS_NOT_NAN(0.0 / d_zero);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testDoubleIsNotNan1(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_DOUBLE_IS_NAN(234.9);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testDoubleIsNotNan2(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_DOUBLE_IS_NOT_NAN(234.9);
-#endif
-}
-
-void testDoubleInfIsNotNan(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_DOUBLE_IS_NAN(1.0 / d_zero);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testDoubleNanIsNotInf(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_DOUBLE_IS_INF(0.0 / d_zero);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testDoubleIsDeterminate1(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_DOUBLE_IS_DETERMINATE(0.0);
-    TEST_ASSERT_DOUBLE_IS_DETERMINATE(123.3);
-    TEST_ASSERT_DOUBLE_IS_DETERMINATE(-88.3);
-#endif
-}
-
-void testDoubleIsDeterminate2(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE(-88.3);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testDoubleIsNotDeterminate1(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE(1.0 / d_zero);
-    TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE(-1.0 / d_zero);
-    TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE(0.0 / d_zero);
-#endif
-}
-
-void testDoubleIsNotDeterminate2(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_DOUBLE_IS_DETERMINATE(-1.0 / d_zero);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testDoubleTraitFailsOnInvalidTrait(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    EXPECT_ABORT_BEGIN
-    UnityAssertDoubleSpecial(1.0, NULL, __LINE__, UNITY_FLOAT_INVALID_TRAIT);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testEqualDoubleArrays(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    double p0[] = {1.0, -8.0,  25.4, -0.123};
-    double p1[] = {1.0, -8.0,  25.4, -0.123};
-    double p2[] = {1.0, -8.0,  25.4, -0.2};
-    double p3[] = {1.0, -23.0, 25.0, -0.26};
-
-    TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p0, 1);
-    TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p0, 4);
-    TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p1, 4);
-    TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p2, 3);
-    TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p3, 1);
-    TEST_ASSERT_EQUAL_DOUBLE_ARRAY(NULL, NULL, 1);
-#endif
-}
-
-void testNotEqualDoubleArraysExpectedNull(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    double* p0 = NULL;
-    double p1[] = {1.0, 8.0, 25.4, 0.252};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualDoubleArraysActualNull(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    double p0[] = {1.0, 8.0, 25.4, 0.253};
-    double* p1 = NULL;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualDoubleArrays1(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    double p0[] = {1.0, 8.0, 25.4, 0.25666666667};
-    double p1[] = {1.0, 8.0, 25.4, 0.25666666666};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualDoubleArrays2(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    double p0[] = {1.0, 8.0, 25.4, 0.253};
-    double p1[] = {2.0, 8.0, 25.4, 0.253};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualDoubleArrays3(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    double p0[] = {1.0, 8.0, 25.4, 0.253};
-    double p1[] = {1.0, 8.0, 25.5, 0.253};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualDoubleArraysNegative1(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    double p0[] = {-1.0, -8.0, -25.4, -0.2566666667};
-    double p1[] = {-1.0, -8.0, -25.4, -0.2566666666};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualDoubleArraysNegative2(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    double p0[] = {-1.0, -8.0, -25.4, -0.253};
-    double p1[] = {-2.0, -8.0, -25.4, -0.253};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualDoubleArraysNegative3(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    double p0[] = {-1.0, -8.0, -25.4, -0.253};
-    double p1[] = {-1.0, -8.0, -25.5, -0.253};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p1, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testEqualDoubleArraysNaN(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    double p0[] = {1.0, 0.0 / d_zero, 25.4, 0.253};
-    double p1[] = {1.0, 0.0 / d_zero, 25.4, 0.253};
-
-    TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p1, 4);
-#endif
-}
-
-void testEqualDoubleArraysInf(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    double p0[] = {1.0, 1.0 / d_zero, 25.4, 0.253};
-    double p1[] = {1.0, 1.0 / d_zero, 25.4, 0.253};
-
-    TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p1, 4);
-#endif
-}
-
-void testNotEqualDoubleArraysLengthZero(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    double p0[1] = {0.0};
-    double p1[1] = {0.0};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p1, 0);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testEqualDoubleEachEqual(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    double p0[] = {1.0, 1.0, 1.0, 1.0};
-    double p1[] = {-0.123, -0.123, -0.123, -0.123};
-    double p2[] = {25.4, 25.4, 25.4, -0.2};
-    double p3[] = {1.0, -23.0, 25.0, -0.26};
-
-    TEST_ASSERT_EACH_EQUAL_DOUBLE(1.0, p0, 1);
-    TEST_ASSERT_EACH_EQUAL_DOUBLE(1.0, p0, 4);
-    TEST_ASSERT_EACH_EQUAL_DOUBLE(-0.123, p1, 4);
-    TEST_ASSERT_EACH_EQUAL_DOUBLE(25.4, p2, 3);
-    TEST_ASSERT_EACH_EQUAL_DOUBLE(1.0, p3, 1);
-#endif
-}
-
-void testNotEqualDoubleEachEqualActualNull(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    double* p0 = NULL;
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_DOUBLE(5, p0, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualDoubleEachEqual1(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    double p0[] = {0.253, 8.0, 0.253, 0.253};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_DOUBLE(0.253, p0, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualDoubleEachEqual2(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    double p0[] = {8.0, 8.0, 8.0, 0.253};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_DOUBLE(8.0, p0, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualDoubleEachEqual3(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    double p0[] = {1.0, 1.0, 1.0, 0.253};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_DOUBLE(1.0, p0, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualDoubleEachEqualNegative1(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    double p0[] = {-1.0, -0.253, -0.253, -0.253};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_DOUBLE(-0.253, p0, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualDoubleEachEqualNegative2(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    double p0[] = {-25.4, -8.0, -25.4, -25.4};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_DOUBLE(-25.4, p0, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testNotEqualDoubleEachEqualNegative3(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    double p0[] = {-8.0, -8.0, -8.0, -0.253};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_DOUBLE(-8.0, p0, 4);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testEqualDoubleEachEqualNaN(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    double p0[] = {0.0 / d_zero, 0.0 / d_zero, 0.0 / d_zero, 0.0 / d_zero};
-
-    TEST_ASSERT_EACH_EQUAL_DOUBLE(0.0 / d_zero, p0, 4);
-#endif
-}
-
-void testEqualDoubleEachEqualInf(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    double p0[] = {1.0 / d_zero, 1.0 / d_zero, 25.4, 0.253};
-
-    TEST_ASSERT_EACH_EQUAL_DOUBLE(1.0 / d_zero, p0, 2);
-#endif
-}
-
-void testNotEqualDoubleEachEqualLengthZero(void)
-{
-#ifdef UNITY_EXCLUDE_DOUBLE
-    TEST_IGNORE();
-#else
-    double p0[1] = {0.0};
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EACH_EQUAL_DOUBLE(0.0, p0, 0);
-    VERIFY_FAILS_END
-#endif
-}
-
-void testDoublePrinting(void)
-{
-#if defined(UNITY_EXCLUDE_FLOAT_PRINT) || defined(UNITY_EXCLUDE_DOUBLE) || !defined(USING_OUTPUT_SPY)
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("0.100469",     0.10046949999999999);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("4.29497e+09",  4294967295.999999);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("4.29497e+09",  4294967295.9999995);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("4.29497e+09",  4294967296.0);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("1e+10",        9999999995.0);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("9.0072e+15",   9007199254740990.0);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("7e+100",       7.0e+100);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("3e+200",       3.0e+200);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("9.23457e+300", 9.23456789e+300);
-
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("-0.100469",    -0.10046949999999999);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("-4.29497e+09", -4294967295.999999);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("-4.29497e+09", -4294967295.9999995);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("-7e+100",      -7.0e+100);
-#endif
-}
-
-void testDoublePrintingInfinityAndNaN(void)
-{
-#if defined(UNITY_EXCLUDE_FLOAT_PRINT) || defined(UNITY_EXCLUDE_DOUBLE) || !defined(USING_OUTPUT_SPY)
-    TEST_IGNORE();
-#else
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("inf",   1.0 / d_zero);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("-inf", -1.0 / d_zero);
-
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("nan",   0.0 / d_zero);
-#endif
-}
-
-// ===================== THESE TEST WILL RUN IF YOUR CONFIG INCLUDES DETAIL SUPPORT ==================
-
-void testThatDetailsCanBeHandleOneDetail(void)
-{
-#ifdef UNITY_EXCLUDE_DETAILS
-    TEST_IGNORE();
-#else
-    UNITY_SET_DETAIL("Detail1");
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_INT_MESSAGE(5, 6, "Should Fail And Say Detail1");
-    VERIFY_FAILS_END
-#endif
-}
-
-void testThatDetailsCanHandleTestFail(void)
-{
-#ifdef UNITY_EXCLUDE_DETAILS
-    TEST_IGNORE();
-#else
-    UNITY_SET_DETAILS("Detail1","Detail2");
-
-    EXPECT_ABORT_BEGIN
-    TEST_FAIL_MESSAGE("Should Fail And Say Detail1 and Detail2");
-    VERIFY_FAILS_END
-#endif
-}
-
-void testThatDetailsCanBeHandleTwoDetails(void)
-{
-#ifdef UNITY_EXCLUDE_DETAILS
-    TEST_IGNORE();
-#else
-    UNITY_SET_DETAILS("Detail1","Detail2");
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_HEX8_MESSAGE(7, 8, "Should Fail And Say Detail1 and Detail2");
-    VERIFY_FAILS_END
-#endif
-}
-
-void testThatDetailsCanBeHandleSingleDetailClearingTwoDetails(void)
-{
-#ifdef UNITY_EXCLUDE_DETAILS
-    TEST_IGNORE();
-#else
-    UNITY_SET_DETAILS("Detail1","Detail2");
-    UNITY_SET_DETAIL("DetailNew");
-
-    EXPECT_ABORT_BEGIN
-    TEST_ASSERT_EQUAL_STRING_MESSAGE("MEH", "GUH", "Should Fail And Say DetailNew");
-    VERIFY_FAILS_END
-#endif
-}
-- 
GitLab