From d4353166d217270d1fde099cc25914650ab3ce21 Mon Sep 17 00:00:00 2001 From: jsalling Date: Mon, 23 Nov 2015 17:09:30 -0600 Subject: [PATCH] Replace all hard-coded '\n' with UNITY_PRINT_EOL macro in fixture 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) --- extras/fixture/src/unity_fixture.c | 10 +++++----- src/unity_internals.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extras/fixture/src/unity_fixture.c b/extras/fixture/src/unity_fixture.c index 7cafaa3..b6f8a65 100644 --- a/extras/fixture/src/unity_fixture.c +++ b/extras/fixture/src/unity_fixture.c @@ -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; diff --git a/src/unity_internals.h b/src/unity_internals.h index 95e1a74..231799a 100644 --- a/src/unity_internals.h +++ b/src/unity_internals.h @@ -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