Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

osal Integration candidate: Caelum-rc4+dev52 #1395

Merged
merged 3 commits into from
Jun 1, 2023
Merged

osal Integration candidate: Caelum-rc4+dev52 #1395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cfacbda
Fix #1392, Add additional counters to test summary
dmknutsen May 24, 2023
23f3963
Merge pull request #1393 from dmknutsen/Issue_1392
dzbaker May 26, 2023
0517cc8
Bump to v6.0.0-rc4+dev217
dzbaker May 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## Development Build: v6.0.0-rc4+dev217
- Add additional counters to test summary
- See <https://github.com/nasa/osal/pull/1393>

## Development Build: v6.0.0-rc4+dev213
- Create Workflow for IC Bundle Generation
- See <https://github.com/nasa/osal/pull/1383>
Expand Down
2 changes: 1 addition & 1 deletion src/os/inc/osapi-version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
/*
* Development Build Macro Definitions
*/
#define OS_BUILD_NUMBER 213
#define OS_BUILD_NUMBER 217
#define OS_BUILD_BASELINE "v6.0.0-rc4"

/*
Expand Down
16 changes: 13 additions & 3 deletions ut_assert/src/utassert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,24 @@ void UtAssert_DoTestSegmentReport(const char *SegmentName, const UtAssert_TestCo
char ReportBuffer[144];

snprintf(ReportBuffer, sizeof(ReportBuffer),
"%02u %-20s TOTAL::%-4u PASS::%-4u FAIL::%-4u MIR::%-4u TSF::%-4u TTF::%-4u WARN::%-4u\n",
"%-22s ABORT::%-4u WARN::%-4u FLOW::%-4u DEBUG::%-4u N/A::%-4u",
"",
(unsigned int)TestCounters->CaseCount[UTASSERT_CASETYPE_ABORT],
(unsigned int)TestCounters->CaseCount[UTASSERT_CASETYPE_WARN],
(unsigned int)TestCounters->CaseCount[UTASSERT_CASETYPE_FLOW],
(unsigned int)TestCounters->CaseCount[UTASSERT_CASETYPE_DEBUG],
(unsigned int)TestCounters->CaseCount[UTASSERT_CASETYPE_NA]);

UT_BSP_DoText(UTASSERT_CASETYPE_INFO, ReportBuffer);

snprintf(ReportBuffer, sizeof(ReportBuffer),
"%02u %-20s TOTAL::%-4u PASS::%-4u FAIL::%-4u MIR::%-4u TSF::%-4u TTF::%-4u",
(unsigned int)TestCounters->TestSegmentCount, SegmentName, (unsigned int)TestCounters->TotalTestCases,
(unsigned int)TestCounters->CaseCount[UTASSERT_CASETYPE_PASS],
(unsigned int)TestCounters->CaseCount[UTASSERT_CASETYPE_FAILURE],
(unsigned int)TestCounters->CaseCount[UTASSERT_CASETYPE_MIR],
(unsigned int)TestCounters->CaseCount[UTASSERT_CASETYPE_TSF],
(unsigned int)TestCounters->CaseCount[UTASSERT_CASETYPE_TTF],
(unsigned int)TestCounters->CaseCount[UTASSERT_CASETYPE_WARN]);
(unsigned int)TestCounters->CaseCount[UTASSERT_CASETYPE_TTF]);

UT_BSP_DoText(UTASSERT_CASETYPE_END, ReportBuffer);
}
Expand Down