espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-07-03 16:12:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

New command line options

Browse Source
This commit is contained in:
Koy Rehme
2025-01-08 15:35:32 -07:00
committed by Rehme, Koy
parent cbcd08fa7d
commit 459d53a821
2 changed files with 54 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
extras/fixture/src/unity_fixture.c
View File

@ -46,21 +46,25 @@ int UnityMain(int argc, const char* argv[], void (*runAllTests)(void))
return (int)Unity.TestFailures; return (int)Unity.TestFailures;
} }
static int selected(const char* filter, const char* name) static int selected(const char* filter, const char* select, const char* name)
{ {
if (filter == 0) if (filter == 0 && select == 0)
return 1; return 1;
return strstr(name, filter) ? 1 : 0; if (filter && strstr(name, filter))
return 1;
if (select && strcmp(name, select) == 0)
return 1;
return 0;
} }
static int testSelected(const char* test) static int testSelected(const char* test)
{ {
return selected(UnityFixture.NameFilter, test); return selected(UnityFixture.NameFilter, UnityFixture.Name, test);
} }
static int groupSelected(const char* group) static int groupSelected(const char* group)
{ {
return selected(UnityFixture.GroupFilter, group); return selected(UnityFixture.GroupFilter, UnityFixture.Group, group);
} }
void UnityTestRunner(unityfunction* setup, void UnityTestRunner(unityfunction* setup,
@ -96,17 +100,20 @@ void UnityTestRunner(unityfunction* setup,
Unity.NumberOfTests++; Unity.NumberOfTests++;
UnityPointer_Init(); UnityPointer_Init();
UNITY_EXEC_TIME_START(); if (!UnityFixture.DryRun) {
UNITY_EXEC_TIME_START();
if (TEST_PROTECT()) if (TEST_PROTECT())
{ {
setup(); setup();
testBody(); testBody();
} }
if (TEST_PROTECT()) if (TEST_PROTECT())
{ {
teardown(); teardown();
}
} }
if (TEST_PROTECT()) if (TEST_PROTECT())
{ {
UnityPointer_UndoAllSets(); UnityPointer_UndoAllSets();
@ -183,8 +190,11 @@ int UnityGetCommandLineOptions(int argc, const char* argv[])
int i; int i;
UnityFixture.Verbose = 0; UnityFixture.Verbose = 0;
UnityFixture.Silent = 0; UnityFixture.Silent = 0;
UnityFixture.DryRun = 0;
UnityFixture.GroupFilter = 0; UnityFixture.GroupFilter = 0;
UnityFixture.Group = 0;
UnityFixture.NameFilter = 0; UnityFixture.NameFilter = 0;
UnityFixture.Name = 0;
UnityFixture.RepeatCount = 1; UnityFixture.RepeatCount = 1;
if (argc == 1) if (argc == 1)
@ -207,10 +217,16 @@ int UnityGetCommandLineOptions(int argc, const char* argv[])
UNITY_PRINT_EOL(); UNITY_PRINT_EOL();
UnityPrint(" -s Silent mode: minimal output showing only test failures"); UnityPrint(" -s Silent mode: minimal output showing only test failures");
UNITY_PRINT_EOL(); UNITY_PRINT_EOL();
UnityPrint(" -d Dry run all tests");
UNITY_PRINT_EOL();
UnityPrint(" -g NAME Only run tests in groups that contain the string NAME"); UnityPrint(" -g NAME Only run tests in groups that contain the string NAME");
UNITY_PRINT_EOL(); UNITY_PRINT_EOL();
UnityPrint(" -G NAME Only run tests in groups named NAME");
UNITY_PRINT_EOL();
UnityPrint(" -n NAME Only run tests whose name contains the string NAME"); UnityPrint(" -n NAME Only run tests whose name contains the string NAME");
UNITY_PRINT_EOL(); UNITY_PRINT_EOL();
UnityPrint(" -N NAME Only run tests named NAME");
UNITY_PRINT_EOL();
UnityPrint(" -r NUMBER Repeatedly run all tests NUMBER times"); UnityPrint(" -r NUMBER Repeatedly run all tests NUMBER times");
UNITY_PRINT_EOL(); UNITY_PRINT_EOL();
UnityPrint(" -h, --help Display this help message"); UnityPrint(" -h, --help Display this help message");
@ -237,6 +253,11 @@ int UnityGetCommandLineOptions(int argc, const char* argv[])
UnityFixture.Silent = 1; UnityFixture.Silent = 1;
i++; i++;
} }
else if (strcmp(argv[i], "-d") == 0)
{
UnityFixture.DryRun = 1;
i++;
}
else if (strcmp(argv[i], "-g") == 0) else if (strcmp(argv[i], "-g") == 0)
{ {
i++; i++;
@ -245,6 +266,14 @@ int UnityGetCommandLineOptions(int argc, const char* argv[])
UnityFixture.GroupFilter = argv[i]; UnityFixture.GroupFilter = argv[i];
i++; i++;
} }
else if (strcmp(argv[i], "-G") == 0)
{
i++;
if (i >= argc)
return 1;
UnityFixture.Group= argv[i];
i++;
}
else if (strcmp(argv[i], "-n") == 0) else if (strcmp(argv[i], "-n") == 0)
{ {
i++; i++;
@ -253,6 +282,14 @@ int UnityGetCommandLineOptions(int argc, const char* argv[])
UnityFixture.NameFilter = argv[i]; UnityFixture.NameFilter = argv[i];
i++; i++;
} }
else if (strcmp(argv[i], "-N") == 0)
{
i++;
if (i >= argc)
return 1;
UnityFixture.Name = argv[i];
i++;
}
else if (strcmp(argv[i], "-r") == 0) else if (strcmp(argv[i], "-r") == 0)
{ {
UnityFixture.RepeatCount = 2; UnityFixture.RepeatCount = 2;

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

@ -17,9 +17,12 @@ struct UNITY_FIXTURE_T
{ {
int Verbose; int Verbose;
int Silent; int Silent;
int DryRun;
unsigned int RepeatCount; unsigned int RepeatCount;
const char* NameFilter; const char* NameFilter;
const char* Name;
const char* GroupFilter; const char* GroupFilter;
const char* Group;
}; };
extern struct UNITY_FIXTURE_T UnityFixture; extern struct UNITY_FIXTURE_T UnityFixture;