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

Replace all hard-coded '\n' with UNITY_PRINT_EOL macro in fixture

Browse Source 
Delete the { ;} braces and semicolon from UNITY_PRINT_EOL to give it expected
  behavior: 1) requires a semicolon 2) works in one-liner if-else statements
If you need "\r\n" for EOL, define as the following to get the same behavior:
  do{UNITY_OUTPUT_CHAR('\r'); UNITY_OUTPUT_CHAR('\n');}while(0)
This commit is contained in:
jsalling
2015-11-23 17:09:30 -06:00
parent 5fc2b092d3
commit d4353166d2
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
extras/fixture/src/unity_fixture.c
View File

@@ -28,7 +28,7 @@ static void announceTestRun(unsigned int runNumber)
UnityPrintNumber(runNumber+1);
UnityPrint(" of ");
UnityPrintNumber(UnityFixture.RepeatCount);
UNITY_OUTPUT_CHAR('\n');
UNITY_PRINT_EOL;
}
int UnityMain(int argc, const char* argv[], void (*runAllTests)(void))
@@ -43,7 +43,7 @@ int UnityMain(int argc, const char* argv[], void (*runAllTests)(void))
UnityBegin(argv[0]);
announceTestRun(r);
runAllTests();
UNITY_OUTPUT_CHAR('\n');
UNITY_PRINT_EOL;
UnityEnd();
}
@@ -396,7 +396,7 @@ void UnityConcludeFixtureTest(void)
{
//if (UnityFixture.Verbose)
//{
UNITY_OUTPUT_CHAR('\n');
UNITY_PRINT_EOL;
//}
Unity.TestIgnores++;
}
@@ -405,13 +405,13 @@ void UnityConcludeFixtureTest(void)
if (UnityFixture.Verbose)
{
UnityPrint(" PASS");
UNITY_OUTPUT_CHAR('\n');
UNITY_PRINT_EOL;
}
}
else if (Unity.CurrentTestFailed)
{
Unity.TestFailures++;
UNITY_OUTPUT_CHAR('\n');
UNITY_PRINT_EOL;
}
Unity.CurrentTestFailed = 0;

2
src/unity_internals.h
View File

@@ -292,7 +292,7 @@ extern int UNITY_OUTPUT_CHAR(int);
#endif
#ifndef UNITY_PRINT_EOL
#define UNITY_PRINT_EOL { UNITY_OUTPUT_CHAR('\n'); }
#define UNITY_PRINT_EOL UNITY_OUTPUT_CHAR('\n')
#endif
#ifndef UNITY_OUTPUT_START