ceedling 0.15.6 → 0.16.0

data/vendor/unity/docs/license.txt

@@ -1,31 +1,21 @@
- Copyright (c) 2007-2010 Mike Karlesky, Mark VanderVoord, Greg Williams
+The MIT License (MIT)
 
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+Copyright (c) <year> 2007-14 Mike Karlesky, Mark VanderVoord, Greg Williams
 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
- The end-user documentation included with the redistribution, if 
- any, must include the following acknowledgment: "This product 
- includes software developed for the Unity Project, by Mike Karlesky,
- Mark VanderVoord, and Greg Williams and other contributors", in 
- the same place and form as other third-party acknowledgments. 
- Alternately, this acknowledgment may appear in the software 
- itself, in the same form and location as other such third-party 
- acknowledgments.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/vendor/unity/examples/example_1/makefile

@@ -4,15 +4,26 @@
 #   [Released under MIT License. Please refer to license.txt for details]
 # ==========================================
 
-UNITY_ROOT=../..
-C_COMPILER=gcc
-TARGET_BASE1=test1
-TARGET_BASE2=test2
-ifeq ($(OS),Windows_NT)
+#We try to detect the OS we are running on, and adjust commands as needed
+ifeq ($(OSTYPE),cygwin)
+	CLEANUP = rm -f
+	MKDIR = mkdir -p
+	TARGET_EXTENSION=.out
+else ifeq ($(OS),Windows_NT)
+	CLEANUP = del /F /Q
+	MKDIR = mkdir
 	TARGET_EXTENSION=.exe
 else
+	CLEANUP = rm -f
+	MKDIR = mkdir -p
 	TARGET_EXTENSION=.out
 endif
+
+UNITY_ROOT=../..
+C_COMPILER=gcc
+CFLAGS=-std=c99
+TARGET_BASE1=test1
+TARGET_BASE2=test2
 TARGET1 = $(TARGET_BASE1)$(TARGET_EXTENSION)
 TARGET2 = $(TARGET_BASE2)$(TARGET_EXTENSION)
 SRC_FILES1=$(UNITY_ROOT)/src/unity.c src/ProductionCode.c  test/TestProductionCode.c  test/test_runners/TestProductionCode_Runner.c
@@ -20,19 +31,13 @@ SRC_FILES2=$(UNITY_ROOT)/src/unity.c src/ProductionCode2.c test/TestProductionCo
 INC_DIRS=-Isrc -I$(UNITY_ROOT)/src
 SYMBOLS=-DTEST
 
-ifeq ($(OS),Windows_NT)
-	CLEANUP = del /F /Q $(TARGET1) && del /F /Q $(TARGET2)
-else
-	CLEANUP = rm -f build/*.o ; rm -f $(TARGET1) ; rm -f $(TARGET2)
-endif
-
 all: clean default
 
 default:
 #	ruby auto/generate_test_runner.rb test/TestProductionCode.c  test/test_runners/TestProductionCode_Runner.c
 #	ruby auto/generate_test_runner.rb test/TestProductionCode2.c test/test_runners/TestProductionCode2_Runner.c
-	$(C_COMPILER) $(INC_DIRS) $(SYMBOLS) $(SRC_FILES1) -o $(TARGET1)
-	$(C_COMPILER) $(INC_DIRS) $(SYMBOLS) $(SRC_FILES2) -o $(TARGET2)
+	$(C_COMPILER) $(CFLAGS) $(INC_DIRS) $(SYMBOLS) $(SRC_FILES1) -o $(TARGET1)
+	$(C_COMPILER) $(CFLAGS) $(INC_DIRS) $(SYMBOLS) $(SRC_FILES2) -o $(TARGET2)
 	./$(TARGET1)
 	./$(TARGET2)
 

data/vendor/unity/examples/example_1/test/test_runners/TestProductionCode2_Runner.c

@@ -24,7 +24,8 @@ static void runTest(UnityTestFunction test)
     tearDown();
   }
 }
-void resetTest()
+void resetTest(void);
+void resetTest(void)
 {
   tearDown();
   setUp();
@@ -33,8 +34,7 @@ void resetTest()
 
 int main(void)
 {
-  Unity.TestFile = "test/TestProductionCode2.c";
-  UnityBegin();
+  UnityBegin("test/TestProductionCode2.c");
 
   // RUN_TEST calls runTest
   RUN_TEST(test_IgnoredTest, 13);

data/vendor/unity/examples/example_1/test/test_runners/TestProductionCode_Runner.c

@@ -26,7 +26,8 @@ static void runTest(UnityTestFunction test)
     tearDown();
   }
 }
-void resetTest()
+void resetTest(void);
+void resetTest(void)
 {
   tearDown();
   setUp();
@@ -35,8 +36,7 @@ void resetTest()
 
 int main(void)
 {
-  Unity.TestFile = "test/TestProductionCode.c";
-  UnityBegin();
+  UnityBegin("test/TestProductionCode.c");
 
   // RUN_TEST calls runTest
   RUN_TEST(test_FindFunction_WhichIsBroken_ShouldReturnZeroIfItemIsNotInList_WhichWorksEvenInOurBrokenCode, 20);

data/vendor/unity/examples/example_2/makefile

@@ -4,14 +4,24 @@
 #   [Released under MIT License. Please refer to license.txt for details]
 # ==========================================
 
-UNITY_ROOT=../..
-C_COMPILER=gcc
-TARGET_BASE1=all_tests
-ifeq ($(OS),Windows_NT)
+#We try to detect the OS we are running on, and adjust commands as needed
+ifeq ($(OSTYPE),cygwin)
+	CLEANUP = rm -f
+	MKDIR = mkdir -p
+	TARGET_EXTENSION=.out
+else ifeq ($(OS),Windows_NT)
+	CLEANUP = del /F /Q
+	MKDIR = mkdir
 	TARGET_EXTENSION=.exe
 else
+	CLEANUP = rm -f
+	MKDIR = mkdir -p
 	TARGET_EXTENSION=.out
 endif
+
+UNITY_ROOT=../..
+C_COMPILER=gcc
+TARGET_BASE1=all_tests
 TARGET1 = $(TARGET_BASE1)$(TARGET_EXTENSION)
 SRC_FILES1=\
   $(UNITY_ROOT)/src/unity.c \
@@ -26,12 +36,6 @@ SRC_FILES1=\
 INC_DIRS=-Isrc -I$(UNITY_ROOT)/src -I$(UNITY_ROOT)/extras/fixture/src
 SYMBOLS=
 
-ifeq ($(OS),Windows_NT)
-	CLEANUP = del /F /Q $(TARGET1)
-else
-	CLEANUP = rm -f build/*.o ; rm -f $(TARGET1)
-endif
-
 all: clean default
 
 default:

data/vendor/unity/examples/example_3/makefile

@@ -4,15 +4,26 @@
 #   [Released under MIT License. Please refer to license.txt for details]
 # ==========================================
 
-UNITY_ROOT=../..
-C_COMPILER=gcc
-TARGET_BASE1=test1
-TARGET_BASE2=test2
-ifeq ($(OS),Windows_NT)
+#We try to detect the OS we are running on, and adjust commands as needed
+ifeq ($(OSTYPE),cygwin)
+	CLEANUP = rm -f
+	MKDIR = mkdir -p
+	TARGET_EXTENSION=.out
+else ifeq ($(OS),Windows_NT)
+	CLEANUP = del /F /Q
+	MKDIR = mkdir
 	TARGET_EXTENSION=.exe
 else
+	CLEANUP = rm -f
+	MKDIR = mkdir -p
 	TARGET_EXTENSION=.out
 endif
+
+UNITY_ROOT=../..
+C_COMPILER=gcc
+CFLAGS=-std=c99
+TARGET_BASE1=test1
+TARGET_BASE2=test2
 TARGET1 = $(TARGET_BASE1)$(TARGET_EXTENSION)
 TARGET2 = $(TARGET_BASE2)$(TARGET_EXTENSION)
 SRC_FILES1=$(UNITY_ROOT)/src/unity.c src/ProductionCode.c  test/TestProductionCode.c  test/no_ruby/TestProductionCode_Runner.c
@@ -20,19 +31,13 @@ SRC_FILES2=$(UNITY_ROOT)/src/unity.c src/ProductionCode2.c test/TestProductionCo
 INC_DIRS=-Isrc -I$(UNITY_ROOT)/src
 SYMBOLS=-DTEST
 
-ifeq ($(OS),Windows_NT)
-	CLEANUP = del /F /Q $(TARGET1) && del /F /Q $(TARGET2)
-else
-	CLEANUP = rm -f build/*.o ; rm -f $(TARGET1) ; rm -f $(TARGET2)
-endif
-
 all: clean default
 
 default:
 #	ruby auto/generate_test_runner.rb test/TestProductionCode.c  test/no_ruby/TestProductionCode_Runner.c
 #	ruby auto/generate_test_runner.rb test/TestProductionCode2.c test/no_ruby/TestProductionCode2_Runner.c
-	$(C_COMPILER) $(INC_DIRS) $(SYMBOLS) $(SRC_FILES1) -o $(TARGET1)
-	$(C_COMPILER) $(INC_DIRS) $(SYMBOLS) $(SRC_FILES2) -o $(TARGET2)
+	$(C_COMPILER) $(CFLAGS) $(INC_DIRS) $(SYMBOLS) $(SRC_FILES1) -o $(TARGET1)
+	$(C_COMPILER) $(CFLAGS) $(INC_DIRS) $(SYMBOLS) $(SRC_FILES2) -o $(TARGET2)
 	./$(TARGET1)
 	./$(TARGET2)
 

data/vendor/unity/examples/example_3/test/no_ruby/TestProductionCode2_Runner.c

@@ -24,7 +24,8 @@ static void runTest(UnityTestFunction test)
     tearDown();
   }
 }
-void resetTest()
+void resetTest(void);
+void resetTest(void)
 {
   tearDown();
   setUp();
@@ -33,8 +34,7 @@ void resetTest()
 
 int main(void)
 {
-  Unity.TestFile = "test/TestProductionCode2.c";
-  UnityBegin();
+  UnityBegin("test/TestProductionCode2.c");
 
   // RUN_TEST calls runTest
   RUN_TEST(test_IgnoredTest, 13);

data/vendor/unity/examples/example_3/test/no_ruby/TestProductionCode_Runner.c

@@ -26,7 +26,8 @@ static void runTest(UnityTestFunction test)
     tearDown();
   }
 }
-void resetTest()
+void resetTest(void);
+void resetTest(void)
 {
   tearDown();
   setUp();
@@ -35,8 +36,7 @@ void resetTest()
 
 int main(void)
 {
-  Unity.TestFile = "test/TestProductionCode.c";
-  UnityBegin();
+  UnityBegin("test/TestProductionCode.c");
 
   // RUN_TEST calls runTest
   RUN_TEST(test_FindFunction_WhichIsBroken_ShouldReturnZeroIfItemIsNotInList_WhichWorksEvenInOurBrokenCode, 20);

data/vendor/unity/extras/fixture/rakefile_helper.rb

@@ -2,7 +2,7 @@
 #   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'
@@ -13,27 +13,27 @@ require HERE+'../../auto/colour_reporter'
 module RakefileHelpers
 
   C_EXTENSION = '.c'
-  
+
   def load_configuration(config_file)
     unless ($configured)
-      $cfg_file = HERE+"../../targets/#{config_file}" unless (config_file =~ /[\\|\/]/)
+      $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
   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)
     if strings.is_a?(Array)
       result = "\"#{strings.join}\""
@@ -42,7 +42,7 @@ module RakefileHelpers
     end
     return result
   end
-  
+
   def squash(prefix, items)
     result = ''
     items.each { |item| result += " #{prefix}#{tackit(item)}" }
@@ -70,7 +70,7 @@ module RakefileHelpers
       "#{File.basename(file, C_EXTENSION)}#{$cfg['compiler']['object_files']['extension']}"
     execute(cmd_str)
   end
-  
+
   def build_linker_fields
     command  = tackit($cfg['linker']['path'])
     if $cfg['linker']['options'].nil?
@@ -86,7 +86,7 @@ module RakefileHelpers
     includes = includes.gsub(/\\ /, ' ').gsub(/\\\"/, '"').gsub(/\\$/, '') # Remove trailing slashes (for IAR)
     return {: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]} " +
@@ -96,7 +96,7 @@ module RakefileHelpers
       exe_name + $cfg['linker']['bin_files']['extension']
     execute(cmd_str)
   end
-  
+
   def build_simulator_fields
     return nil if $cfg['simulator'].nil?
     if $cfg['simulator']['path'].nil?
@@ -116,7 +116,7 @@ module RakefileHelpers
     end
     return {:command => command, :pre_support => pre_support, :post_support => post_support}
   end
-  
+
   def execute(command_string, verbose=true)
     report command_string
     output = `#{command_string}`.chomp
@@ -126,7 +126,7 @@ module RakefileHelpers
     end
     return output
   end
-  
+
   def report_summary
     summary = UnityTestSummary.new
     summary.set_root_path(HERE)
@@ -136,29 +136,29 @@ module RakefileHelpers
     summary.set_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']

data/vendor/unity/extras/fixture/src/unity_fixture.c

@@ -6,6 +6,7 @@
 ========================================== */
 
 #include <string.h>
+#include <stdio.h>
 #include "unity_fixture.h"
 #include "unity_internals.h"
 
@@ -38,7 +39,7 @@ int UnityMain(int argc, char* argv[], void (*runAllTests)(void))
     for (r = 0; r < UnityFixture.RepeatCount; r++)
     {
         announceTestRun(r);
-        UnityBegin();
+        UnityBegin(argv[0]);
         runAllTests();
         UNITY_OUTPUT_CHAR('\n');
         UnityEnd();

data/vendor/unity/extras/fixture/test/unity_fixture_Test.c

@@ -122,7 +122,7 @@ TEST(UnityFixture, PointerSet)
     p1 = &c1;
     p2 = &c2;
 
-    UnityPointer_Init(10);
+    UnityPointer_Init();
     UT_PTR_SET(p1, &newC1);
     UT_PTR_SET(p2, &newC2);
     TEST_ASSERT_POINTERS_EQUAL(&newC1, p1);

data/vendor/unity/src/unity.c

@@ -14,26 +14,34 @@
 
 struct _Unity Unity;
 
-const char* UnityStrNull     = "NULL";
-const char* UnityStrSpacer   = ". ";
-const char* UnityStrExpected = " Expected ";
-const char* UnityStrWas      = " Was ";
-const char* UnityStrTo       = " To ";
-const char* UnityStrElement  = " Element ";
-const char* UnityStrByte     = " Byte ";
-const char* UnityStrMemory   = " Memory Mismatch.";
-const char* UnityStrDelta    = " Values Not Within Delta ";
-const char* UnityStrPointless= " You Asked Me To Compare Nothing, Which Was Pointless.";
-const char* UnityStrNullPointerForExpected= " Expected pointer to be NULL";
-const char* UnityStrNullPointerForActual  = " Actual pointer was NULL";
-const char* UnityStrNot      = "Not ";
-const char* UnityStrInf      = "Infinity";
-const char* UnityStrNegInf   = "Negative Infinity";
-const char* UnityStrNaN      = "NaN";
-const char* UnityStrDet      = "Determinate";
-const char* UnityStrErrFloat = "Unity Floating Point Disabled";
-const char* UnityStrErrDouble= "Unity Double Precision Disabled";
-const char* UnityStrErr64    = "Unity 64-bit Support Disabled";
+const char UnityStrOk[]                     = "OK";
+const char UnityStrPass[]                   = "PASS";
+const char UnityStrFail[]                   = "FAIL";
+const char UnityStrIgnore[]                 = "IGNORE";
+const char UnityStrNull[]                   = "NULL";
+const char UnityStrSpacer[]                 = ". ";
+const char UnityStrExpected[]               = " Expected ";
+const char UnityStrWas[]                    = " Was ";
+const char UnityStrTo[]                     = " To ";
+const char UnityStrElement[]                = " Element ";
+const char UnityStrByte[]                   = " Byte ";
+const char UnityStrMemory[]                 = " Memory Mismatch.";
+const char UnityStrDelta[]                  = " Values Not Within Delta ";
+const char UnityStrPointless[]              = " You Asked Me To Compare Nothing, Which Was Pointless.";
+const char UnityStrNullPointerForExpected[] = " Expected pointer to be NULL";
+const char UnityStrNullPointerForActual[]   = " Actual pointer was NULL";
+const char UnityStrNot[]                    = "Not ";
+const char UnityStrInf[]                    = "Infinity";
+const char UnityStrNegInf[]                 = "Negative Infinity";
+const char UnityStrNaN[]                    = "NaN";
+const char UnityStrDet[]                    = "Determinate";
+const char UnityStrErrFloat[]               = "Unity Floating Point Disabled";
+const char UnityStrErrDouble[]              = "Unity Double Precision Disabled";
+const char UnityStrErr64[]                  = "Unity 64-bit Support Disabled";
+const char UnityStrBreaker[]                = "-----------------------";
+const char UnityStrResultsTests[]           = " Tests ";
+const char UnityStrResultsFailures[]        = " Failures ";
+const char UnityStrResultsIgnored[]         = " Ignored ";
 
 #ifndef UNITY_EXCLUDE_FLOAT
 // Dividing by these constants produces +/- infinity.
@@ -125,12 +133,24 @@ void UnityPrintNumber(const _U_SINT number_to_print)
 {
     _U_SINT divisor = 1;
     _U_SINT next_divisor;
-    _U_SINT number = number_to_print;
+    _U_UINT number;
 
-    if (number < 0)
+    if (number_to_print == (1l << (UNITY_LONG_WIDTH-1)))
     {
+        //The largest representable negative number
         UNITY_OUTPUT_CHAR('-');
-        number = -number;
+        number = (1ul << (UNITY_LONG_WIDTH-1));
+    }
+    else if (number_to_print < 0)
+    {
+        //Some other negative number
+        UNITY_OUTPUT_CHAR('-');
+        number = (_U_UINT)(-number_to_print);
+    }
+    else
+    {
+        //Positive number
+        number = (_U_UINT)number_to_print;
     }
 
     // figure out initial divisor
@@ -242,18 +262,17 @@ void UnityPrintFloat(_UF number)
 
 void UnityPrintFail(void)
 {
-    UnityPrint("FAIL");
+    UnityPrint(UnityStrFail);
 }
 
 void UnityPrintOk(void)
 {
-    UnityPrint("OK");
+    UnityPrint(UnityStrOk);
 }
 
 //-----------------------------------------------
 void UnityTestResultsBegin(const char* file, const UNITY_LINE_TYPE line)
 {
-    UNITY_PRINT_EOL;
     UnityPrint(file);
     UNITY_OUTPUT_CHAR(':');
     UnityPrintNumber((_U_SINT)line);
@@ -266,7 +285,8 @@ void UnityTestResultsBegin(const char* file, const UNITY_LINE_TYPE line)
 void UnityTestResultsFailBegin(const UNITY_LINE_TYPE line)
 {
     UnityTestResultsBegin(Unity.TestFile, line);
-    UnityPrint("FAIL:");
+    UnityPrint(UnityStrFail);
+    UNITY_OUTPUT_CHAR(':');
 }
 
 //-----------------------------------------------
@@ -279,7 +299,7 @@ void UnityConcludeTest(void)
     else if (!Unity.CurrentTestFailed)
     {
         UnityTestResultsBegin(Unity.TestFile, Unity.CurrentTestLineNumber);
-        UnityPrint("PASS");
+        UnityPrint(UnityStrPass);
     }
     else
     {
@@ -288,6 +308,7 @@ void UnityConcludeTest(void)
 
     Unity.CurrentTestFailed = 0;
     Unity.CurrentTestIgnored = 0;
+    UNITY_PRINT_EOL;
 }
 
 //-----------------------------------------------
@@ -413,8 +434,8 @@ void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const void* expected,
                               const UNITY_DISPLAY_STYLE_T style)
 {
     _UU32 elements = num_elements;
-    UNITY_PTR_ATTRIBUTE const _US8* ptr_exp = (UNITY_PTR_ATTRIBUTE _US8*)expected;
-    UNITY_PTR_ATTRIBUTE const _US8* ptr_act = (UNITY_PTR_ATTRIBUTE _US8*)actual;
+    UNITY_PTR_ATTRIBUTE const _US8* ptr_exp = (UNITY_PTR_ATTRIBUTE const _US8*)expected;
+    UNITY_PTR_ATTRIBUTE const _US8* ptr_act = (UNITY_PTR_ATTRIBUTE const _US8*)actual;
 
     UNITY_SKIP_EXECUTION;
 
@@ -426,7 +447,7 @@ void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const void* expected,
         UNITY_FAIL_AND_BAIL;
     }
 
-    if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE void*)expected, (UNITY_PTR_ATTRIBUTE void*)actual, lineNumber, msg) == 1)
+    if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE const void*)expected, (UNITY_PTR_ATTRIBUTE const void*)actual, lineNumber, msg) == 1)
         return;
 
     // If style is UNITY_DISPLAY_STYLE_INT, we'll fall into the default case rather than the INT16 or INT32 (etc) case
@@ -460,15 +481,15 @@ void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const void* expected,
         case UNITY_DISPLAY_STYLE_UINT16:
             while (elements--)
             {
-                if (*(UNITY_PTR_ATTRIBUTE _US16*)ptr_exp != *(UNITY_PTR_ATTRIBUTE _US16*)ptr_act)
+                if (*(UNITY_PTR_ATTRIBUTE const _US16*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US16*)ptr_act)
                 {
                     UnityTestResultsFailBegin(lineNumber);
                     UnityPrint(UnityStrElement);
                     UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT);
                     UnityPrint(UnityStrExpected);
-                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE _US16*)ptr_exp, style);
+                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US16*)ptr_exp, style);
                     UnityPrint(UnityStrWas);
-                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE _US16*)ptr_act, style);
+                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US16*)ptr_act, style);
                     UnityAddMsgIfSpecified(msg);
                     UNITY_FAIL_AND_BAIL;
                 }
@@ -482,15 +503,15 @@ void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const void* expected,
         case UNITY_DISPLAY_STYLE_UINT64:
             while (elements--)
             {
-                if (*(UNITY_PTR_ATTRIBUTE _US64*)ptr_exp != *(UNITY_PTR_ATTRIBUTE _US64*)ptr_act)
+                if (*(UNITY_PTR_ATTRIBUTE const _US64*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US64*)ptr_act)
                 {
                     UnityTestResultsFailBegin(lineNumber);
                     UnityPrint(UnityStrElement);
                     UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT);
                     UnityPrint(UnityStrExpected);
-                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE _US64*)ptr_exp, style);
+                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US64*)ptr_exp, style);
                     UnityPrint(UnityStrWas);
-                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE _US64*)ptr_act, style);
+                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US64*)ptr_act, style);
                     UnityAddMsgIfSpecified(msg);
                     UNITY_FAIL_AND_BAIL;
                 }
@@ -502,15 +523,15 @@ void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const void* expected,
         default:
             while (elements--)
             {
-                if (*(UNITY_PTR_ATTRIBUTE _US32*)ptr_exp != *(UNITY_PTR_ATTRIBUTE _US32*)ptr_act)
+                if (*(UNITY_PTR_ATTRIBUTE const _US32*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US32*)ptr_act)
                 {
                     UnityTestResultsFailBegin(lineNumber);
                     UnityPrint(UnityStrElement);
                     UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT);
                     UnityPrint(UnityStrExpected);
-                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE _US32*)ptr_exp, style);
+                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US32*)ptr_exp, style);
                     UnityPrint(UnityStrWas);
-                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE _US32*)ptr_act, style);
+                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US32*)ptr_act, style);
                     UnityAddMsgIfSpecified(msg);
                     UNITY_FAIL_AND_BAIL;
                 }
@@ -544,7 +565,7 @@ void UnityAssertEqualFloatArray(UNITY_PTR_ATTRIBUTE const _UF* expected,
         UNITY_FAIL_AND_BAIL;
     }
 
-    if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE void*)expected, (UNITY_PTR_ATTRIBUTE void*)actual, lineNumber, msg) == 1)
+    if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE const void*)expected, (UNITY_PTR_ATTRIBUTE const void*)actual, lineNumber, msg) == 1)
         return;
 
     while (elements--)
@@ -622,13 +643,13 @@ void UnityAssertFloatSpecial(const _UF actual,
                              const UNITY_LINE_TYPE lineNumber,
                              const UNITY_FLOAT_TRAIT_T style)
 {
-    UNITY_SKIP_EXECUTION;
-
     const char* trait_names[] = { UnityStrInf, UnityStrNegInf, UnityStrNaN, UnityStrDet };
     _U_SINT should_be_trait   = ((_U_SINT)style & 1);
     _U_SINT is_trait          = !should_be_trait;
     _U_SINT trait_index       = style >> 1;
 
+    UNITY_SKIP_EXECUTION;
+
     switch(style)
     {
         //To determine Inf / Neg Inf, we compare to an Inf / Neg Inf value we create on the fly
@@ -656,6 +677,8 @@ void UnityAssertFloatSpecial(const _UF actual,
             else
                 is_trait = 1;
             break;
+	default:
+	    ;
     }
 
     if (is_trait != should_be_trait)
@@ -782,13 +805,13 @@ void UnityAssertDoubleSpecial(const _UD actual,
                               const UNITY_LINE_TYPE lineNumber,
                               const UNITY_FLOAT_TRAIT_T style)
 {
-    UNITY_SKIP_EXECUTION;
-
     const char* trait_names[] = { UnityStrInf, UnityStrNegInf, UnityStrNaN, UnityStrDet };
     _U_SINT should_be_trait   = ((_U_SINT)style & 1);
     _U_SINT is_trait          = !should_be_trait;
     _U_SINT trait_index       = style >> 1;
 
+    UNITY_SKIP_EXECUTION;
+
     switch(style)
     {
         //To determine Inf / Neg Inf, we compare to an Inf / Neg Inf value we create on the fly
@@ -816,6 +839,8 @@ void UnityAssertDoubleSpecial(const _UD actual,
             else
                 is_trait = 1;
             break;
+	default:
+	    ;
     }
 
     if (is_trait != should_be_trait)
@@ -987,8 +1012,8 @@ void UnityAssertEqualMemory( UNITY_PTR_ATTRIBUTE const void* expected,
                              const char* msg,
                              const UNITY_LINE_TYPE lineNumber)
 {
-    UNITY_PTR_ATTRIBUTE unsigned char* ptr_exp = (UNITY_PTR_ATTRIBUTE unsigned char*)expected;
-    UNITY_PTR_ATTRIBUTE unsigned char* ptr_act = (UNITY_PTR_ATTRIBUTE unsigned char*)actual;
+    UNITY_PTR_ATTRIBUTE const unsigned char* ptr_exp = (UNITY_PTR_ATTRIBUTE const unsigned char*)expected;
+    UNITY_PTR_ATTRIBUTE const unsigned char* ptr_act = (UNITY_PTR_ATTRIBUTE const unsigned char*)actual;
     _UU32 elements = num_elements;
     _UU32 bytes;
 
@@ -1002,7 +1027,7 @@ void UnityAssertEqualMemory( UNITY_PTR_ATTRIBUTE const void* expected,
         UNITY_FAIL_AND_BAIL;
     }
 
-    if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE void*)expected, (UNITY_PTR_ATTRIBUTE void*)actual, lineNumber, msg) == 1)
+    if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE const void*)expected, (UNITY_PTR_ATTRIBUTE const void*)actual, lineNumber, msg) == 1)
         return;
 
     while (elements--)
@@ -1065,7 +1090,7 @@ void UnityIgnore(const char* msg, const UNITY_LINE_TYPE line)
     UNITY_SKIP_EXECUTION;
 
     UnityTestResultsBegin(Unity.TestFile, line);
-    UnityPrint("IGNORE");
+    UnityPrint(UnityStrIgnore);
     if (msg != NULL)
     {
       UNITY_OUTPUT_CHAR(':');
@@ -1120,14 +1145,14 @@ void UnityBegin(const char* filename)
 int UnityEnd(void)
 {
     UNITY_PRINT_EOL;
-    UnityPrint("-----------------------");
+    UnityPrint(UnityStrBreaker);
     UNITY_PRINT_EOL;
     UnityPrintNumber((_U_SINT)(Unity.NumberOfTests));
-    UnityPrint(" Tests ");
+    UnityPrint(UnityStrResultsTests);
     UnityPrintNumber((_U_SINT)(Unity.TestFailures));
-    UnityPrint(" Failures ");
+    UnityPrint(UnityStrResultsFailures);
     UnityPrintNumber((_U_SINT)(Unity.TestIgnores));
-    UnityPrint(" Ignored");
+    UnityPrint(UnityStrResultsIgnored);
     UNITY_PRINT_EOL;
     if (Unity.TestFailures == 0U)
     {
@@ -1143,5 +1168,3 @@ int UnityEnd(void)
 }
 
 //-----------------------------------------------
-
-