From 47bf32edd6785926168b4d17c582d8a0c03d1408 Mon Sep 17 00:00:00 2001 From: Dennis Lambe Jr Date: Fri, 21 Dec 2012 16:07:49 -0500 Subject: [PATCH] Made unity_fixture IGNORE_TEST() respect the -v verbose flag. More details here: http://forums.pragprog.com/forums/123/topics/10126 --- extras/fixture/src/unity_fixture.c | 12 +++++++++--- extras/fixture/src/unity_fixture.h | 2 +- extras/fixture/src/unity_fixture_internals.h | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/extras/fixture/src/unity_fixture.c b/extras/fixture/src/unity_fixture.c index ec91e60..1e0aa37 100644 --- a/extras/fixture/src/unity_fixture.c +++ b/extras/fixture/src/unity_fixture.c @@ -112,11 +112,14 @@ void UnityTestRunner(unityfunction* setup, } } -void UnityIgnoreTest() +void UnityIgnoreTest(const char * printableName) { Unity.NumberOfTests++; Unity.CurrentTestIgnored = 1; - UNITY_OUTPUT_CHAR('!'); + if (!UnityFixture.Verbose) + UNITY_OUTPUT_CHAR('!'); + else + UnityPrint(printableName); UnityConcludeFixtureTest(); } @@ -357,6 +360,10 @@ void UnityConcludeFixtureTest() { if (Unity.CurrentTestIgnored) { + if (UnityFixture.Verbose) + { + UNITY_OUTPUT_CHAR('\n'); + } Unity.TestIgnores++; } else if (!Unity.CurrentTestFailed) @@ -375,4 +382,3 @@ void UnityConcludeFixtureTest() Unity.CurrentTestFailed = 0; Unity.CurrentTestIgnored = 0; } - diff --git a/extras/fixture/src/unity_fixture.h b/extras/fixture/src/unity_fixture.h index da1f871..43c9f7c 100644 --- a/extras/fixture/src/unity_fixture.h +++ b/extras/fixture/src/unity_fixture.h @@ -41,7 +41,7 @@ int UnityMain(int argc, char* argv[], void (*runAllTests)()); void TEST_##group##_##name##_();\ void TEST_##group##_##name##_run()\ {\ - UnityIgnoreTest();\ + UnityIgnoreTest("IGNORE_TEST(" #group ", " #name ")");\ }\ void TEST_##group##_##name##_() diff --git a/extras/fixture/src/unity_fixture_internals.h b/extras/fixture/src/unity_fixture_internals.h index db23f67..46cbbcb 100644 --- a/extras/fixture/src/unity_fixture_internals.h +++ b/extras/fixture/src/unity_fixture_internals.h @@ -25,7 +25,7 @@ void UnityTestRunner(unityfunction * setup, const char * name, const char * file, int line); -void UnityIgnoreTest(); +void UnityIgnoreTest(const char * printableName); void UnityMalloc_StartTest(); void UnityMalloc_EndTest(); int UnityFailureCount(); -- GitLab