Merge pull request #1127 from nasa/integration-candidate

osal Integration candidate: 2021-08-10

.github/workflows/local_unit_test.yml

@@ -31,11 +31,25 @@ jobs:
 
       - name: Calculate coverage 
         run: make lcov | tee lcov_out.txt
-
+ 
       - name: Confirm 100% line coverage
         run: |
           if [[ `grep -A 3 "Overall coverage rate" lcov_out.txt | grep lines` != *"100.0%"* ]]; then
             grep -A 3 "Overall coverage rate" lcov_out.txt
             echo "Lacks 100.0% line unit test coverage"
             exit -1
           fi
+
+      - name: Confirm absolute line coverage
+        run: |
+          # Current best possible branch coverage is all but 4, with associated issues for each missing case
+          missed_branches=4
+          coverage_nums=$(grep -A 3 "Overall coverage rate" lcov_out.txt | grep branches | grep -oP "[1-9]+[0-9]*")
+
+          diff=$(echo $coverage_nums | awk '{ print $4 - $3 }')
+          if [ $(($diff > $missed_branches)) == 1 ]
+          then 
+            grep -A 3 "Overall coverage rate" lcov_out.txt
+            echo "More than $missed_branches branches missed"
+            exit -1
+          fi

README.md

@@ -11,6 +11,12 @@ The autogenerated OSAL user's guide can be viewed at <https://github.com/nasa/cF
 
 ## Version History
 
+
+### Development Build: v5.1.0-rc1+dev590
+
+- Add absolute branch coverage check 
+- See <https://github.com/nasa/osal/pull/1127> and <https://github.com/nasa/cFS/pull/333>
+
 ### Development Build: v5.1.0-rc1+dev586
 
 - Add UtAssert_MIR macro

src/os/inc/osapi-version.h

@@ -36,7 +36,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define OS_BUILD_NUMBER   586
+#define OS_BUILD_NUMBER   590
 #define OS_BUILD_BASELINE "v5.1.0-rc1"
 
 /*