Merge pull request #656 from martin-schulze-vireso/fix/issue_654_endl…

…ess_loop_on_sigint_with_bash_5.2

Fix endless loop on CTRL-C with bash 5.2

.github/workflows/tests.yml

@@ -145,7 +145,7 @@ jobs:
   bash-version:
     strategy:
       matrix:
-        version: ['3.2', '4.0', '4.1', '4.2', '4.3', '4.4', '4', '5.0', '5.1', '5', 'latest']
+        version: ['3.2', '4.0', '4.1', '4.2', '4.3', '4.4', '4', '5.0', '5.1', '5', 'rc']
         env_vars:
             - ''
             # also test running (recursively!) in parallel

docs/CHANGELOG.md

@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog][kac] and this project adheres to
 ### Fixed
 
 * `shfmt` all files and enforce via CI (#651)
+* avoid kernel warning flood/hang with CTRL+C on Bash 5.2 RC (#656)
 
 ## [1.8.0] - 2022-09-15
 

lib/bats-core/tracing.bash

@@ -382,8 +382,7 @@ bats_interrupt_trap() {
   BATS_INTERRUPTED=true
   BATS_ERROR_STATUS=130
   # debug trap fires before interrupt trap but gets wrong linenumber (line 1)
-  # -> use last stack trace
-  exit $BATS_ERROR_STATUS
+  # -> use last stack trace instead of BATS_DEBUG_LAST_STACK_TRACE_IS_VALID=true
 }
 
 # this is used inside run()
@@ -392,5 +391,5 @@ bats_interrupt_trap_in_run() {
   BATS_INTERRUPTED=true
   BATS_ERROR_STATUS=130
   BATS_DEBUG_LAST_STACK_TRACE_IS_VALID=true
-  exit $BATS_ERROR_STATUS
+  exit 130
 }

libexec/bats-core/bats-format-junit

@@ -98,13 +98,13 @@ print_test_case() {
 }
 
 xml_escape() {
-  output=${1//&/&}
-  output=${output//</&lt;}
-  output=${output//>/&gt;}
-  output=${output//'"'/&quot;}
-  output=${output//\'/&#39;}
+  output=${1//&/\&amp;}
+  output=${output//</\&lt;}
+  output=${output//>/\&gt;}
+  output=${output//'"'/\&quot;}
+  output=${output//\'/\&#39;}
   local CONTROL_CHAR=$'\033'
-  output="${output//$CONTROL_CHAR/&#27;}"
+  output=${output//$CONTROL_CHAR/\&#27;}
   printf "%s" "$output"
 }
 

test/bats.bats

@@ -781,8 +781,10 @@ END_OF_ERR_MSG
 
   [ "${lines[1]}" == "not ok 1 test" ]
   # due to scheduling the exact line will vary but we should exit with 130
+  [[ "${lines[2]}" == "# (in test file "*")" ]] || false  
   [[ "${lines[3]}" == *"failed with status 130" ]] || false
   [ "${lines[4]}" == "# Received SIGINT, aborting ..." ]
+  [ ${#lines[@]} -eq 5 ]
 }
 
 @test "CTRL-C aborts and fails the current run" {

test/fixtures/bats/hang_in_test.bats

@@ -5,4 +5,5 @@ setup() {
 @test "test" {
   single-use-latch::signal hang_in_test
   sleep 10
+  echo "after sleep" # this should not be printed
 }