espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-10-16 03:32:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Finish cleaning up float options in testunity

Browse Source
This commit is contained in:
jsalling
2016-12-29 23:06:34 -06:00
parent 0603c1cf1e
commit f771f0b98f
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/unity_internals.h
View File

@ -230,6 +230,7 @@ typedef UNITY_FLOAT_TYPE UNITY_FLOAT;
#endif #endif
#ifdef UNITY_EXCLUDE_FLOAT #ifdef UNITY_EXCLUDE_FLOAT
#undef UNITY_EXCLUDE_FLOAT_PRINT
#define UNITY_EXCLUDE_FLOAT_PRINT #define UNITY_EXCLUDE_FLOAT_PRINT
#else #else
#ifndef UNITY_DOUBLE_TYPE #ifndef UNITY_DOUBLE_TYPE

10
test/tests/testunity.c
View File

@ -3286,7 +3286,7 @@ void testFloatPrinting(void)
void testFloatPrintingRoundTiesToEven(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(); TEST_IGNORE();
#else #else
#ifdef UNITY_ROUND_TIES_AWAY_FROM_ZERO #ifdef UNITY_ROUND_TIES_AWAY_FROM_ZERO
@ -3301,7 +3301,7 @@ void testFloatPrintingRoundTiesToEven(void)
void testFloatPrintingInfinityAndNaN(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(); TEST_IGNORE();
#else #else
TEST_ASSERT_EQUAL_PRINT_FLOATING("Inf", 1.0f / f_zero); TEST_ASSERT_EQUAL_PRINT_FLOATING("Inf", 1.0f / f_zero);
@ -3931,7 +3931,7 @@ void testNotEqualDoubleArraysLengthZero(void)
void testDoublePrinting(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(); TEST_IGNORE();
#else #else
TEST_ASSERT_EQUAL_PRINT_FLOATING("0.100469", 0.10046949999999999); TEST_ASSERT_EQUAL_PRINT_FLOATING("0.100469", 0.10046949999999999);
@ -3953,7 +3953,7 @@ void testDoublePrinting(void)
void testDoublePrintingRoundTiesToEven(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(); TEST_IGNORE();
#else #else
#ifdef UNITY_ROUND_TIES_AWAY_FROM_ZERO #ifdef UNITY_ROUND_TIES_AWAY_FROM_ZERO
@ -3968,7 +3968,7 @@ void testDoublePrintingRoundTiesToEven(void)
void testDoublePrintingInfinityAndNaN(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(); TEST_IGNORE();
#else #else
TEST_ASSERT_EQUAL_PRINT_FLOATING("Inf", 1.0 / d_zero); TEST_ASSERT_EQUAL_PRINT_FLOATING("Inf", 1.0 / d_zero);