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

Merge branch 'master' into unit-test-execution-time

Browse Source
This commit is contained in:
elliot
2018-07-28 20:01:50 +01:00
parent cc909efed3 ccb7faf3bd
commit f0e4571c96
20 changed files with 718 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extras/fixture/src/unity_fixture.h
View File

@@ -78,6 +78,6 @@ int UnityMain(int argc, const char* argv[], void (*runAllTests)(void));
#endif
/* You must compile with malloc replacement, as defined in unity_fixture_malloc_overrides.h */
void UnityMalloc_MakeMallocFailAfterCount(int count);
void UnityMalloc_MakeMallocFailAfterCount(int countdown);
#endif /* UNITY_FIXTURE_H_ */

4
extras/fixture/src/unity_fixture_internals.h
View File

@@ -24,7 +24,7 @@ extern struct UNITY_FIXTURE_T UnityFixture;
typedef void unityfunction(void);
void UnityTestRunner(unityfunction* setup,
unityfunction* body,
unityfunction* testBody,
unityfunction* teardown,
const char* printableName,
const char* group,
@@ -37,7 +37,7 @@ void UnityMalloc_EndTest(void);
int UnityGetCommandLineOptions(int argc, const char* argv[]);
void UnityConcludeFixtureTest(void);
void UnityPointer_Set(void** ptr, void* newValue, UNITY_LINE_TYPE line);
void UnityPointer_Set(void** pointer, void* newValue, UNITY_LINE_TYPE line);
void UnityPointer_UndoAllSets(void);
void UnityPointer_Init(void);
#ifndef UNITY_MAX_POINTERS