1
0
mirror of https://github.com/ThrowTheSwitch/Unity synced 2025-05-30 03:39:33 -04:00

Condense all longjmp calls into TEST_ABORT()

The setjmp calls are all in TEST_PROTECT() already
This commit is contained in:
jsalling 2017-01-14 10:41:03 -06:00
parent 6695e9e975
commit 5449f1e4d1
3 changed files with 4 additions and 4 deletions

@ -13,8 +13,8 @@ void UNITY_OUTPUT_CHAR(int);
#endif
/* Helpful macros for us to use here in Assert functions */
#define UNITY_FAIL_AND_BAIL { Unity.CurrentTestFailed = 1; longjmp(Unity.AbortFrame, 1); }
#define UNITY_IGNORE_AND_BAIL { Unity.CurrentTestIgnored = 1; longjmp(Unity.AbortFrame, 1); }
#define UNITY_FAIL_AND_BAIL { Unity.CurrentTestFailed = 1; TEST_ABORT(); }
#define UNITY_IGNORE_AND_BAIL { Unity.CurrentTestIgnored = 1; TEST_ABORT(); }
#define RETURN_IF_FAIL_OR_IGNORE if (Unity.CurrentTestFailed || Unity.CurrentTestIgnored) return
struct UNITY_STORAGE_T Unity;

@ -72,7 +72,7 @@ void tearDown(void);
/* It is not necessary for you to call PASS. A PASS condition is assumed if nothing fails.
* This method allows you to abort a test immediately with a PASS state, ignoring the remainder of the test. */
#define TEST_PASS() longjmp(Unity.AbortFrame, 1)
#define TEST_PASS() TEST_ABORT()
/*-------------------------------------------------------
* Test Asserts (simple)

@ -536,7 +536,7 @@ extern const char UnityStrErr64[];
#define TEST_PROTECT() (setjmp(Unity.AbortFrame) == 0)
#define TEST_ABORT() {longjmp(Unity.AbortFrame, 1);}
#define TEST_ABORT() longjmp(Unity.AbortFrame, 1)
/* This tricky series of macros gives us an optional line argument to treat it as RUN_TEST(func, num=__LINE__) */
#ifndef RUN_TEST