From cfacbda35bdf2cfadd8cd68d7e264b1ead89e8a7 Mon Sep 17 00:00:00 2001
From: Dan <daniel.m.knutsen@nasa.gov>
Date: Wed, 24 May 2023 15:41:25 -0400
Subject: [PATCH 1/2] Fix #1392, Add additional counters to test summary

---
 ut_assert/src/utassert.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

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

From 0517cc884f4a15c4b08e2940286125b4eaf7c539 Mon Sep 17 00:00:00 2001
From: Dylan <dylan.z.baker@nasa.gov>
Date: Fri, 26 May 2023 08:33:55 -0400
Subject: [PATCH 2/2] Bump to v6.0.0-rc4+dev217

---
 CHANGELOG.md               | 4 ++++
 src/os/inc/osapi-version.h | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2cad16d62..424381c54 100644
--- 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
index ae97f0858..674c65871 100644
--- 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"
 
 /*