diff --git a/examples/example_2/makefile b/examples/example_2/makefile index a834e78970a83deb040df7512adb3494ae9f8bb0..36d3cd77741298559e3e3c65c1e7dffe7f7eb5cb 100644 --- a/examples/example_2/makefile +++ b/examples/example_2/makefile @@ -43,7 +43,6 @@ CFLAGS += -Wundef CFLAGS += -Wold-style-definition CFLAGS += -Wmissing-prototypes CFLAGS += -Wmissing-declarations -CFLAGS += -DUNITY_FIXTURES TARGET_BASE1=all_tests TARGET1 = $(TARGET_BASE1)$(TARGET_EXTENSION) diff --git a/extras/fixture/src/unity_fixture.c b/extras/fixture/src/unity_fixture.c index 125d1b7ad529d3ab393e62f7651b9a6209d6713d..78752427c322e0f4e726988206170d8422055002 100644 --- a/extras/fixture/src/unity_fixture.c +++ b/extras/fixture/src/unity_fixture.c @@ -81,7 +81,12 @@ void UnityTestRunner(unityfunction* setup, if (!UnityFixture.Verbose) UNITY_OUTPUT_CHAR('.'); else + { UnityPrint(printableName); + #ifndef UNITY_REPEAT_TEST_NAME + Unity.CurrentTestName = NULL; + #endif + } Unity.NumberOfTests++; UnityMalloc_StartTest(); diff --git a/src/unity.c b/src/unity.c index c755ebb367234d7053eca97131d99d5c80193546..c178d9376a21c4a38af0a42dace04b08cbce990e 100644 --- a/src/unity.c +++ b/src/unity.c @@ -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) { -#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(':'); } diff --git a/src/unity_internals.h b/src/unity_internals.h index 34f0bd3a76f9b046c215af87ce0f5de55fb2499b..1abb1bdbea48f8bd3e4261e42f5612b63f6a356d 100644 --- a/src/unity_internals.h +++ b/src/unity_internals.h @@ -597,8 +597,6 @@ extern const char UnityStrErr64[]; #define UNITY_END() UnityEnd() #endif -#define UNITY_UNUSED(x) (void)(sizeof(x)) - /*----------------------------------------------- * Command Line Argument Support *-----------------------------------------------*/