From 0af2c9bafbdc7f9ebf799bed230da832d5bb5cd4 Mon Sep 17 00:00:00 2001
From: Roy Ivy III <rivy.dev@gmail.com>
Date: Sun, 13 Feb 2022 21:46:45 -0600
Subject: [PATCH] maint/CICD ~ (GnuTests) display sub-step test comparison
 failures more prominently

---
 .github/workflows/GnuTests.yml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/GnuTests.yml b/.github/workflows/GnuTests.yml
index eef8567c7..e901d4cfe 100644
--- a/.github/workflows/GnuTests.yml
+++ b/.github/workflows/GnuTests.yml
@@ -160,34 +160,38 @@ jobs:
     - name: Compare test failures VS reference
       shell: bash
       run: |
+        have_new_failures=""
         REF_LOG_FILE='${{ steps.vars.outputs.path_reference }}/test-logs/test-suite.log'
         REF_SUMMARY_FILE='${{ steps.vars.outputs.path_reference }}/test-summary/gnu-result.json'
         if test -f "${REF_LOG_FILE}"; then
-          echo "Reference SHA1/ID (of '${REF_SUMMARY_FILE}'): $(sha1sum -- "${REF_SUMMARY_FILE}")"
+          echo "Reference SHA1/ID: $(sha1sum -- "${REF_SUMMARY_FILE}")"
           REF_FAILING=$(sed -n "s/^FAIL: \([[:print:]]\+\).*/\1/p" "${REF_LOG_FILE}" | sort)
           NEW_FAILING=$(sed -n "s/^FAIL: \([[:print:]]\+\).*/\1/p" '${{ steps.vars.outputs.path_GNU_tests }}/test-suite.log' | sort)
-          for LINE in $REF_FAILING
+          for LINE in ${REF_FAILING}
           do
-            if ! grep -Fxq $LINE<<<"$NEW_FAILING"; then
-              echo "::warning ::Congrats! The gnu test $LINE is now passing!"
+            if ! grep -Fxq ${LINE}<<<"${NEW_FAILING}"; then
+              echo "::warning ::Congrats! The gnu test ${LINE} is now passing!"
             fi
           done
-          for LINE in $NEW_FAILING
+          for LINE in ${NEW_FAILING}
           do
-            if ! grep -Fxq $LINE<<<"$REF_FAILING"
+            if ! grep -Fxq ${LINE}<<<"${REF_FAILING}"
             then
-              echo "::error ::GNU test failed: $LINE. $LINE is passing on '${{ steps.vars.outputs.repo_default_branch }}'. Maybe you have to rebase?"
+              echo "::error ::GNU test failed: ${LINE}. ${LINE} is passing on '${{ steps.vars.outputs.repo_default_branch }}'. Maybe you have to rebase?"
+              have_new_failures="true"
             fi
           done
         else
           echo "::warning ::Skipping test failure comparison; no prior reference test logs are available."
         fi
+        if test -n "${have_new_failures}" ; then exit -1 ; fi
     - name: Compare test summary VS reference
+      if: success() || failure() # run regardless of prior step success/failure
       shell: bash
       run: |
         REF_SUMMARY_FILE='${{ steps.vars.outputs.path_reference }}/test-summary/gnu-result.json'
         if test -f "${REF_SUMMARY_FILE}"; then
-          echo "Reference SHA1/ID (of '${REF_SUMMARY_FILE}'): $(sha1sum -- "${REF_SUMMARY_FILE}")"
+          echo "Reference SHA1/ID: $(sha1sum -- "${REF_SUMMARY_FILE}")"
           mv "${REF_SUMMARY_FILE}" main-gnu-result.json
           python uutils/util/compare_gnu_result.py
         else