3rd-party/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-01-29 11:14:27 +01:00
Code Issues Releases Wiki Activity

Delete function call syntax from Spy detect macros

Browse Source 
This fixes #168. See that github.com issue for more discussion.
 Allows the tests to build when putchar() is defined as a macro
  with parenthesis around it, as in the ARM embedded gcc compiler.
This commit is contained in:
jsalling
2016-02-24 00:19:53 -06:00
parent 324000d8e2
commit f55bed38a6
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
extras/fixture/test/unity_fixture_Test.c
View File

@@ -313,14 +313,14 @@ TEST_TEAR_DOWN(LeakDetection)
memcpy(Unity.AbortFrame, TestAbortFrame, sizeof(jmp_buf)); \ memcpy(Unity.AbortFrame, TestAbortFrame, sizeof(jmp_buf)); \
} }
// This tricky set of defines lets us see if we are using the Spy, returns 1 if true, else 0 // This tricky set of defines lets us see if we are using the Spy, returns 1 if true
#define USING_SPY_AS(a) EXPAND_AND_USE_2ND(ASSIGN_VALUE(a), 0) #define USING_SPY_AS(a) EXPAND_AND_USE_2ND(ASSIGN_VALUE(a), 0)
#define ASSIGN_VALUE(a) VAL_FUNC_##a #define ASSIGN_VALUE(a) VAL_##a
#define VAL_FUNC_UnityOutputCharSpy_OutputChar() 0, 1 #define VAL_UnityOutputCharSpy_OutputChar 0, 1
#define EXPAND_AND_USE_2ND(a, b) SECOND_PARAM(a, b, throwaway) #define EXPAND_AND_USE_2ND(a, b) SECOND_PARAM(a, b, throwaway)
#define SECOND_PARAM(a, b, ...) b #define SECOND_PARAM(a, b, ...) b
#if USING_SPY_AS(UNITY_OUTPUT_CHAR()) #if USING_SPY_AS(UNITY_OUTPUT_CHAR)
#define USING_OUTPUT_SPY #define USING_OUTPUT_SPY // UNITY_OUTPUT_CHAR = UnityOutputCharSpy_OutputChar
#endif #endif
TEST(LeakDetection, DetectsLeak) TEST(LeakDetection, DetectsLeak)
{ {

8
test/tests/testunity.c
View File

@@ -2175,12 +2175,12 @@ void testIgnoredAndThenFailInTearDown(void)
// Tricky series of macros to set USING_OUTPUT_SPY // Tricky series of macros to set USING_OUTPUT_SPY
#define USING_SPY_AS(a) EXPAND_AND_USE_2ND(ASSIGN_VALUE(a), 0) #define USING_SPY_AS(a) EXPAND_AND_USE_2ND(ASSIGN_VALUE(a), 0)
#define ASSIGN_VALUE(a) VAL_FUNC_##a #define ASSIGN_VALUE(a) VAL_##a
#define VAL_FUNC_putcharSpy() 0, 1 #define VAL_putcharSpy 0, 1
#define EXPAND_AND_USE_2ND(a, b) SECOND_PARAM(a, b, throwaway) #define EXPAND_AND_USE_2ND(a, b) SECOND_PARAM(a, b, throwaway)
#define SECOND_PARAM(a, b, ...) b #define SECOND_PARAM(a, b, ...) b
#if USING_SPY_AS(UNITY_OUTPUT_CHAR()) #if USING_SPY_AS(UNITY_OUTPUT_CHAR)
#define USING_OUTPUT_SPY // true only if UNITY_OUTPUT_CHAR = putchar_Spy #define USING_OUTPUT_SPY // true only if UNITY_OUTPUT_CHAR = putcharSpy
#endif #endif
#ifdef USING_OUTPUT_SPY #ifdef USING_OUTPUT_SPY