From f771f0b98f0279fa90e5da174be8ee0af2a7b705 Mon Sep 17 00:00:00 2001
From: jsalling <jsalling@users.noreply.github.com>
Date: Thu, 29 Dec 2016 23:06:34 -0600
Subject: [PATCH] Finish cleaning up float options in testunity

---
 src/unity_internals.h  |  1 +
 test/tests/testunity.c | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/unity_internals.h b/src/unity_internals.h
index 34f0bd3..00d1a16 100644
--- a/src/unity_internals.h
+++ b/src/unity_internals.h
@@ -230,6 +230,7 @@ typedef UNITY_FLOAT_TYPE UNITY_FLOAT;
   #endif
 
   #ifdef UNITY_EXCLUDE_FLOAT
+  #undef UNITY_EXCLUDE_FLOAT_PRINT
   #define UNITY_EXCLUDE_FLOAT_PRINT
   #else
   #ifndef UNITY_DOUBLE_TYPE
diff --git a/test/tests/testunity.c b/test/tests/testunity.c
index 08c621a..3d2a366 100644
--- a/test/tests/testunity.c
+++ b/test/tests/testunity.c
@@ -3286,7 +3286,7 @@ void testFloatPrinting(void)
 
 void testFloatPrintingRoundTiesToEven(void)
 {
-#if defined(UNITY_EXCLUDE_FLOAT) || !defined(USING_OUTPUT_SPY)
+#if defined(UNITY_EXCLUDE_FLOAT_PRINT) || !defined(USING_OUTPUT_SPY)
     TEST_IGNORE();
 #else
   #ifdef UNITY_ROUND_TIES_AWAY_FROM_ZERO
@@ -3301,7 +3301,7 @@ void testFloatPrintingRoundTiesToEven(void)
 
 void testFloatPrintingInfinityAndNaN(void)
 {
-#if defined(UNITY_EXCLUDE_FLOAT) || !defined(USING_OUTPUT_SPY)
+#if defined(UNITY_EXCLUDE_FLOAT_PRINT) || !defined(USING_OUTPUT_SPY)
     TEST_IGNORE();
 #else
     TEST_ASSERT_EQUAL_PRINT_FLOATING("Inf",   1.0f / f_zero);
@@ -3931,7 +3931,7 @@ void testNotEqualDoubleArraysLengthZero(void)
 
 void testDoublePrinting(void)
 {
-#if defined(UNITY_EXCLUDE_DOUBLE) || !defined(USING_OUTPUT_SPY)
+#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);
@@ -3953,7 +3953,7 @@ void testDoublePrinting(void)
 
 void testDoublePrintingRoundTiesToEven(void)
 {
-#if defined(UNITY_EXCLUDE_DOUBLE) || !defined(USING_OUTPUT_SPY)
+#if defined(UNITY_EXCLUDE_FLOAT_PRINT) || defined(UNITY_EXCLUDE_DOUBLE) || !defined(USING_OUTPUT_SPY)
     TEST_IGNORE();
 #else
   #ifdef UNITY_ROUND_TIES_AWAY_FROM_ZERO
@@ -3968,7 +3968,7 @@ void testDoublePrintingRoundTiesToEven(void)
 
 void testDoublePrintingInfinityAndNaN(void)
 {
-#if defined(UNITY_EXCLUDE_DOUBLE) || !defined(USING_OUTPUT_SPY)
+#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);