From 55a9e75023f8c5a690cb252020b62b53e97d5ada Mon Sep 17 00:00:00 2001
From: Kenneth Myhra <kennethmyhra@gmail.com>
Date: Sun, 17 May 2026 18:57:39 +0200
Subject: [PATCH 1/2] Tests: Make shell statement macOS compatible

ls's -I option is not macOS compatible.
---
 tests/integration-tests/combine-test-results.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/integration-tests/combine-test-results.sh b/tests/integration-tests/combine-test-results.sh
index fcab1b94e..87ebb8808 100755
--- a/tests/integration-tests/combine-test-results.sh
+++ b/tests/integration-tests/combine-test-results.sh
@@ -40,7 +40,7 @@ SUMMARY=$(ls _summary*.json | xargs jq '[ .
   | { "file": ".github/workflow/integration_tests.yml",  "line": 1, "message": ("PASS: \(.pass // 0)\nFAIL: \(.fail // 0)\nERROR: \(.error // 0)\nSKIP: \(.skip // 0)"), "annotation_level": "warning" }
 ]')
 
-FAILURES=$(ls -I '_summary*.json' | xargs -I '{}' jq '[ .[]
+FAILURES=$(find . -maxdepth 1 -name '*.json' ! -name '_summary*.json' | xargs -I '{}' jq '[ .[]
     | select(((.status == "skip") and (.message | contains("TODO") | not))
         or .status == "fail"
         or .status == "error")

From 8386428a2ee09d695435d2f495a5a9079b255916 Mon Sep 17 00:00:00 2001
From: Kenneth Myhra <kennethmyhra@gmail.com>
Date: Sun, 17 May 2026 18:59:15 +0200
Subject: [PATCH 2/2] Tests: Print failures to stdout from
 combine-test-results.sh

This makes it easier to locate failures from looking at stdout
annotations in CI.
---
 tests/integration-tests/combine-test-results.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/integration-tests/combine-test-results.sh b/tests/integration-tests/combine-test-results.sh
index 87ebb8808..014be1238 100755
--- a/tests/integration-tests/combine-test-results.sh
+++ b/tests/integration-tests/combine-test-results.sh
@@ -34,6 +34,18 @@ ERROR: \(.error // 0)
 SKIP: \(.skip // 0)"
 '
 
+# Print failed/error tests to stdout if any exist
+FAILED_STDOUT=$(find . -maxdepth 1 -name '*.json' ! -name '_summary*.json' | xargs -I '{}' jq -r '[.[]
+    | select(.status == "fail" or .status == "error")
+    | "  \(.id): \(.description)\n    \(.message)"]
+  | .[]' '{}')
+
+if [ -n "${FAILED_STDOUT}" ]; then
+  echo ""
+  echo "Failed tests:"
+  echo "${FAILED_STDOUT}"
+fi
+
 # Have to use warning annotation level, notice isn't working anymore (but could be in future).
 
 SUMMARY=$(ls _summary*.json | xargs jq '[ .