3rd-party/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-01-27 10:14:28 +01:00
Code Issues Releases Wiki Activity

Merge pull request #242 from jsalling/feature/fixture-test-name

Browse Source 
Fixture - Remove duplicate output of test name in verbose mode
This commit is contained in:
Mark VanderVoord
2017-01-13 16:38:10 -05:00
committed by GitHub
parent c5e9a93418 5f33721924
commit 6695e9e975
4 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/unity.c
View File

@@ -355,28 +355,19 @@ void UnityPrintOk(void)
static void UnityTestResultsBegin(const char* file, const UNITY_LINE_TYPE line);
static void UnityTestResultsBegin(const char* file, const UNITY_LINE_TYPE line)
{
#ifndef UNITY_FIXTURES
UnityPrint(file);
UNITY_OUTPUT_CHAR(':');
UnityPrintNumber((UNITY_INT)line);
UNITY_OUTPUT_CHAR(':');
UnityPrint(Unity.CurrentTestName);
UNITY_OUTPUT_CHAR(':');
#else
UNITY_UNUSED(file);
UNITY_UNUSED(line);
#endif
}
/*-----------------------------------------------*/
static void UnityTestResultsFailBegin(const UNITY_LINE_TYPE line);
static void UnityTestResultsFailBegin(const UNITY_LINE_TYPE line)
{
#ifndef UNITY_FIXTURES
UnityTestResultsBegin(Unity.TestFile, line);
#else
UNITY_UNUSED(line);
#endif
UnityPrint(UnityStrFail);
UNITY_OUTPUT_CHAR(':');
}

2
src/unity_internals.h
View File

@@ -575,8 +575,6 @@ extern const char UnityStrErr64[];
#define UNITY_END() UnityEnd()
#endif
#define UNITY_UNUSED(x) (void)(sizeof(x))
/*-----------------------------------------------
* Command Line Argument Support
*-----------------------------------------------*/