espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-06-19 21:38:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate output of test name, Fixture verbose mode

Browse Source 
Remove UNITY_FIXTURES option, which was probably not doing what was
originally indended. It was suppressing the test name even in quiet mode.
This commit is contained in:
jsalling
2016-12-03 22:24:03 -06:00
parent 0603c1cf1e
commit 5f33721924
4 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/example_2/makefile
View File

@ -43,7 +43,6 @@ CFLAGS += -Wundef
CFLAGS += -Wold-style-definition CFLAGS += -Wold-style-definition
CFLAGS += -Wmissing-prototypes CFLAGS += -Wmissing-prototypes
CFLAGS += -Wmissing-declarations CFLAGS += -Wmissing-declarations
CFLAGS += -DUNITY_FIXTURES
TARGET_BASE1=all_tests TARGET_BASE1=all_tests
TARGET1 = $(TARGET_BASE1)$(TARGET_EXTENSION) TARGET1 = $(TARGET_BASE1)$(TARGET_EXTENSION)

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

@ -81,7 +81,12 @@ void UnityTestRunner(unityfunction* setup,
if (!UnityFixture.Verbose) if (!UnityFixture.Verbose)
UNITY_OUTPUT_CHAR('.'); UNITY_OUTPUT_CHAR('.');
else else
{
UnityPrint(printableName); UnityPrint(printableName);
#ifndef UNITY_REPEAT_TEST_NAME
Unity.CurrentTestName = NULL;
#endif
}
Unity.NumberOfTests++; Unity.NumberOfTests++;
UnityMalloc_StartTest(); UnityMalloc_StartTest();

9
src/unity.c
View File

@ -357,28 +357,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);
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); UnityPrint(file);
UNITY_OUTPUT_CHAR(':'); UNITY_OUTPUT_CHAR(':');
UnityPrintNumber((UNITY_INT)line); UnityPrintNumber((UNITY_INT)line);
UNITY_OUTPUT_CHAR(':'); UNITY_OUTPUT_CHAR(':');
UnityPrint(Unity.CurrentTestName); UnityPrint(Unity.CurrentTestName);
UNITY_OUTPUT_CHAR(':'); 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);
static void UnityTestResultsFailBegin(const UNITY_LINE_TYPE line) static void UnityTestResultsFailBegin(const UNITY_LINE_TYPE line)
{ {
#ifndef UNITY_FIXTURES
UnityTestResultsBegin(Unity.TestFile, line); UnityTestResultsBegin(Unity.TestFile, line);
#else
UNITY_UNUSED(line);
#endif
UnityPrint(UnityStrFail); UnityPrint(UnityStrFail);
UNITY_OUTPUT_CHAR(':'); UNITY_OUTPUT_CHAR(':');
} }

2
src/unity_internals.h
View File

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