espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-12-18 14:40:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #185 from jsalling/feature/output-declaration

Browse Source 
Add Unity Fixture to the travisCI build and restore header declaration of UNITY_OUTPUT_CHAR
This commit is contained in:
Mark VanderVoord
2016-04-26 22:53:41 -04:00
parent e97c4fb5e5 593a03462e
commit 4f2cdb03fc
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/unity.c
View File

@@ -7,11 +7,9 @@
#include "unity.h"
#include <stddef.h>
#ifndef UNITY_OUTPUT_CHAR_USE_PUTC
//If defined as something else, make sure we declare it here so it's ready for use
extern int UNITY_OUTPUT_CHAR(int);
#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
#endif
#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