Merge pull request nasa#1395 from nasa/integration-candidate

osal Integration candidate: Caelum-rc4+dev52
jphickey · Jun 1, 2023 · 184ba9b · 184ba9b
2 parents 5036fed + 0517cc8
commit 184ba9b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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>

diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h
@@ -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"
 
 /*

diff --git a/ut_assert/src/utassert.c b/ut_assert/src/utassert.c
@@ -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);
 }