mirror of
https://github.com/ThrowTheSwitch/Unity.git
synced 2025-06-20 22:13:29 +08:00
- dropped lf in output
git-svn-id: http://unity.svn.sourceforge.net/svnroot/unity/trunk@100 e7d17a6e-8845-0410-bbbc-c8efb4fdad7e
This commit is contained in:
10
src/unity.c
10
src/unity.c
@ -12,7 +12,7 @@
|
|||||||
#define UNITY_IGNORE_AND_BAIL { Unity.CurrentTestIgnored = 1; UNITY_OUTPUT_CHAR('\n'); longjmp(Unity.AbortFrame, 1); }
|
#define UNITY_IGNORE_AND_BAIL { Unity.CurrentTestIgnored = 1; UNITY_OUTPUT_CHAR('\n'); longjmp(Unity.AbortFrame, 1); }
|
||||||
/// return prematurely if we are already in failure or ignore state
|
/// return prematurely if we are already in failure or ignore state
|
||||||
#define UNITY_SKIP_EXECUTION { if ((Unity.CurrentTestFailed != 0) || (Unity.CurrentTestIgnored != 0)) {return;} }
|
#define UNITY_SKIP_EXECUTION { if ((Unity.CurrentTestFailed != 0) || (Unity.CurrentTestIgnored != 0)) {return;} }
|
||||||
#define UNITY_PRINT_CR_LF { UNITY_OUTPUT_CHAR('\r'); UNITY_OUTPUT_CHAR('\n'); }
|
#define UNITY_PRINT_EOL { UNITY_OUTPUT_CHAR('\n'); }
|
||||||
|
|
||||||
struct _Unity Unity = { 0 };
|
struct _Unity Unity = { 0 };
|
||||||
|
|
||||||
@ -232,7 +232,7 @@ void UnityConcludeTest(void)
|
|||||||
{
|
{
|
||||||
UnityTestResultsBegin(Unity.TestFile, Unity.CurrentTestLineNumber);
|
UnityTestResultsBegin(Unity.TestFile, Unity.CurrentTestLineNumber);
|
||||||
UnityPrint("PASS");
|
UnityPrint("PASS");
|
||||||
UNITY_PRINT_CR_LF;
|
UNITY_PRINT_EOL;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -800,14 +800,14 @@ void UnityBegin(void)
|
|||||||
int UnityEnd(void)
|
int UnityEnd(void)
|
||||||
{
|
{
|
||||||
UnityPrint("-----------------------");
|
UnityPrint("-----------------------");
|
||||||
UNITY_PRINT_CR_LF;
|
UNITY_PRINT_EOL;
|
||||||
UnityPrintNumber(Unity.NumberOfTests);
|
UnityPrintNumber(Unity.NumberOfTests);
|
||||||
UnityPrint(" Tests ");
|
UnityPrint(" Tests ");
|
||||||
UnityPrintNumber(Unity.TestFailures);
|
UnityPrintNumber(Unity.TestFailures);
|
||||||
UnityPrint(" Failures ");
|
UnityPrint(" Failures ");
|
||||||
UnityPrintNumber(Unity.TestIgnores);
|
UnityPrintNumber(Unity.TestIgnores);
|
||||||
UnityPrint(" Ignored");
|
UnityPrint(" Ignored");
|
||||||
UNITY_PRINT_CR_LF;
|
UNITY_PRINT_EOL;
|
||||||
if (Unity.TestFailures == 0U)
|
if (Unity.TestFailures == 0U)
|
||||||
{
|
{
|
||||||
UnityPrint("OK");
|
UnityPrint("OK");
|
||||||
@ -816,6 +816,6 @@ int UnityEnd(void)
|
|||||||
{
|
{
|
||||||
UnityPrint("FAIL");
|
UnityPrint("FAIL");
|
||||||
}
|
}
|
||||||
UNITY_PRINT_CR_LF;
|
UNITY_PRINT_EOL;
|
||||||
return Unity.TestFailures;
|
return Unity.TestFailures;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user