1
0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-01-27 10:14:28 +01:00

- Protect against people not defining UNITY_USE_COMMAND)LINES_ARGS but enabling cmd_lines in test runner generator. (Cherry-pick PR 739)

- Fix UNITY_NORETURN usage (Cherry-pick PR 742)
- Other standards and formatting tweaks.
This commit is contained in:
Mark VanderVoord
2024-08-01 16:01:09 -04:00
parent 18fb33921f
commit c546414657
5 changed files with 54 additions and 37 deletions

View File

@@ -293,8 +293,9 @@ void testFailureCountIncrementsAndIsReturnedAtEnd(void)
#ifndef USING_OUTPUT_SPY
TEST_IGNORE();
#else
UNITY_UINT savedGetFlushSpyCalls = 0;
UNITY_UINT savedFailures = Unity.TestFailures;
int failures = 0;
UNITY_COUNTER_TYPE savedGetFlushSpyCalls = 0;
UNITY_COUNTER_TYPE savedFailures = Unity.TestFailures;
Unity.CurrentTestFailed = 1;
startPutcharSpy(); /* Suppress output */
startFlushSpy();
@@ -311,7 +312,7 @@ void testFailureCountIncrementsAndIsReturnedAtEnd(void)
endFlushSpy();
startPutcharSpy(); /* Suppress output */
int failures = UnityEnd();
failures = UnityEnd();
Unity.TestFailures--;
endPutcharSpy();
TEST_ASSERT_EQUAL(savedFailures + 1, failures);