Merge branch 'test-protocols' into tap-testsuite-work

* test-protocols:
  tap driver: handle signals received by the tests being run
  test driver: a preparatory refactoring (2)
  tap driver: a preparatory refactoring (1)
  cosmetics: typofix in the name of a function in the TAP driver
  tap: scripts with a SKIP plan but with exit status != 0 must error

diff --cc ChangeLog
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge