From bfee5e30233ea72bbfef9a2b375d2dd69d5a8fcf Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Sat, 25 Nov 2023 15:00:40 -0500
Subject: [PATCH] Try and handle multiple coveralls

---
 .github/workflows/boxes.yml | 17 ++++++++++++++++-
 test/testrunner.sh          |  9 ++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/boxes.yml b/.github/workflows/boxes.yml
index 3a460ad..aa7a1ce 100644
--- a/.github/workflows/boxes.yml
+++ b/.github/workflows/boxes.yml
@@ -45,8 +45,10 @@ jobs:
                   github-token: ${{ secrets.GITHUB_TOKEN }}
                   file: out/lcov-total.info
                   format: lcov
+                  flag-name: run-linux
+                  parallel: true
 
-    build-mac:
+    build-macos:
         runs-on: macos-latest
         env:
           LEX: /usr/local/opt/flex/bin/flex
@@ -79,3 +81,16 @@ jobs:
                   github-token: ${{ secrets.GITHUB_TOKEN }}
                   file: out/lcov-total.info
                   format: lcov
+                  flag-name: run-macos
+                  parallel: true
+
+    finish:
+      needs: [build, build-macos]
+      if: ${{ always() }}
+      runs-on: ubuntu-latest
+      steps:
+      - name: Coveralls Finished
+        uses: coverallsapp/github-action@v2
+        with:
+          parallel-finished: true
+          carryforward: "run-linux,run-macos"
diff --git a/test/testrunner.sh b/test/testrunner.sh
index c13951c..326e914 100755
--- a/test/testrunner.sh
+++ b/test/testrunner.sh
@@ -159,14 +159,17 @@ function measure_coverage()
     fi
 }
 
-
+# NOTE: It is possible when the white box tests work that we can
+# remove the --ignore-errors unused option. But for now, we use it so
+# that the CI is "happy" and we can get a baseline.
 function consolidate_coverage()
 {
     echo -e "\nConsolidating test coverage ..."
     pushd ${OUT_DIR}/test-results || exit 1
     find . -name "*.info" | xargs printf -- '--add-tracefile %s\n' | xargs --exit \
-        lcov --rc lcov_branch_coverage=1 --exclude '*/lex.yy.c' --exclude '*/parser.c' \
-             --ignore-errors unused --output-file ../${COVERAGE_FILE} --add-tracefile ../${BASELINE_FILE}
+        lcov --rc branch_coverage=1 --exclude '*/lex.yy.c' --exclude '*/parser.c' \
+             --ignore-errors unused \
+             --output-file ../${COVERAGE_FILE} --add-tracefile ../${BASELINE_FILE}
     popd || exit 1
     echo ""
 }