Merge branch 'master' into test-protocols

* master:
  tests: fix spurious failures due to ignored signals

diff --cc ChangeLog
Simple merge

diff --cc tests/defs
Simple merge

diff --cc tests/parallel-tests-interrupt.test
index ed40412,7305222..bf4f7f0
--- 1/tests/parallel-tests-interrupt.test
--- 2/tests/parallel-tests-interrupt.test
+++ b/tests/parallel-tests-interrupt.test
@@@ -65,11 -57,14 +65,15 @@@ $AUTOMAK
  trapped_signals='1 2 13 15'
  
  for signum in $trapped_signals; do
 -  rm -f pid fail *.log *.log-t
+   if is_blocked_signal $signum; then
+     echo "$me: signal $signum is blocked, skipping part of the test"
+     continue
+   fi
 +  rm -f pid fail *.log
    env signum=$signum $MAKE check && { ls -l; Exit 1; }
    ls -l
 -  cat foo.log-t || :
 +  # These files shouldn't exist, but in case they do, their content might
 +  # provide helpful information about the causes of the failure(s).
    cat foo.log || :
    cat test-suite.log || :
    test -f fail && Exit 1