lint_tool_test: On issues, print out patch that broke.

Observed issues with recent MacOS CI.
chipsalliance · May 4, 2024 · b5a62c0 · b5a62c0
1 parent ec69cae
commit b5a62c0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/.github/workflows/verible-ci.yml b/.github/workflows/verible-ci.yml
@@ -370,7 +370,9 @@ jobs:
         .github/bin/run-clang-tidy-cached.cc --checks="-*"
 
   MacOsBuild:
-    runs-on: macos-latest
+    # New MacOS has a broken patch utility:
+    # //verilog/tools/lint:lint-tool_test trips over a no-newline-at-end-of-file
+    runs-on: macos-12
     steps:
 
     - name: Cancel previous

diff --git a/verilog/tools/lint/lint_tool_test.sh b/verilog/tools/lint/lint_tool_test.sh
@@ -558,8 +558,12 @@ patch_out="$(patch "${TEST_FILE}" "${PATCH_FILE}" 2>&1)"
 status="$?"
 (( $status )) && {
   echo "Expected exit code 0 from 'patch' tool, but got $status"
-  echo "--- 'patch' output ---"
+  echo "--- 'patch' output [#1] ---"
   echo "$patch_out"
+  echo "Patch was"
+  echo "------------------"
+  cat "${PATCH_FILE}"
+  echo "------------------"
   exit 1
 }
 
@@ -616,8 +620,12 @@ patch_out="$(cd $TEST_TMPDIR; patch -p1 < "${PATCH_FILE}" 2>&1)"
 status="$?"
 (( $status )) && {
   echo "Expected exit code 0 from 'patch' tool, but got $status"
-  echo "--- 'patch' output ---"
+  echo "--- 'patch' output [#2] ---"
   echo "$patch_out"
+  echo "Patch was"
+  echo "------------------"
+  cat "${PATCH_FILE}"
+  echo "------------------"
   exit 1
 }
 
@@ -714,8 +722,12 @@ interactive_autofix_test() {
   status="$?"
   (( $status )) && {
     echo "Expected exit code 0 from 'patch' tool, but got $status"
-    echo "--- 'patch' output ---"
+    echo "--- 'patch' output (interactive_autofix_test) ---"
     echo "$patch_out"
+    echo "Patch was"
+    echo "------------------"
+    cat "${PATCH_FILE}"
+    echo "------------------"
     exit 1
   }