Initial support for the Meson build system

2017-06-28 17:40:31 +02:00
36 changed files with 415 additions and 1121 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -15,7 +15,7 @@ Coding Style
 ------------
 The coding style has been discussed in [#24](https://github.com/DaveGamble/cJSON/issues/24). The basics are:

-* Use 4 spaces for indentation
+* Use 4 tabs for indentation
 * No oneliners (conditions, loops, variable declarations ...)
 * Always use parenthesis for control structures
 * Don't implicitly rely on operator precedence, use round brackets in expressions. e.g. `(a > b) && (c < d)` instead of `a>b && c<d`
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,3 @@ cJSON_test_utils
 libcjson.so.*
 libcjson_utils.so.*
 *.orig
-.vscode
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,6 @@ addons:
 script:
  - mkdir build
  - cd build
-  - cmake .. -DENABLE_CJSON_UTILS=On -DENABLE_VALGRIND="${VALGRIND}" -DENABLE_SAFE_STACK="${VALGRIND}" -DENABLE_SANITIZERS="${SANITIZERS}"
+  - cmake .. -DENABLE_CJSON_UTILS=On -DENABLE_VALGRIND="${VALGRIND}" -DENABLE_SANITIZERS="${SANITIZERS}"
  - make
  - make test CTEST_OUTPUT_ON_FAILURE=On
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,33 +1,3 @@
-1.6.0
-=====
-Features:
---------
-* You can now build cJSON as both shared and static library at once with CMake using `-DBUILD_SHARED_AND_STATIC_LIBS=On`, see #178
-* UTF-8 byte order marks are now ignored, see #184
-* Locales can now be disabled with the option `-DENABLE_LOCALES=Off`, see #202, thanks @Casperinous
-* Better support for MSVC and Visual Studio
-
-Other Changes:
--------------
-* Add the new warnings `-Wswitch-enum`, `-Wused-but-makred-unused`, `-Wmissing-variable-declarations`, `-Wunused-macro`
-* More number printing tests.
-* Continuous integration testing with AppVeyor (semi automatic at this point), thanks @simon-p-r
-
-1.5.9
-=====
-* Set the global error pointer even if `return_parse_end` is passed to `cJSON_ParseWithOpts`. See #200, thanks @rmallins
-
-1.5.8
-=====
-* Fix `make test` in the Makefile, thanks @YanhaoMo for reporting this (#195)
-
-1.5.7
-=====
-Fixes:
------
-* Fix a bug where realloc failing would return a pointer to an invalid memory address. This is a security issue as it could potentially be used by an attacker to write to arbitrary memory addresses. (see #189), fixed in (954d61e5e7cb9dc6c480fc28ac1cdceca07dd5bd), big thanks @timothyjohncarney for reporting this issue
-* Fix a spelling mistake in the AFL fuzzer dictionary (#185), thanks @jwilk
-
 1.5.6
 =====
 Fixes:
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,8 +6,8 @@ include(GNUInstallDirs)
 project(cJSON C)

 set(PROJECT_VERSION_MAJOR 1)
-set(PROJECT_VERSION_MINOR 6)
-set(PROJECT_VERSION_PATCH 0)
+set(PROJECT_VERSION_MINOR 5)
+set(PROJECT_VERSION_PATCH 6)
 set(CJSON_VERSION_SO 1)
 set(CJSON_UTILS_VERSION_SO 1)
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
@@ -73,16 +73,6 @@ if (ENABLE_SANITIZERS)
        )
 endif()

-option(ENABLE_SAFE_STACK "Enables the SafeStack instrumentation pass by the Code Pointer Integrity Project" OFF)
-if (ENABLE_SAFE_STACK)
-    if (ENABLE_SANITIZERS)
-        message(FATAL_ERROR "ENABLE_SAFE_STACK cannot be used in combination with ENABLE_SANITIZERS")
-    endif()
-    list(APPEND custom_compiler_flags
-        -fsanitize=safe-stack
-        )
-endif()
-
 option(ENABLE_PUBLIC_SYMBOLS "Export library symbols." On)
 if (ENABLE_PUBLIC_SYMBOLS)
    list(APPEND custom_compiler_flags -fvisibility=hidden)
@@ -234,11 +224,5 @@ if(ENABLE_CJSON_TEST)
        DEPENDS ${TEST_CJSON})
 endif()

-# Enable the use of locales
-option(ENABLE_LOCALES "Enable the use of locales" ON)
-if(ENABLE_LOCALES)
-	add_definitions(-DENABLE_LOCALES)
-endif() 
-
 add_subdirectory(tests)
 add_subdirectory(fuzzing)
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1,14 +1,11 @@
 Contributors
 ============

-Original Author: [Dave Gamble](https://github.com/DaveGamble)
-Current Maintainer: [Max Bruckner](https://github.com/FSMaxB)
-
 * [Ajay Bhargav](https://github.com/ajaybhargav)
 * [Alper Akcan](https://github.com/alperakcan)
 * [Anton Sergeev](https://github.com/anton-sergeev)
 * [Christian Schulze](https://github.com/ChristianSch)
-* [Casperinous](https://github.com/Casperinous)
+* [Dave Gamble](https://github.com/DaveGamble)
 * [Debora Grosse](https://github.com/DeboraG)
 * [dieyushi](https://github.com/dieyushi)
 * [Dōngwén Huáng (黄东文)](https://github.com/DongwenHuang)
@@ -18,13 +15,13 @@ Current Maintainer: [Max Bruckner](https://github.com/FSMaxB)
 * Ian Mobley
 * Irwan Djadjadi
 * [IvanVoid](https://github.com/npi3pak)
-* [Jakub Wilk](https://github.com/jwilk)
 * [Jiri Zouhar](https://github.com/loigu)
 * [Jonathan Fether](https://github.com/jfether)
 * [Julián Vásquez](https://github.com/juvasquezg)
 * [Kevin Branigan](https://github.com/kbranigan)
 * [Kyle Chisholm](https://github.com/ChisholmKyle)
 * [Linus Wallgren](https://github.com/ecksun)
+* [Max Bruckner](https://github.com/FSMaxB)
 * Mike Pontillo
 * [Mike Jerris](https://github.com/mjerris)
 * [Mike Robinson](https://github.com/mhrobinson)
@@ -32,11 +29,9 @@ Current Maintainer: [Max Bruckner](https://github.com/FSMaxB)
 * [Pawel Winogrodzki](https://github.com/PawelWMS)
 * [prefetchnta](https://github.com/prefetchnta)
 * [Rafael Leal Dias](https://github.com/rafaeldias)
-* [Robin Mallinson](https://github.com/rmallins)
 * [Rod Vagg](https://github.com/rvagg)
 * [Roland Meertens](https://github.com/rmeertens)
 * [Romain Porte](https://github.com/MicroJoe)
-* [Simon Ricaldone](https://github.com/simon-p-r)
 * [Stephan Gatzka](https://github.com/gatzka)
 * [Weston Schmidt](https://github.com/schmidtw)

--- a/7
+++ b/7
@@ -8,7 +8,7 @@ CJSON_TEST_SRC = cJSON.c test.c

 LDLIBS = -lm

-LIBVERSION = 1.6.0
+LIBVERSION = 1.5.6
 CJSON_SOVERSION = 1
 UTILS_SOVERSION = 1

@@ -66,10 +66,11 @@ shared: $(CJSON_SHARED) $(UTILS_SHARED)

 static: $(CJSON_STATIC) $(UTILS_STATIC)

-tests: $(CJSON_TEST)
+tests: $(CJSON_TEST) $(UTILS_TEST)

 test: tests
 	./$(CJSON_TEST)
+	./$(UTILS_TEST)

 .c.o:
 	$(CC) -c $(R_CFLAGS) $<
@@ -149,4 +150,4 @@ clean:
 	$(RM) $(CJSON_OBJ) $(UTILS_OBJ) #delete object files
 	$(RM) $(CJSON_SHARED) $(CJSON_SHARED_VERSION) $(CJSON_SHARED_SO) $(CJSON_STATIC) #delete cJSON
 	$(RM) $(UTILS_SHARED) $(UTILS_SHARED_VERSION) $(UTILS_SHARED_SO) $(UTILS_STATIC) #delete cJSON_Utils
-	$(RM) $(CJSON_TEST)  #delete test
+	$(RM) $(CJSON_TEST) $(UTILS_TEST) #delete tests
--- a/README.md
+++ b/README.md
@@ -88,11 +88,9 @@ You can change the build process with a list of different options that you can p
 * `-DENABLE_CUSTOM_COMPILER_FLAGS=On`: Enable custom compiler flags (currently for Clang, GCC and MSVC). Turn off if it makes problems. (on by default)
 * `-DENABLE_VALGRIND=On`: Run tests with [valgrind](http://valgrind.org). (off by default)
 * `-DENABLE_SANITIZERS=On`: Compile cJSON with [AddressSanitizer](https://github.com/google/sanitizers/wiki/AddressSanitizer) and [UndefinedBehaviorSanitizer](https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html) enabled (if possible). (off by default)
-* `-DENABLE_SAFE_STACK`: Enable the [SafeStack](https://clang.llvm.org/docs/SafeStack.html) instrumentation pass. Currently only works with the Clang compiler. (off by default)
 * `-DBUILD_SHARED_LIBS=On`: Build the shared libraries. (on by default)
 * `-DBUILD_SHARED_AND_STATIC_LIBS=On`: Build both shared and static libraries. (off by default)
 * `-DCMAKE_INSTALL_PREFIX=/usr`: Set a prefix for the installation.
-* `-DENABLE_LOCALES=On`: Enable the usage of localeconv method. ( on by default )

 If you are packaging cJSON for a distribution of Linux, you would probably take these steps for example:
 ```
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,86 +0,0 @@
-os: Visual Studio 2015
-
-# ENABLE_CUSTOM_COMPILER_FLAGS - on by default
-# ENABLE_SANITIZERS - off by default
-# ENABLE_PUBLIC_SYMBOLS - on by default
-# BUILD_SHARED_LIBS - on by default
-# ENABLE_TARGET_EXPORT - on by default
-# ENABLE_CJSON_UTILS - off by default
-# ENABLE_CJSON_TEST -on by default
-# ENABLE_VALGRIND - off by default
-# ENABLE_FUZZING - off by default
-
-environment:
-  matrix:
-    - GENERATOR: "Visual Studio 14 2015"
-      BUILD_SHARED_LIBS: ON
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 14 2015"
-      BUILD_SHARED_LIBS: OFF
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 12 2013"
-      BUILD_SHARED_LIBS: ON
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 12 2013"
-      BUILD_SHARED_LIBS: OFF
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 11 2012"
-      BUILD_SHARED_LIBS: ON
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 11 2012"
-      BUILD_SHARED_LIBS: OFF
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 10 2010"
-      BUILD_SHARED_LIBS: ON
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 10 2010"
-      BUILD_SHARED_LIBS: OFF
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 9 2008"
-      BUILD_SHARED_LIBS: ON
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-    - GENERATOR: "Visual Studio 9 2008"
-      BUILD_SHARED_LIBS: OFF
-      ENABLE_CJSON_TEST: OFF
-      ENABLE_CJSON_UTILS: ON
-
-
-platform:
-  - x86
-  - x64
-matrix:
-  exclude:
-  - platform: x64
-    GENERATOR: "Visual Studio 9 2008"
-
-configuration:
-  - Release
-
-
-build_script:
-  - ps: if($env:PLATFORM -eq "x64") { $env:CMAKE_GEN_SUFFIX=" Win64" }
-  - cmake "-G%GENERATOR%%CMAKE_GEN_SUFFIX%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% -DENABLE_CJSON_TEST=%ENABLE_CJSON_TEST%  -H. -Bbuild
-  - cmake --build build --config "%CONFIGURATION%"
-
-
-on_failure:
-  - ps: if(Test-Path builds/CMakeFiles/CMakeOutput.log) { cat builds/CMakeFiles/CMakeOutput.log }
-  - ps: if(Test-Path builds/CMakeFiles/CMakeError.log) { cat builds/CMakeFiles/CMakeError.log }
--- a/cJSON.c
+++ b/cJSON.c
@@ -44,10 +44,7 @@
 #include <float.h>
 #include <limits.h>
 #include <ctype.h>
-
-#ifdef ENABLE_LOCALES
 #include <locale.h>
-#endif

 #if defined(_MSC_VER)
 #pragma warning (pop)
@@ -74,7 +71,7 @@ CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void)
 }

 /* This is a safeguard to prevent copy-pasters from using incompatible C and header files */
-#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 6) || (CJSON_VERSION_PATCH != 0)
+#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 5) || (CJSON_VERSION_PATCH != 6)
    #error cJSON.h and cJSON.c have different versions. Make sure that both have the same.
 #endif

@@ -230,12 +227,8 @@ CJSON_PUBLIC(void) cJSON_Delete(cJSON *item)
 /* get the decimal point character of the current locale */
 static unsigned char get_decimal_point(void)
 {
-#ifdef ENABLE_LOCALES
    struct lconv *lconv = localeconv();
    return (unsigned char) lconv->decimal_point[0];
-#else
-    return '.';
-#endif
 }

 typedef struct
@@ -417,14 +410,6 @@ static unsigned char* ensure(printbuffer * const p, size_t needed)
    {
        /* reallocate with realloc if available */
        newbuffer = (unsigned char*)p->hooks.reallocate(p->buffer, newsize);
-        if (newbuffer == NULL)
-        {
-            p->hooks.deallocate(p->buffer);
-            p->length = 0;
-            p->buffer = NULL;
-
-            return NULL;
-        }
    }
    else
    {
@@ -973,22 +958,6 @@ static parse_buffer *buffer_skip_whitespace(parse_buffer * const buffer)
    return buffer;
 }

-/* skip the UTF-8 BOM (byte order mark) if it is at the beginning of a buffer */
-static parse_buffer *skip_utf8_bom(parse_buffer * const buffer)
-{
-    if ((buffer == NULL) || (buffer->content == NULL) || (buffer->offset != 0))
-    {
-        return NULL;
-    }
-
-    if (can_access_at_index(buffer, 4) && (strncmp((const char*)buffer_at_offset(buffer), "\xEF\xBB\xBF", 3) == 0))
-    {
-        buffer->offset += 3;
-    }
-
-    return buffer;
-}
-
 /* Parse an object - create a new root, and populate. */
 CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated)
 {
@@ -1015,7 +984,7 @@ CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return
        goto fail;
    }

-    if (!parse_value(item, buffer_skip_whitespace(skip_utf8_bom(&buffer))))
+    if (!parse_value(item, buffer_skip_whitespace(&buffer)))
    {
        /* parse failure. ep is set. */
        goto fail;
@@ -1062,8 +1031,10 @@ fail:
        {
            *return_parse_end = (const char*)local_error.json + local_error.position;
        }
- 
-        global_error = local_error;
+        else
+        {
+            global_error = local_error;
+        }
    }

    return NULL;
@@ -1251,6 +1222,7 @@ static cJSON_bool parse_value(cJSON * const item, parse_buffer * const input_buf
        return parse_object(item, input_buffer);
    }

+
    return false;
 }

--- a/cJSON.h
+++ b/cJSON.h
@@ -30,8 +30,8 @@ extern "C"

 /* project version */
 #define CJSON_VERSION_MAJOR 1
-#define CJSON_VERSION_MINOR 6
-#define CJSON_VERSION_PATCH 0
+#define CJSON_VERSION_MINOR 5
+#define CJSON_VERSION_PATCH 6

 #include <stddef.h>

@@ -139,7 +139,7 @@ CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks);
 /* Supply a block of JSON, and this returns a cJSON object you can interrogate. */
 CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value);
 /* ParseWithOpts allows you to require (and check) that the JSON is null terminated, and to retrieve the pointer to the final byte parsed. */
-/* If you supply a ptr in return_parse_end and parsing fails, then return_parse_end will contain a pointer to the error so will match cJSON_GetErrorPtr(). */
+/* If you supply a ptr in return_parse_end and parsing fails, then return_parse_end will contain a pointer to the error. If not, then cJSON_GetErrorPtr() does the job. */
 CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated);

 /* Render a cJSON entity to text for transfer/storage. */
--- a/fuzzing/json.dict
+++ b/fuzzing/json.dict
@@ -25,8 +25,8 @@ escape_sequence_r="\\r"
 escape_sequence_t="\\t"
 escape_sequence_quote="\\\""
 escape_sequence_backslash="\\\\"
-escape_sequence_slash="\\/"
-escape_sequence_utf16_base="\\u"
+escapce_sequence_slash="\\/"
+escpae_sequence_utf16_base="\\u"
 escape_sequence_utf16="\\u12ab"

 number_integer="1"
--- a/meson.build
+++ b/meson.build
@@ -0,0 +1,58 @@
+project('cJSON', 'c', default_options: ['c_std=c89'])
+version = '1.6.0'
+soversion = '0'
+
+compiler = meson.get_compiler('c')
+
+compiler_flags = []
+
+if (compiler.get_id() == 'clang') or (compiler.get_id() == 'gcc')
+	compiler_flags += [
+		'-pedantic',
+		'-Wall',
+		'-Wextra',
+		'-Werror',
+		'-Wstrict-prototypes',
+		'-Wwrite-strings',
+		'-Wshadow',
+		'-Winit-self',
+		'-Wcast-align',
+		'-Wformat=2',
+		'-Wmissing-prototypes',
+		'-Wstrict-overflow=2',
+		'-Wcast-qual',
+		'-Wundef',
+		'-Wswitch-default',
+		'-Wconversion',
+		'-Wc++-compat',
+		'-fstack-protector-strong',
+		'-Wcomma',
+		'-Wdouble-promotion',
+		'-Wparentheses',
+		'-Wformat-overflow',
+		'-Wunused-macros',
+		'-Wmissing-variable-declarations',
+		'-Wused-but-marked-unused',
+		'-Wswitch-enum'
+	]
+endif
+
+foreach flag : compiler_flags
+	if compiler.has_argument(flag)
+		add_project_arguments(flag, language: 'c')
+	endif
+endforeach
+
+math = compiler.find_library('m', required: false)
+
+cjson = shared_library('cjson', 'cJSON.c', dependencies: math, version: version, soversion: soversion, install: true)
+if get_option('enable_cjson_utils')
+	cjson_utils = shared_library('cjson_utils', 'cJSON_Utils.c', link_with: cjson, version: version, soversion: soversion, install: true)
+endif
+
+if get_option('enable_cjson_tests')
+	cjson_test = executable('cjson_test', 'test.c', link_with: cjson)
+	test('cjson_test', cjson_test)
+endif
+
+subdir('tests')
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -0,0 +1,2 @@
+option('enable_cjson_utils', type: 'boolean', value: true)
+option('enable_cjson_tests', type: 'boolean', value: true)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -66,7 +66,7 @@ if(ENABLE_CJSON_TEST)
            message(WARNING "Valgrind couldn't be found.")
            unset(MEMORYCHECK_COMMAND)
        else()
-            set(MEMORYCHECK_COMMAND_OPTIONS --trace-children=yes --leak-check=full --error-exitcode=1 --suppressions=${CMAKE_CURRENT_SOURCE_DIR}/../valgrind.supp)
+            set(MEMORYCHECK_COMMAND_OPTIONS --trace-children=yes --leak-check=full --error-exitcode=1)
        endif()
    endif()

--- a/tests/meson.build
+++ b/tests/meson.build
@@ -0,0 +1,58 @@
+if get_option('enable_cjson_tests')
+	unity_flags = []
+
+	if (compiler.get_id() == 'clang') or (compiler.get_id() == 'gcc')
+		unity_flags += [
+			'-Wno-switch-enum',
+			'-Wno-error',
+			'-fvisibility=default',
+			'-fno-sanitize=float-divide-by-zero'
+		]
+	endif
+
+	unity_c_args = []
+	foreach flag : unity_flags
+		if compiler.has_argument(flag)
+			unity_c_args += flag
+		endif
+	endforeach
+
+	unity = library('unity', 'unity/src/unity.c', c_args: unity_c_args)
+	common = library('test_common', 'common.c')
+
+	cjson_tests = [
+		'parse_examples',
+		'parse_number',
+		'parse_hex4',
+		'parse_string',
+		'parse_array',
+		'parse_object',
+		'parse_value',
+		'print_string',
+		'print_number',
+		'print_array',
+		'print_object',
+		'print_value',
+		'misc_tests',
+		'parse_with_opts',
+		'compare_tests'
+	]
+
+	foreach cjson_test : cjson_tests
+		exe = executable(cjson_test, cjson_test + '.c', link_with: [common, cjson, unity])
+		test(cjson_test, exe, workdir: meson.current_source_dir())
+	endforeach
+
+	if get_option('enable_cjson_utils')
+		cjson_utils_tests = [
+			'json_patch_tests',
+			'old_utils_tests',
+			'misc_utils_tests'
+		]
+
+		foreach cjson_utils_test : cjson_utils_tests
+			exe = executable(cjson_utils_test, cjson_utils_test + '.c', link_with: [common, cjson_utils, unity, cjson])
+			test(cjson_utils_test, exe, workdir: meson.current_source_dir())
+		endforeach
+	endif
+endif
--- a/tests/misc_tests.c
+++ b/tests/misc_tests.c
@@ -410,46 +410,6 @@ static void cjson_functions_shouldnt_crash_with_null_pointers(void)
    cJSON_Delete(item);
 }

-static void *failing_realloc(void *pointer, size_t size)
-{
-    (void)size;
-    (void)pointer;
-    return NULL;
-}
-
-static void ensure_should_fail_on_failed_realloc(void)
-{
-    printbuffer buffer = {NULL, 10, 0, 0, false, false, {&malloc, &free, &failing_realloc}};
-    buffer.buffer = (unsigned char*)malloc(100);
-    TEST_ASSERT_NOT_NULL(buffer.buffer);
-
-    TEST_ASSERT_NULL_MESSAGE(ensure(&buffer, 200), "Ensure didn't fail with failing realloc.");
-}
-
-static void skip_utf8_bom_should_skip_bom(void)
-{
-    const unsigned char string[] = "\xEF\xBB\xBF{}";
-    parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0 } };
-    buffer.content = string;
-    buffer.length = sizeof(string);
-    buffer.hooks = global_hooks;
-
-    TEST_ASSERT_TRUE(skip_utf8_bom(&buffer) == &buffer);
-    TEST_ASSERT_EQUAL_UINT(3U, (unsigned int)buffer.offset);
-}
-
-static void skip_utf8_bom_should_not_skip_bom_if_not_at_beginning(void)
-{
-    const unsigned char string[] = " \xEF\xBB\xBF{}";
-    parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0 } };
-    buffer.content = string;
-    buffer.length = sizeof(string);
-    buffer.hooks = global_hooks;
-    buffer.offset = 1;
-
-    TEST_ASSERT_NULL(skip_utf8_bom(&buffer));
-}
-
 int main(void)
 {
    UNITY_BEGIN();
@@ -465,9 +425,6 @@ int main(void)
    RUN_TEST(cjson_replace_item_via_pointer_should_replace_items);
    RUN_TEST(cjson_replace_item_in_object_should_preserve_name);
    RUN_TEST(cjson_functions_shouldnt_crash_with_null_pointers);
-    RUN_TEST(ensure_should_fail_on_failed_realloc);
-    RUN_TEST(skip_utf8_bom_should_skip_bom);
-    RUN_TEST(skip_utf8_bom_should_not_skip_bom_if_not_at_beginning);

    return UNITY_END();
 }
--- a/tests/parse_examples.c
+++ b/tests/parse_examples.c
@@ -142,7 +142,7 @@ static void file_test6_should_not_be_parsed(void)
    tree = cJSON_Parse(test6);
    TEST_ASSERT_NULL_MESSAGE(tree, "Should fail to parse what is not JSON.");

-    TEST_ASSERT_EQUAL_PTR_MESSAGE(test6, cJSON_GetErrorPtr(), "Error pointer is incorrect.");
+    TEST_ASSERT_EQUAL_STRING_MESSAGE(test6, cJSON_GetErrorPtr(), "Error pointer is incorrect.");

    if (test6 != NULL)
    {
@@ -179,22 +179,6 @@ static void file_test11_should_be_parsed_and_printed(void)
    do_test("test11");
 }

-static void test12_should_not_be_parsed(void)
-{
-    const char *test12 = "{ \"name\": ";
-    cJSON *tree = NULL;
-
-    tree = cJSON_Parse(test12);
-    TEST_ASSERT_NULL_MESSAGE(tree, "Should fail to parse incomplete JSON.");
-
-    TEST_ASSERT_EQUAL_PTR_MESSAGE(test12 + strlen(test12), cJSON_GetErrorPtr(), "Error pointer is incorrect.");
-
-    if (tree != NULL)
-    {
-        cJSON_Delete(tree);
-    }
-}
-
 int main(void)
 {
    UNITY_BEGIN();
@@ -209,6 +193,5 @@ int main(void)
    RUN_TEST(file_test9_should_be_parsed_and_printed);
    RUN_TEST(file_test10_should_be_parsed_and_printed);
    RUN_TEST(file_test11_should_be_parsed_and_printed);
-    RUN_TEST(test12_should_not_be_parsed);
    return UNITY_END();
 }
--- a/tests/parse_with_opts.c
+++ b/tests/parse_with_opts.c
@@ -40,23 +40,11 @@ static void parse_with_opts_should_handle_empty_strings(void)
 {
    const char empty_string[] = "";
    const char *error_pointer = NULL;
-
    TEST_ASSERT_NULL(cJSON_ParseWithOpts(empty_string, NULL, false));
-    TEST_ASSERT_EQUAL_PTR(empty_string, cJSON_GetErrorPtr());
-
+    error_pointer = cJSON_GetErrorPtr();
+    TEST_ASSERT_EQUAL_INT(0, error_pointer - empty_string);
    TEST_ASSERT_NULL(cJSON_ParseWithOpts(empty_string, &error_pointer, false));
-    TEST_ASSERT_EQUAL_PTR(empty_string, error_pointer);
-    TEST_ASSERT_EQUAL_PTR(empty_string, cJSON_GetErrorPtr());
-}
-
-static void parse_with_opts_should_handle_incomplete_json(void)
-{
-    const char json[] = "{ \"name\": ";
-    const char *parse_end = NULL;
-
-    TEST_ASSERT_NULL(cJSON_ParseWithOpts(json, &parse_end, false));
-    TEST_ASSERT_EQUAL_PTR(json + strlen(json), parse_end);
-    TEST_ASSERT_EQUAL_PTR(json + strlen(json), cJSON_GetErrorPtr());
+    TEST_ASSERT_EQUAL_INT(0, error_pointer - empty_string);
 }

 static void parse_with_opts_should_require_null_if_requested(void)
@@ -77,36 +65,18 @@ static void parse_with_opts_should_return_parse_end(void)

    cJSON *item = cJSON_ParseWithOpts(json, &parse_end, false);
    TEST_ASSERT_NOT_NULL(item);
-    TEST_ASSERT_EQUAL_PTR(json + 2, parse_end);
+    TEST_ASSERT_EQUAL_INT(2, parse_end - json);
    cJSON_Delete(item);
 }

-static void parse_with_opts_should_parse_utf8_bom(void)
-{
-    cJSON *with_bom = NULL;
-    cJSON *without_bom = NULL;
-
-    with_bom = cJSON_ParseWithOpts("\xEF\xBB\xBF{}", NULL, true);
-    TEST_ASSERT_NOT_NULL(with_bom);
-    without_bom = cJSON_ParseWithOpts("{}", NULL, true);
-    TEST_ASSERT_NOT_NULL(with_bom);
-
-    TEST_ASSERT_TRUE(cJSON_Compare(with_bom, without_bom, true));
-
-    cJSON_Delete(with_bom);
-    cJSON_Delete(without_bom);
-}
-
 int main(void)
 {
    UNITY_BEGIN();

    RUN_TEST(parse_with_opts_should_handle_null);
    RUN_TEST(parse_with_opts_should_handle_empty_strings);
-    RUN_TEST(parse_with_opts_should_handle_incomplete_json);
    RUN_TEST(parse_with_opts_should_require_null_if_requested);
    RUN_TEST(parse_with_opts_should_return_parse_end);
-    RUN_TEST(parse_with_opts_should_parse_utf8_bom);

    return UNITY_END();
 }
--- a/tests/unity/README.md
+++ b/tests/unity/README.md
@@ -118,17 +118,6 @@ Another way of calling TEST_ASSERT_EQUAL_INT
 Asserts that the actual value is within plus or minus delta of the expected value.  This also comes in
 size specific variants.

-
-    TEST_ASSERT_GREATER_THAN(threshold, actual)
-
-Asserts that the actual value is greater than the threshold. This also comes in size specific variants.
-
-
-    TEST_ASSERT_LESS_THAN(threshold, actual)
-
-Asserts that the actual value is less than the threshold. This also comes in size specific variants.
-
-
 Arrays
 ------

--- a/tests/unity/auto/generate_module.rb
+++ b/tests/unity/auto/generate_module.rb
@@ -172,7 +172,7 @@ class UnityModuleGenerator
      when 'camel' then part1
      when 'snake' then part1.downcase
      when 'caps'  then part1.upcase
-      else              part1
+      else              part1.downcase
      end
    else
      case (@options[:naming])
@@ -180,7 +180,7 @@ class UnityModuleGenerator
      when 'camel' then part1 + part2
      when 'snake' then part1.downcase + '_' + part2.downcase
      when 'caps'  then part1.upcase + '_' + part2.upcase
-      else              part1 + '_' + part2
+      else              part1.downcase + '_' + part2.downcase
      end
    end
  end
@@ -290,7 +290,7 @@ if $0 == __FILE__
          '  -n"camel"   sets the file naming convention.',
          '              bumpy - BumpyCaseFilenames.',
          '              camel - camelCaseFilenames.',
-          '              snake - snake_case_filenames.',
+          '              snake - snake_case_filenames. (DEFAULT)',
          '              caps  - CAPS_CASE_FILENAMES.',
          '  -u          update subversion too (requires subversion command line)',
          '  -y"my.yml"  selects a different yaml config file for module generation',
--- a/tests/unity/auto/generate_test_runner.rb
+++ b/tests/unity/auto/generate_test_runner.rb
@@ -119,7 +119,7 @@ class UnityTestRunnerGenerator
    source_index = 0
    tests_and_line_numbers.size.times do |i|
      source_lines[source_index..-1].each_with_index do |line, index|
-        next unless line =~ /\s+#{tests_and_line_numbers[i][:test]}(?:\s|\()/
+        next unless line =~ /#{tests_and_line_numbers[i][:test]}/
        source_index += index
        tests_and_line_numbers[i][:line_number] = source_index + 1
        break
--- a/tests/unity/auto/stylize_as_junit.rb
+++ b/tests/unity/auto/stylize_as_junit.rb
--- a/tests/unity/docs/UnityAssertionsReference.md
+++ b/tests/unity/docs/UnityAssertionsReference.md
@@ -290,60 +290,6 @@ Asserts the specified bit of the `actual` parameter is high.

 Asserts the specified bit of the `actual` parameter is low.

-### Integer Less Than / Greater Than
-
-These assertions verify that the `actual` parameter is less than or greater
-than `threshold` (exclusive). For example, if the threshold value is 0 for the
-greater than assertion will fail if it is 0 or less.
-
-##### `TEST_ASSERT_GREATER_THAN (threshold, actual)`
-
-##### `TEST_ASSERT_GREATER_THAN_INT (threshold, actual)`
-
-##### `TEST_ASSERT_GREATER_THAN_INT8 (threshold, actual)`
-
-##### `TEST_ASSERT_GREATER_THAN_INT16 (threshold, actual)`
-
-##### `TEST_ASSERT_GREATER_THAN_INT32 (threshold, actual)`
-
-##### `TEST_ASSERT_GREATER_THAN_UINT (threshold, actual)`
-
-##### `TEST_ASSERT_GREATER_THAN_UINT8 (threshold, actual)`
-
-##### `TEST_ASSERT_GREATER_THAN_UINT16 (threshold, actual)`
-
-##### `TEST_ASSERT_GREATER_THAN_UINT32 (threshold, actual)`
-
-##### `TEST_ASSERT_GREATER_THAN_HEX8 (threshold, actual)`
-
-##### `TEST_ASSERT_GREATER_THAN_HEX16 (threshold, actual)`
-
-##### `TEST_ASSERT_GREATER_THAN_HEX32 (threshold, actual)`
-
-##### `TEST_ASSERT_LESS_THAN (threshold, actual)`
-
-##### `TEST_ASSERT_LESS_THAN_INT (threshold, actual)`
-
-##### `TEST_ASSERT_LESS_THAN_INT8 (threshold, actual)`
-
-##### `TEST_ASSERT_LESS_THAN_INT16 (threshold, actual)`
-
-##### `TEST_ASSERT_LESS_THAN_INT32 (threshold, actual)`
-
-##### `TEST_ASSERT_LESS_THAN_UINT (threshold, actual)`
-
-##### `TEST_ASSERT_LESS_THAN_UINT8 (threshold, actual)`
-
-##### `TEST_ASSERT_LESS_THAN_UINT16 (threshold, actual)`
-
-##### `TEST_ASSERT_LESS_THAN_UINT32 (threshold, actual)`
-
-##### `TEST_ASSERT_LESS_THAN_HEX8 (threshold, actual)`
-
-##### `TEST_ASSERT_LESS_THAN_HEX16 (threshold, actual)`
-
-##### `TEST_ASSERT_LESS_THAN_HEX32 (threshold, actual)`
-

 ### Integer Ranges (of all sizes)

--- a/tests/unity/examples/unity_config.h
+++ b/tests/unity/examples/unity_config.h
@@ -201,12 +201,10 @@
 * `stdout` option. You decide to route your test result output to a custom
 * serial `RS232_putc()` function you wrote like thus:
 */
-/* #define UNITY_OUTPUT_CHAR(a)                    RS232_putc(a) */
-/* #define UNITY_OUTPUT_CHAR_HEADER_DECLARATION    RS232_putc(int) */
-/* #define UNITY_OUTPUT_FLUSH()                    RS232_flush() */
-/* #define UNITY_OUTPUT_FLUSH_HEADER_DECLARATION   RS232_flush(void) */
-/* #define UNITY_OUTPUT_START()                    RS232_config(115200,1,8,0) */
-/* #define UNITY_OUTPUT_COMPLETE()                 RS232_close() */
+/* #define UNITY_OUTPUT_CHAR(a)    RS232_putc(a) */
+/* #define UNITY_OUTPUT_FLUSH()    RS232_flush() */
+/* #define UNITY_OUTPUT_START()    RS232_config(115200,1,8,0) */
+/* #define UNITY_OUTPUT_COMPLETE() RS232_close() */

 /* For some targets, Unity can make the otherwise required `setUp()` and
 * `tearDown()` functions optional. This is a nice convenience for test writers
--- a/tests/unity/extras/fixture/rakefile_helper.rb
+++ b/tests/unity/extras/fixture/rakefile_helper.rb
@@ -53,7 +53,7 @@ module RakefileHelpers
    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\)'])
+                squash($cfg['compiler']['defines']['prefix'], $cfg['compiler']['defines']['items'] + ['UNITY_OUTPUT_CHAR=UnityOutputCharSpy_OutputChar'])
              end
    options  = squash('', $cfg['compiler']['options'])
    includes = squash($cfg['compiler']['includes']['prefix'], $cfg['compiler']['includes']['items'])
--- a/tests/unity/extras/fixture/test/Makefile
+++ b/tests/unity/extras/fixture/test/Makefile
@@ -6,7 +6,6 @@ endif
 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   \
--- a/tests/unity/release/build.info
+++ b/tests/unity/release/build.info
@@ -1,2 +1,2 @@
-121
+120

--- a/tests/unity/release/version.info
+++ b/tests/unity/release/version.info
@@ -1,2 +1,2 @@
-2.4.2
+2.4.1

--- a/tests/unity/src/unity.c
+++ b/tests/unity/src/unity.c
@@ -27,8 +27,6 @@ static const char UnityStrNull[]                   = "NULL";
 static const char UnityStrSpacer[]                 = ". ";
 static const char UnityStrExpected[]               = " Expected ";
 static const char UnityStrWas[]                    = " Was ";
-static const char UnityStrGt[]                     = " to be greater than ";
-static const char UnityStrLt[]                     = " to be less than ";
 static const char UnityStrElement[]                = " Element ";
 static const char UnityStrByte[]                   = " Byte ";
 static const char UnityStrMemory[]                 = " Memory Mismatch.";
@@ -237,97 +235,95 @@ void UnityPrintMask(const UNITY_UINT mask, const UNITY_UINT number)

 /*-----------------------------------------------*/
 #ifndef UNITY_EXCLUDE_FLOAT_PRINT
-/* This function prints a floating-point value in a format similar to
- * printf("%.6g").  It can work with either single- or double-precision,
- * but for simplicity, it prints only 6 significant digits in either case.
- * Printing more than 6 digits accurately is hard (at least in the single-
- * precision case) and isn't attempted here. */
+static void UnityPrintDecimalAndNumberWithLeadingZeros(UNITY_INT32 fraction_part, UNITY_INT32 divisor)
+{
+    UNITY_OUTPUT_CHAR('.');
+    while (divisor > 0)
+    {
+        UNITY_OUTPUT_CHAR('0' + fraction_part / divisor);
+        fraction_part %= divisor;
+        divisor /= 10;
+        if (fraction_part == 0) break; /* Truncate trailing 0's */
+    }
+}
+#ifndef UNITY_ROUND_TIES_AWAY_FROM_ZERO
+/* If rounds up && remainder 0.5 && result odd && below cutoff for double precision issues */
+  #define ROUND_TIES_TO_EVEN(orig, num_int, num)                                          \
+  if (num_int > (num) && (num) - (num_int-1) <= 0.5 && (num_int & 1) == 1 && orig < 1e22) \
+    num_int -= 1 /* => a tie to round down to even */
+#else
+  #define ROUND_TIES_TO_EVEN(orig, num_int, num) /* Remove macro */
+#endif
+
+/* Printing floating point numbers is hard. Some goals of this implementation: works for embedded
+ * systems, floats or doubles, and has a reasonable format. The key paper in this area,
+ * 'How to Print Floating-Point Numbers Accurately' by Steele & White, shows an approximation by
+ * scaling called Dragon 2. This code uses a similar idea. The other core algorithm uses casts and
+ * floating subtraction to give exact remainders after the decimal, to be scaled into an integer.
+ * Extra trailing 0's are excluded. The output defaults to rounding to nearest, ties to even. You
+ * can enable rounding ties away from zero. Note: UNITY_DOUBLE param can typedef to float or double
+
+ * The old version required compiling in snprintf. For reference, with a similar format as now:
+ *  char buf[19];
+ *  if (number > 4294967296.0 || -number > 4294967296.0) snprintf(buf, sizeof buf, "%.8e", number);
+ *  else                                                 snprintf(buf, sizeof buf, "%.6f", number);
+ *  UnityPrint(buf);
+ */
 void UnityPrintFloat(const UNITY_DOUBLE input_number)
 {
-    UNITY_DOUBLE number = input_number;
+    UNITY_DOUBLE number;

-    /* print minus sign (including for negative zero) */
-    if (number < 0.0f || (number == 0.0f && 1.0f / number < 0.0f))
+    if (input_number < 0)
    {
        UNITY_OUTPUT_CHAR('-');
-        number = -number;
+        number = -input_number;
+    } else
+    {
+        number = input_number;
    }

-    /* handle zero, NaN, and +/- infinity */
-    if (number == 0.0f) UnityPrint("0");
-    else if (isnan(number)) UnityPrint("nan");
-    else if (isinf(number)) UnityPrint("inf");
-    else
+    if (isnan(number)) UnityPrint(UnityStrNaN);
+    else if (isinf(number)) UnityPrintLen(UnityStrInf, 3);
+    else if (number <= 0.0000005 && number > 0) UnityPrint("0.000000..."); /* Small number */
+    else if (number < 4294967295.9999995) /* Rounded result fits in 32 bits, "%.6f" format */
    {
-        int exponent = 0;
-        int decimals, digits;
-        UNITY_INT32 n;
-        char buf[16];
+        const UNITY_INT32 divisor = 1000000/10;
+        UNITY_UINT32 integer_part = (UNITY_UINT32)number;
+        UNITY_INT32 fraction_part = (UNITY_INT32)((number - (UNITY_DOUBLE)integer_part)*1000000.0 + 0.5);
+        /* Double precision calculation gives best performance for six rounded decimal places */
+        ROUND_TIES_TO_EVEN(number, fraction_part, (number - (UNITY_DOUBLE)integer_part)*1000000.0);

-        /* scale up or down by powers of 10 */
-        while (number < 100000.0f / 1e6f)  { number *= 1e6f; exponent -= 6; }
-        while (number < 100000.0f)         { number *= 10.0f; exponent--; }
-        while (number > 1000000.0f * 1e6f) { number /= 1e6f; exponent += 6; }
-        while (number > 1000000.0f)        { number /= 10.0f; exponent++; }
-
-        /* round to nearest integer */
-        n = ((UNITY_INT32)(number + number) + 1) / 2;
-        if (n > 999999)
+        if (fraction_part == 1000000) /* Carry across the decimal point */
        {
-            n = 100000;
+            fraction_part = 0;
+            integer_part += 1;
+        }
+
+        UnityPrintNumberUnsigned(integer_part);
+        UnityPrintDecimalAndNumberWithLeadingZeros(fraction_part, divisor);
+    }
+    else /* Number is larger, use exponential format of 9 digits, "%.8e" */
+    {
+        const UNITY_INT32 divisor = 1000000000/10;
+        UNITY_INT32 integer_part;
+        UNITY_DOUBLE_TYPE divide = 10.0;
+        int exponent = 9;
+
+        while (number / divide >= 1000000000.0 - 0.5)
+        {
+            divide *= 10;
            exponent++;
        }
+        integer_part = (UNITY_INT32)(number / divide + 0.5);
+        /* Double precision calculation required for float, to produce 9 rounded digits */
+        ROUND_TIES_TO_EVEN(number, integer_part, number / divide);

-        /* determine where to place decimal point */
-        decimals = (exponent <= 0 && exponent >= -9) ? -exponent : 5;
-        exponent += decimals;
-
-        /* truncate trailing zeroes after decimal point */
-        while (decimals > 0 && n % 10 == 0)
-        {
-            n /= 10;
-            decimals--;
-        }
-
-        /* build up buffer in reverse order */
-        digits = 0;
-        while (n != 0 || digits < decimals + 1)
-        {
-            buf[digits++] = (char)('0' + n % 10);
-            n /= 10;
-        }
-        while (digits > 0)
-        {
-            if(digits == decimals) UNITY_OUTPUT_CHAR('.');
-            UNITY_OUTPUT_CHAR(buf[--digits]);
-        }
-
-        /* print exponent if needed */
-        if (exponent != 0)
-        {
-            UNITY_OUTPUT_CHAR('e');
-
-            if(exponent < 0)
-            {
-                UNITY_OUTPUT_CHAR('-');
-                exponent = -exponent;
-            }
-            else
-            {
-                UNITY_OUTPUT_CHAR('+');
-            }
-
-            digits = 0;
-            while (exponent != 0 || digits < 2)
-            {
-                buf[digits++] = (char)('0' + exponent % 10);
-                exponent /= 10;
-            }
-            while (digits > 0)
-            {
-                UNITY_OUTPUT_CHAR(buf[--digits]);
-            }
-        }
+        UNITY_OUTPUT_CHAR('0' + integer_part / divisor);
+        UnityPrintDecimalAndNumberWithLeadingZeros(integer_part % divisor, divisor / 10);
+        UNITY_OUTPUT_CHAR('e');
+        UNITY_OUTPUT_CHAR('+');
+        if (exponent < 10) UNITY_OUTPUT_CHAR('0');
+        UnityPrintNumber(exponent);
    }
 }
 #endif /* ! UNITY_EXCLUDE_FLOAT_PRINT */
@@ -530,50 +526,6 @@ void UnityAssertEqualNumber(const UNITY_INT expected,
    }
 }

-/*-----------------------------------------------*/
-void UnityAssertGreaterNumber(const UNITY_INT threshold,
-                              const UNITY_INT actual,
-                              const char *msg,
-                              const UNITY_LINE_TYPE lineNumber,
-                              const UNITY_DISPLAY_STYLE_T style)
-{
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if (!(actual > threshold))
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrint(UnityStrExpected);
-        UnityPrintNumberByStyle(actual, style);
-        UnityPrint(UnityStrGt);
-        UnityPrintNumberByStyle(threshold, style);
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityAssertSmallerNumber(const UNITY_INT threshold,
-                              const UNITY_INT actual,
-                              const char *msg,
-                              const UNITY_LINE_TYPE lineNumber,
-                              const UNITY_DISPLAY_STYLE_T style)
-{
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if (!(actual < threshold))
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrint(UnityStrExpected);
-        UnityPrintNumberByStyle(actual, style);
-        UnityPrint(UnityStrLt);
-        UnityPrintNumberByStyle(threshold, style);
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-
-
 #define UnityPrintPointlessAndBail()       \
 {                                          \
    UnityTestResultsFailBegin(lineNumber); \
@@ -1073,7 +1025,7 @@ void UnityAssertEqualStringArray(UNITY_INTERNAL_PTR expected,
 {
    UNITY_UINT32 i = 0;
    UNITY_UINT32 j = 0;
-    const char* expd = NULL;
+    const char* exp = NULL;
    const char* act = NULL;

    RETURN_IF_FAIL_OR_IGNORE;
@@ -1096,7 +1048,7 @@ void UnityAssertEqualStringArray(UNITY_INTERNAL_PTR expected,

    if (flags != UNITY_ARRAY_TO_ARRAY)
    {
-        expd = (const char*)expected;
+        exp = (const char*)expected;
    }

    do
@@ -1104,15 +1056,15 @@ void UnityAssertEqualStringArray(UNITY_INTERNAL_PTR expected,
        act = actual[j];
        if (flags == UNITY_ARRAY_TO_ARRAY)
        {
-            expd = ((const char* const*)expected)[j];
+            exp = ((const char* const*)expected)[j];
        }

        /* if both pointers not null compare the strings */
-        if (expd && act)
+        if (exp && act)
        {
-            for (i = 0; expd[i] || act[i]; i++)
+            for (i = 0; exp[i] || act[i]; i++)
            {
-                if (expd[i] != act[i])
+                if (exp[i] != act[i])
                {
                    Unity.CurrentTestFailed = 1;
                    break;
@@ -1121,7 +1073,7 @@ void UnityAssertEqualStringArray(UNITY_INTERNAL_PTR expected,
        }
        else
        { /* handle case of one pointers being null (if both null, test should pass) */
-            if (expd != act)
+            if (exp != act)
            {
                Unity.CurrentTestFailed = 1;
            }
@@ -1135,7 +1087,7 @@ void UnityAssertEqualStringArray(UNITY_INTERNAL_PTR expected,
                UnityPrint(UnityStrElement);
                UnityPrintNumberUnsigned(j);
            }
-            UnityPrintExpectedAndActualStrings(expd, act);
+            UnityPrintExpectedAndActualStrings(exp, act);
            UnityAddMsgIfSpecified(msg);
            UNITY_FAIL_AND_BAIL;
        }
--- a/tests/unity/src/unity.h
+++ b/tests/unity/src/unity.h
@@ -114,35 +114,6 @@ void tearDown(void);
 #define TEST_ASSERT_BIT_HIGH(bit, actual)                                                          UNITY_TEST_ASSERT_BITS(((UNITY_UINT32)1 << (bit)), (UNITY_UINT32)(-1), (actual), __LINE__, NULL)
 #define TEST_ASSERT_BIT_LOW(bit, actual)                                                           UNITY_TEST_ASSERT_BITS(((UNITY_UINT32)1 << (bit)), (UNITY_UINT32)(0), (actual), __LINE__, NULL)

-/* Integer Greater Than/ Less Than (of all sizes) */
-#define TEST_ASSERT_GREATER_THAN(threshold, actual)                                                UNITY_TEST_ASSERT_GREATER_THAN_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_INT(threshold, actual)                                            UNITY_TEST_ASSERT_GREATER_THAN_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_INT8(threshold, actual)                                           UNITY_TEST_ASSERT_GREATER_THAN_INT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_INT16(threshold, actual)                                          UNITY_TEST_ASSERT_GREATER_THAN_INT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_INT32(threshold, actual)                                          UNITY_TEST_ASSERT_GREATER_THAN_INT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_UINT(threshold, actual)                                           UNITY_TEST_ASSERT_GREATER_THAN_UINT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_UINT8(threshold, actual)                                          UNITY_TEST_ASSERT_GREATER_THAN_UINT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_UINT16(threshold, actual)                                         UNITY_TEST_ASSERT_GREATER_THAN_UINT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_UINT32(threshold, actual)                                         UNITY_TEST_ASSERT_GREATER_THAN_UINT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_HEX8(threshold, actual)                                           UNITY_TEST_ASSERT_GREATER_THAN_HEX8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_HEX16(threshold, actual)                                          UNITY_TEST_ASSERT_GREATER_THAN_HEX16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_HEX32(threshold, actual)                                          UNITY_TEST_ASSERT_GREATER_THAN_HEX32((threshold), (actual), __LINE__, NULL)
-
-
-#define TEST_ASSERT_LESS_THAN(threshold, actual)                                                   UNITY_TEST_ASSERT_SMALLER_THAN_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_INT(threshold, actual)                                               UNITY_TEST_ASSERT_SMALLER_THAN_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_INT8(threshold, actual)                                              UNITY_TEST_ASSERT_SMALLER_THAN_INT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_INT16(threshold, actual)                                             UNITY_TEST_ASSERT_SMALLER_THAN_INT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_INT32(threshold, actual)                                             UNITY_TEST_ASSERT_SMALLER_THAN_INT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_UINT(threshold, actual)                                              UNITY_TEST_ASSERT_SMALLER_THAN_UINT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_UINT8(threshold, actual)                                             UNITY_TEST_ASSERT_SMALLER_THAN_UINT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_UINT16(threshold, actual)                                            UNITY_TEST_ASSERT_SMALLER_THAN_UINT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_UINT32(threshold, actual)                                            UNITY_TEST_ASSERT_SMALLER_THAN_UINT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_HEX8(threshold, actual)                                              UNITY_TEST_ASSERT_SMALLER_THAN_HEX8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_HEX16(threshold, actual)                                             UNITY_TEST_ASSERT_SMALLER_THAN_HEX16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_HEX32(threshold, actual)                                             UNITY_TEST_ASSERT_SMALLER_THAN_HEX32((threshold), (actual), __LINE__, NULL)
-
-
 /* Integer Ranges (of all sizes) */
 #define TEST_ASSERT_INT_WITHIN(delta, expected, actual)                                            UNITY_TEST_ASSERT_INT_WITHIN((delta), (expected), (actual), __LINE__, NULL)
 #define TEST_ASSERT_INT8_WITHIN(delta, expected, actual)                                           UNITY_TEST_ASSERT_INT8_WITHIN((delta), (expected), (actual), __LINE__, NULL)
@@ -186,8 +157,6 @@ void tearDown(void);
 #define TEST_ASSERT_EQUAL_STRING_ARRAY(expected, actual, num_elements)                             UNITY_TEST_ASSERT_EQUAL_STRING_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
 #define TEST_ASSERT_EQUAL_MEMORY_ARRAY(expected, actual, len, num_elements)                        UNITY_TEST_ASSERT_EQUAL_MEMORY_ARRAY((expected), (actual), (len), (num_elements), __LINE__, NULL)

-
-
 /* Arrays Compared To Single Value */
 #define TEST_ASSERT_EACH_EQUAL_INT(expected, actual, num_elements)                                 UNITY_TEST_ASSERT_EACH_EQUAL_INT((expected), (actual), (num_elements), __LINE__, NULL)
 #define TEST_ASSERT_EACH_EQUAL_INT8(expected, actual, num_elements)                                UNITY_TEST_ASSERT_EACH_EQUAL_INT8((expected), (actual), (num_elements), __LINE__, NULL)
@@ -272,35 +241,6 @@ void tearDown(void);
 #define TEST_ASSERT_BIT_HIGH_MESSAGE(bit, actual, message)                                         UNITY_TEST_ASSERT_BITS(((UNITY_UINT32)1 << (bit)), (UNITY_UINT32)(-1), (actual), __LINE__, (message))
 #define TEST_ASSERT_BIT_LOW_MESSAGE(bit, actual, message)                                          UNITY_TEST_ASSERT_BITS(((UNITY_UINT32)1 << (bit)), (UNITY_UINT32)(0), (actual), __LINE__, (message))

-/* Integer Greater Than/ Less Than (of all sizes) */
-#define TEST_ASSERT_GREATER_THAN_MESSAGE(threshold, actual, message)                               UNITY_TEST_ASSERT_GREATER_THAN_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_INT_MESSAGE(threshold, actual, message)                           UNITY_TEST_ASSERT_GREATER_THAN_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_INT8_MESSAGE(threshold, actual, message)                          UNITY_TEST_ASSERT_GREATER_THAN_INT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_INT16_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_GREATER_THAN_INT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_INT32_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_GREATER_THAN_INT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_UINT_MESSAGE(threshold, actual, message)                          UNITY_TEST_ASSERT_GREATER_THAN_UINT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_UINT8_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_GREATER_THAN_UINT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_UINT16_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_GREATER_THAN_UINT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_UINT32_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_GREATER_THAN_UINT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_HEX8_MESSAGE(threshold, actual, message)                          UNITY_TEST_ASSERT_GREATER_THAN_HEX8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_HEX16_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_GREATER_THAN_HEX16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_HEX32_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_GREATER_THAN_HEX32((threshold), (actual), __LINE__, (message))
-
-
-#define TEST_ASSERT_LESS_THAN_MESSAGE(threshold, actual, message)                                  UNITY_TEST_ASSERT_SMALLER_THAN_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_INT_MESSAGE(threshold, actual, message)                              UNITY_TEST_ASSERT_SMALLER_THAN_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_INT8_MESSAGE(threshold, actual, message)                             UNITY_TEST_ASSERT_SMALLER_THAN_INT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_INT16_MESSAGE(threshold, actual, message)                            UNITY_TEST_ASSERT_SMALLER_THAN_INT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_INT32_MESSAGE(threshold, actual, message)                            UNITY_TEST_ASSERT_SMALLER_THAN_INT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_UINT_MESSAGE(threshold, actual, message)                             UNITY_TEST_ASSERT_SMALLER_THAN_UINT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_UINT8_MESSAGE(threshold, actual, message)                            UNITY_TEST_ASSERT_SMALLER_THAN_UINT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_UINT16_MESSAGE(threshold, actual, message)                           UNITY_TEST_ASSERT_SMALLER_THAN_UINT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_UINT32_MESSAGE(threshold, actual, message)                           UNITY_TEST_ASSERT_SMALLER_THAN_UINT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_HEX8_MESSAGE(threshold, actual, message)                             UNITY_TEST_ASSERT_SMALLER_THAN_HEX8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_HEX16_MESSAGE(threshold, actual, message)                            UNITY_TEST_ASSERT_SMALLER_THAN_HEX16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_HEX32_MESSAGE(threshold, actual, message)                            UNITY_TEST_ASSERT_SMALLER_THAN_HEX32((threshold), (actual), __LINE__, (message))
-
-
 /* Integer Ranges (of all sizes) */
 #define TEST_ASSERT_INT_WITHIN_MESSAGE(delta, expected, actual, message)                           UNITY_TEST_ASSERT_INT_WITHIN((delta), (expected), (actual), __LINE__, (message))
 #define TEST_ASSERT_INT8_WITHIN_MESSAGE(delta, expected, actual, message)                          UNITY_TEST_ASSERT_INT8_WITHIN((delta), (expected), (actual), __LINE__, (message))
--- a/tests/unity/src/unity_internals.h
+++ b/tests/unity/src/unity_internals.h
@@ -244,8 +244,8 @@ typedef UNITY_FLOAT_TYPE UNITY_FLOAT;
 #define UNITY_OUTPUT_CHAR(a) (void)putchar(a)
 #else
  /* If defined as something else, make sure we declare it here so it's ready for use */
-  #ifdef UNITY_OUTPUT_CHAR_HEADER_DECLARATION
-extern void UNITY_OUTPUT_CHAR_HEADER_DECLARATION;
+  #ifndef UNITY_OMIT_OUTPUT_CHAR_HEADER_DECLARATION
+extern void UNITY_OUTPUT_CHAR(int);
  #endif
 #endif

@@ -253,22 +253,22 @@ extern void UNITY_OUTPUT_CHAR_HEADER_DECLARATION;
 #ifdef UNITY_USE_FLUSH_STDOUT
 /* We want to use the stdout flush utility */
 #include <stdio.h>
-#define UNITY_OUTPUT_FLUSH() (void)fflush(stdout)
+#define UNITY_OUTPUT_FLUSH (void)fflush(stdout)
 #else
 /* We've specified nothing, therefore flush should just be ignored */
-#define UNITY_OUTPUT_FLUSH()
+#define UNITY_OUTPUT_FLUSH
 #endif
 #else
 /* We've defined flush as something else, so make sure we declare it here so it's ready for use */
-#ifdef UNITY_OUTPUT_FLUSH_HEADER_DECLARATION
-extern void UNITY_OMIT_OUTPUT_FLUSH_HEADER_DECLARATION;
+#ifndef UNITY_OMIT_OUTPUT_FLUSH_HEADER_DECLARATION
+extern void UNITY_OUTPUT_FLUSH(void);
 #endif
 #endif

 #ifndef UNITY_OUTPUT_FLUSH
 #define UNITY_FLUSH_CALL()
 #else
-#define UNITY_FLUSH_CALL() UNITY_OUTPUT_FLUSH()
+#define UNITY_FLUSH_CALL() UNITY_OUTPUT_FLUSH
 #endif

 #ifndef UNITY_PRINT_EOL
@@ -453,18 +453,6 @@ void UnityAssertEqualNumber(const UNITY_INT expected,
                            const UNITY_LINE_TYPE lineNumber,
                            const UNITY_DISPLAY_STYLE_T style);

-void UnityAssertGreaterNumber(const UNITY_INT threshold,
-                            const UNITY_INT actual,
-                            const char* msg,
-                            const UNITY_LINE_TYPE lineNumber,
-                            const UNITY_DISPLAY_STYLE_T style);
-
-void UnityAssertSmallerNumber(const UNITY_INT threshold,
-                            const UNITY_INT actual,
-                            const char* msg,
-                            const UNITY_LINE_TYPE lineNumber,
-                            const UNITY_DISPLAY_STYLE_T style);
-
 void UnityAssertEqualIntArray(UNITY_INTERNAL_PTR expected,
                              UNITY_INTERNAL_PTR actual,
                              const UNITY_UINT32 num_elements,
@@ -662,34 +650,6 @@ int UnityTestMatches(void);
 #define UNITY_TEST_ASSERT_EQUAL_HEX32(expected, actual, line, message)                           UnityAssertEqualNumber((UNITY_INT)(UNITY_INT32)(expected), (UNITY_INT)(UNITY_INT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32)
 #define UNITY_TEST_ASSERT_BITS(mask, expected, actual, line, message)                            UnityAssertBits((UNITY_INT)(mask), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line))

-
-#define UNITY_TEST_ASSERT_GREATER_THAN_INT(threshold, actual, line, message)               UnityAssertGreaterNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT)
-#define UNITY_TEST_ASSERT_GREATER_THAN_INT8(threshold, actual, line, message)               UnityAssertGreaterNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8)
-#define UNITY_TEST_ASSERT_GREATER_THAN_INT16(threshold, actual, line, message)               UnityAssertGreaterNumber((UNITY_INT)(UNITY_INT16)(threshold), (UNITY_INT)(UNITY_INT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16)
-#define UNITY_TEST_ASSERT_GREATER_THAN_INT32(threshold, actual, line, message)               UnityAssertGreaterNumber((UNITY_INT)(UNITY_INT32)(threshold), (UNITY_INT)(UNITY_INT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32)
-#define UNITY_TEST_ASSERT_GREATER_THAN_UINT(threshold, actual, line, message)               UnityAssertGreaterNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT)
-#define UNITY_TEST_ASSERT_GREATER_THAN_UINT8(threshold, actual, line, message)               UnityAssertGreaterNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8)
-#define UNITY_TEST_ASSERT_GREATER_THAN_UINT16(threshold, actual, line, message)               UnityAssertGreaterNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16)
-#define UNITY_TEST_ASSERT_GREATER_THAN_UINT32(threshold, actual, line, message)               UnityAssertGreaterNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32)
-#define UNITY_TEST_ASSERT_GREATER_THAN_HEX8(threshold, actual, line, message)               UnityAssertGreaterNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8)
-#define UNITY_TEST_ASSERT_GREATER_THAN_HEX16(threshold, actual, line, message)               UnityAssertGreaterNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16)
-#define UNITY_TEST_ASSERT_GREATER_THAN_HEX32(threshold, actual, line, message)               UnityAssertGreaterNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32)
-
-
-#define UNITY_TEST_ASSERT_SMALLER_THAN_INT(threshold, actual, line, message)               UnityAssertSmallerNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_INT8(threshold, actual, line, message)               UnityAssertSmallerNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_INT16(threshold, actual, line, message)               UnityAssertSmallerNumber((UNITY_INT)(UNITY_INT16)(threshold), (UNITY_INT)(UNITY_INT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_INT32(threshold, actual, line, message)               UnityAssertSmallerNumber((UNITY_INT)(UNITY_INT32)(threshold), (UNITY_INT)(UNITY_INT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT(threshold, actual, line, message)               UnityAssertSmallerNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT8(threshold, actual, line, message)               UnityAssertSmallerNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT16(threshold, actual, line, message)               UnityAssertSmallerNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT32(threshold, actual, line, message)               UnityAssertSmallerNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_HEX8(threshold, actual, line, message)               UnityAssertSmallerNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_HEX16(threshold, actual, line, message)               UnityAssertSmallerNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_HEX32(threshold, actual, line, message)               UnityAssertSmallerNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32)
-
-
-
 #define UNITY_TEST_ASSERT_INT_WITHIN(delta, expected, actual, line, message)                     UnityAssertNumbersWithin((delta), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT)
 #define UNITY_TEST_ASSERT_INT8_WITHIN(delta, expected, actual, line, message)                    UnityAssertNumbersWithin((UNITY_UINT8 )(delta), (UNITY_INT)(UNITY_INT8 )(expected), (UNITY_INT)(UNITY_INT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8)
 #define UNITY_TEST_ASSERT_INT16_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((UNITY_UINT16)(delta), (UNITY_INT)(UNITY_INT16)(expected), (UNITY_INT)(UNITY_INT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16)
--- a/tests/unity/test/Makefile
+++ b/tests/unity/test/Makefile
@@ -14,7 +14,6 @@ CFLAGS += -Wbad-function-cast -Wcast-qual -Wold-style-definition -Wshadow -Wstri
 #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
--- a/tests/unity/test/rakefile_helper.rb
+++ b/tests/unity/test/rakefile_helper.rb
@@ -91,7 +91,7 @@ module RakefileHelpers
    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)
+                squash($cfg['compiler']['defines']['prefix'], $cfg['compiler']['defines']['items'] + ['UNITY_OUTPUT_CHAR=putcharSpy'] + inject_defines)
              end
    options = squash('', $cfg['compiler']['options'])
    includes = squash($cfg['compiler']['includes']['prefix'], $cfg['compiler']['includes']['items'])
--- a/tests/unity/test/tests/testunity.c
+++ b/tests/unity/test/tests/testunity.c
@@ -764,9 +764,8 @@ void testNotEqualBitsLow(void)
    EXPECT_ABORT_BEGIN
    TEST_ASSERT_BITS_LOW(v0, v1);
    VERIFY_FAILS_END
+
 }
-
-
 void testEqualShorts(void)
 {
    short v0, v1;
@@ -1306,415 +1305,6 @@ void testINT8sNotWithinDeltaAndCustomMessage(void)
    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";
@@ -4466,46 +4056,61 @@ 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",          0.0f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("0.000000...",  0.000000499f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("0.000001",     0.00000050000005f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("0.100469",     0.100469499f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("1.0",          0.9999995f); /*Rounding to int place*/
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("1.0",          1.0f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("1.25",         1.25f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("7.999999",     7.999999f); /*Not rounding*/
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("16.000002",    16.000002f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("16.000004",    16.000004f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("16.000006",    16.000006f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("4294967040.0", 4294967040.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("0.0",         -0.0f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("-0.000000...",-0.000000499f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("-0.000001",   -0.00000050000005f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("-0.100469",   -0.100469499f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("-1.0",        -0.9999995f); /*Rounding to int place*/
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("-1.0",        -1.0f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("-1.25",       -1.25f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("-7.999999",   -7.999999f); /*Not rounding*/
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("-16.000002",  -16.000002f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("-16.000004",  -16.000004f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("-16.000006",  -16.000006f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("-4294967040.0",-4294967040.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);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("4.2949673e+09",  4294967296.0f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("5.0e+09",        5000000000.0f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("8.0e+09",        8.0e+09f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("8.3099991e+09",  8309999104.0f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("1.0e+10",        1.0e+10f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("1.0e+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("1.00005499e+10", (float)1.000055e+10f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("1.10000006e+38", (float)1.10000005e+38f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("1.63529943e+10", 1.63529943e+10f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("3.40282347e+38", 3.40282346638e38f);

-    TEST_ASSERT_EQUAL_PRINT_FLOATING("-1e+10",       -1.0e+10f);
-    TEST_ASSERT_EQUAL_PRINT_FLOATING("-3.40282e+38", -3.40282346638e38f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("-1.0e+10",       -1.0e+10f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("-3.40282347e+38",-3.40282346638e38f);
+#endif
+}
+
+void testFloatPrintingRoundTiesToEven(void)
+{
+#if defined(UNITY_EXCLUDE_FLOAT_PRINT) || !defined(USING_OUTPUT_SPY)
+    TEST_IGNORE();
+#else
+  #ifdef UNITY_ROUND_TIES_AWAY_FROM_ZERO
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("0.007813", 0.0078125f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("0.976563", 0.9765625f);
+  #else /* Default to Round ties to even */
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("0.007182", 0.0071825f);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("0.976562", 0.9765625f);
+  #endif
 #endif
 }

@@ -4514,69 +4119,105 @@ 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("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);
+    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)
+static void AllFloatPrinting_LessThan32Bits(void)
 {
    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)
+    union { float f_value; int32_t int_value; } u;
+    /* Float representations are laid out in integer order, walk up the list */
+    for (u.f_value = 0.00000050000005f; u.f_value <= 4294967040.0f; u.int_value += 1)
    {
-        /* Fail with diagnostic printing */
-        TEST_ASSERT_EQUAL_PRINT_FLOATING(expected, f);
+        startPutcharSpy();
+
+        UnityPrintFloat(u.f_value); /*1.5x as fast as sprintf 5e-7f - 0.01f, 20s vs 30s*/
+        int len = sprintf(expected, "%.6f", u.f_value);
+
+        while (expected[len - 1] == '0' && expected[len - 2] != '.') { len--; }
+        expected[len] = '\0'; /* delete trailing 0's */
+
+        if (strcmp(expected, getBufferPutcharSpy()) != 0)
+        {
+            double six_digits = ((double)u.f_value - (uint32_t)u.f_value)*1000000.0;
+            /* Not a tie (remainder != 0.5) => Can't explain the different strings */
+            if (six_digits - (uint32_t)six_digits != 0.5)
+            {
+                /* Fail with diagnostic printing */
+                TEST_ASSERT_EQUAL_PRINT_FLOATING(expected, u.f_value);
+            }
+        }
+    }
+}
+
+/* Compared to perfect, floats are occasionally rounded wrong. It doesn't affect
+ * correctness, though. Two examples (of 13 total found during testing):
+ * Printed: 6.19256349e+20, Exact: 619256348499999981568.0f <= Eliminated by ROUND_TIES_TO_EVEN
+ * Printed: 2.19012272e+35, Exact: 219012271499999993621766990196637696.0f */
+static void AllFloatPrinting_Larger(const float start, const float end)
+{
+    unsigned int wrong = 0;
+    char expected[18];
+    union { float f_value; int32_t int_value; } u;
+    for (u.f_value = start; u.f_value <= end; u.int_value += 1)
+    {
+        startPutcharSpy();
+
+        UnityPrintFloat(u.f_value); /*Twice as fast as sprintf 2**32-1e12, 10s vs 21s*/
+        sprintf(expected, "%.8e", u.f_value);
+
+        int len = 11 - 1; /* 11th char is 'e' in exponential format */
+        while (expected[len - 1] == '0' && expected[len - 2] != '.') { len --; }
+        if (expected[14] != '\0') memmove(&expected[12], &expected[13], 3); /* Two char exponent */
+        memmove(&expected[len], &expected[11 - 1], sizeof "e+09"); /* 5 char length */
+
+        if (strcmp(expected, getBufferPutcharSpy()) != 0)
+        {
+            wrong++;
+            /* endPutcharSpy(); UnityPrint("Expected "); UnityPrint(expected);
+            UnityPrint(" Was "); UnityPrint(getBufferPutcharSpy()); UNITY_OUTPUT_CHAR('\n'); */
+
+            if (wrong > 10 || (wrong > 3 && end <= 1e25f))
+                TEST_ASSERT_EQUAL_PRINT_FLOATING(expected, u.f_value);
+            /* Empirical values from the current routine, don't be worse when making changes */
+        }
    }
 }
 #endif

-void testFloatPrintingRandomSamples(void)
+/* Exhaustive testing of all float values we differentiate when printing. Doubles
+ * are not explored here -- too many. These tests confirm that the routine works
+ * for all floats > 5e-7, positives only. Off by default due to test time.
+ * Compares Unity's routine to your sprintf() C lib, tested to pass on 3 platforms.
+ * Part1 takes a long time, around 3 minutes compiled with -O2
+ * Runs through all floats from 0.000001 - 2**32, ~300 million values */
+void testAllFloatPrintingPart1_LessThan32Bits(void)
 {
-#if !defined(UNITY_TEST_ALL_FLOATS_PRINT_OK) || !defined(USING_OUTPUT_SPY)
-    TEST_IGNORE();
+#if defined(UNITY_TEST_ALL_FLOATS_PRINT_OK) && defined(USING_OUTPUT_SPY)
+    AllFloatPrinting_LessThan32Bits();
 #else
-    union { float f_value; uint32_t int_value; } u;
+    TEST_IGNORE(); /* Ignore one of three */
+#endif
+}

-    /* 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);
+/* Test takes a long time, around 3.5 minutes compiled with -O2, try ~500 million values */
+void testAllFloatPrintingPart2_Larger(void)
+{
+#if defined(UNITY_TEST_ALL_FLOATS_PRINT_OK) && defined(USING_OUTPUT_SPY)
+    AllFloatPrinting_Larger(4294967296.0f, 1e25f);
+#endif
+}

-    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);
-    }
+/* Test takes a long time, around 3.5 minutes compiled with -O2, try ~500 million values */
+void testAllFloatPrintingPart3_LargerStill(void)
+{
+#if defined(UNITY_TEST_ALL_FLOATS_PRINT_OK) && defined(USING_OUTPUT_SPY)
+    AllFloatPrinting_Larger(1e25f, 3.40282347e+38f);
 #endif
 }

@@ -5252,20 +4893,35 @@ 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("4294967295.999999", 4294967295.999999);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("4.2949673e+09",     4294967295.9999995);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("4.2949673e+09",     4294967296.0);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("1.0e+10",           9999999995.0);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("9.00719925e+15",    9007199254740990.0);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("7.0e+100",          7.0e+100);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("3.0e+200",          3.0e+200);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("9.23456789e+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);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("-0.100469",         -0.10046949999999999);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("-4294967295.999999", -4294967295.999999);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("-4.2949673e+09",     -4294967295.9999995);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("-7.0e+100",          -7.0e+100);
+#endif
+}
+
+void testDoublePrintingRoundTiesToEven(void)
+{
+#if defined(UNITY_EXCLUDE_FLOAT_PRINT) || defined(UNITY_EXCLUDE_DOUBLE) || !defined(USING_OUTPUT_SPY)
+    TEST_IGNORE();
+#else
+  #ifdef UNITY_ROUND_TIES_AWAY_FROM_ZERO
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("1.00000001e+10", 10000000050.0);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("9.00719925e+15", 9007199245000000.0);
+  #else /* Default to Round ties to even */
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("1.0e+10",        10000000050.0);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("9.00719924e+15", 9007199245000000.0);
+  #endif
 #endif
 }

@@ -5274,10 +4930,10 @@ 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("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);
+    TEST_ASSERT_EQUAL_PRINT_FLOATING("NaN",   0.0 / d_zero);
 #endif
 }

--- a/valgrind.supp
+++ b/valgrind.supp
@@ -1,6 +0,0 @@
-{
-	suppress_ld_on_armv7
-	Memcheck:Cond
-	...
-	obj:*/ld-*.so
-}