diff --git a/extras/fixture/src/unity_fixture.h b/extras/fixture/src/unity_fixture.h index 43c9f7cbf641d2c84dcfa3a68f88850854e52db6..9d5cd12d3c2fd57facb52a20ed70c7be29596fd9 100644 --- a/extras/fixture/src/unity_fixture.h +++ b/extras/fixture/src/unity_fixture.h @@ -49,8 +49,8 @@ int UnityMain(int argc, char* argv[], void (*runAllTests)()); void TEST_##group##_##name##_run() #define RUN_TEST_CASE(group, name) \ - DECLARE_TEST_CASE(group, name);\ - TEST_##group##_##name##_run(); + { DECLARE_TEST_CASE(group, name);\ + TEST_##group##_##name##_run(); } //This goes at the bottom of each test file or in a separate c file #define TEST_GROUP_RUNNER(group)\ @@ -63,8 +63,8 @@ int UnityMain(int argc, char* argv[], void (*runAllTests)()); //Call this from main #define RUN_TEST_GROUP(group)\ - void TEST_##group##_GROUP_RUNNER();\ - TEST_##group##_GROUP_RUNNER(); + { void TEST_##group##_GROUP_RUNNER();\ + TEST_##group##_GROUP_RUNNER(); } //CppUTest Compatibility Macros #define UT_PTR_SET(ptr, newPointerValue) UnityPointer_Set((void**)&ptr, (void*)newPointerValue) diff --git a/extras/fixture/test/unity_fixture_Test.c b/extras/fixture/test/unity_fixture_Test.c index b8b4524cce9649fe0dde93f3639a890d8682d077..f5803b8b7b8b1c246bb7547989c5936eb380a910 100644 --- a/extras/fixture/test/unity_fixture_Test.c +++ b/extras/fixture/test/unity_fixture_Test.c @@ -49,10 +49,12 @@ TEST(UnityFixture, PointerSetting) TEST(UnityFixture, ForceMallocFail) { + void* m; + void* mfails; UnityMalloc_MakeMallocFailAfterCount(1); - void* m = malloc(10); + m = malloc(10); CHECK(m); - void* mfails = malloc(10); + mfails = malloc(10); TEST_ASSERT_POINTERS_EQUAL(0, mfails); free(m); } @@ -76,8 +78,9 @@ TEST(UnityFixture, ReallocSameIsUnchanged) TEST(UnityFixture, ReallocLargerNeeded) { void* m1 = malloc(10); + void* m2; strcpy((char*)m1, "123456789"); - void* m2 = realloc(m1, 15); + m2 = realloc(m1, 15); CHECK(m1 != m2); STRCMP_EQUAL("123456789", m2); free(m2);