espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-05-20 08:57:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

update UNITY_OUTPUT_CHAR to not return a value (because we never check it anyway).

Browse Source 
add UNITY_OUTPUT_FLUSH to make sure we get the output we need on aborted tests and whatnot.
This commit is contained in:
Mark VanderVoord
2016-05-06 10:47:39 -04:00
parent 7053ef7523
commit c5c392b18a
4 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/unity.c
View File

@ -7,11 +7,18 @@
#include "unity.h"
#include <stddef.h>
//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); //If omitted from header, declare it here so it's ready for use
int UNITY_OUTPUT_CHAR(int);
#endif
#ifdef UNITY_OMIT_OUTPUT_FLUSH_HEADER_DECLARATION
int UNITY_OUTPUT_FLUSH(void);
#endif
//Helpful macros for us to use here
#define UNITY_FAIL_AND_BAIL { Unity.CurrentTestFailed = 1; longjmp(Unity.AbortFrame, 1); }
#define UNITY_IGNORE_AND_BAIL { Unity.CurrentTestIgnored = 1; longjmp(Unity.AbortFrame, 1); }
/// return prematurely if we are already in failure or ignore state
#define UNITY_SKIP_EXECUTION { if ((Unity.CurrentTestFailed != 0) || (Unity.CurrentTestIgnored != 0)) {return;} }
@ -331,6 +338,7 @@ void UnityConcludeTest(void)
Unity.CurrentTestFailed = 0;
Unity.CurrentTestIgnored = 0;
UNITY_PRINT_EOL();
UNITY_OUTPUT_FLUSH();
}
//-----------------------------------------------
@ -1290,6 +1298,7 @@ int UnityEnd(void)
#endif
}
UNITY_PRINT_EOL();
UNITY_OUTPUT_FLUSH();
UNITY_OUTPUT_COMPLETE();
return (int)(Unity.TestFailures);
}

17
src/unity_internals.h
View File

@ -290,11 +290,22 @@ typedef UNITY_DOUBLE_TYPE _UD;
#ifndef UNITY_OUTPUT_CHAR
//Default to using putchar, which is defined in stdio.h
#include <stdio.h>
#define UNITY_OUTPUT_CHAR(a) putchar(a)
#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
//If defined as something else, make sure we declare it here so it's ready for use
#ifndef UNITY_OMIT_OUTPUT_CHAR_HEADER_DECLARATION
extern int UNITY_OUTPUT_CHAR(int);
extern void UNITY_OUTPUT_CHAR(int);
#endif
#endif
#ifndef UNITY_OUTPUT_FLUSH
//Default to using putchar, which is defined in stdio.h
#include <stdio.h>
#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
extern void UNITY_OUTPUT_FLUSH(void);
#endif
#endif

2
test/tests/testparameterized.c
View File

@ -8,7 +8,7 @@
#include <stdio.h>
#include "unity.h"
int putcharSpy(int c) {return putchar(c);} // include passthrough for linking tests
void putcharSpy(int c) { (void)putchar(c);} // include passthrough for linking tests
#define TEST_CASE(...)

3
test/tests/testunity.c
View File

@ -2247,7 +2247,7 @@ char* getBufferPutcharSpy(void)
#endif
}
int putcharSpy(int c)
void putcharSpy(int c)
{
#ifdef USING_OUTPUT_SPY
if (putcharSpyEnabled)
@ -2257,7 +2257,6 @@ int putcharSpy(int c)
} else
c = putchar(c);
#endif
return c;
}
void testFailureCountIncrementsAndIsReturnedAtEnd(void)