3rd-party/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-01-25 17:31:36 +01:00
Code Issues Releases Wiki Activity

making new flush routines work under all defined conditions.

Browse Source
This commit is contained in:
Mark VanderVoord
2016-06-21 10:01:34 -04:00
parent c19b5e20a0
commit b3bc196ab3
4 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/unity.c
View File

@@ -9,10 +9,7 @@
/* If omitted from header, declare overrideable prototypes here so they're ready for use */
#ifdef UNITY_OMIT_OUTPUT_CHAR_HEADER_DECLARATION
int UNITY_OUTPUT_CHAR(int);
#endif
#ifdef UNITY_OMIT_OUTPUT_FLUSH_HEADER_DECLARATION
int UNITY_OUTPUT_FLUSH(void);
void UNITY_OUTPUT_CHAR(int);
#endif
/* Helpful macros for us to use here */
@@ -338,7 +335,7 @@ void UnityConcludeTest(void)
Unity.CurrentTestFailed = 0;
Unity.CurrentTestIgnored = 0;
UNITY_PRINT_EOL();
UNITY_OUTPUT_FLUSH();
UNITY_FLUSH_CALL();
}
/*-----------------------------------------------*/
@@ -1298,7 +1295,7 @@ int UnityEnd(void)
#endif
}
UNITY_PRINT_EOL();
UNITY_OUTPUT_FLUSH();
UNITY_FLUSH_CALL();
UNITY_OUTPUT_COMPLETE();
return (int)(Unity.TestFailures);
}

10
src/unity_internals.h
View File

@@ -299,9 +299,9 @@ extern void UNITY_OUTPUT_CHAR(int);
#endif
#ifndef UNITY_OUTPUT_FLUSH
/* Default to using putchar, which is defined in stdio.h */
/* Default to using fflush, which is defined in stdio.h */
#include <stdio.h>
#define UNITY_OUTPUT_FLUSH() (void)fflush(stdout)
#define UNITY_OUTPUT_FLUSH (void)fflush(stdout)
#else
/* If defined as something else, make sure we declare it here so it's ready for use */
#ifndef UNITY_OMIT_OUTPUT_FLUSH_HEADER_DECLARATION
@@ -309,6 +309,12 @@ extern void UNITY_OUTPUT_FLUSH(void);
#endif
#endif
#ifndef UNITY_OUTPUT_FLUSH
#define UNITY_FLUSH_CALL()
#else
#define UNITY_FLUSH_CALL() UNITY_OUTPUT_FLUSH
#endif
#ifndef UNITY_PRINT_EOL
#define UNITY_PRINT_EOL() UNITY_OUTPUT_CHAR('\n')
#endif