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

* test-protocols:
  testsuite: list "forgotten" test script in Makefile.am
  testsuite: remove duplicated mention of a test in Makefile.am

diff --cc ChangeLog
Simple merge

diff --cc tests/Makefile.am
index 2ba3abc,be2d16a..48b354d
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -777,10 -733,9 +777,11 @@@ parallel-tests-harderror.test 
  parallel-tests-log-override-1.test \
  parallel-tests-log-override-2.test \
  parallel-tests-log-override-recheck.test \
 +parallel-tests-log-compiler-example.test \
 +parallel-tests-cmdline-override.test \
  parallel-tests-empty-testlogs.test \
  parallel-tests-driver-install.test \
+ parallel-tests-no-color-in-log.test \
  parallel-tests-no-spurious-summary.test \
  parallel-tests-exit-statuses.test \
  parallel-tests-console-output.test \

diff --cc tests/Makefile.in
index afe3b4c,0a91947..82fab27
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -1053,10 -987,9 +1053,11 @@@ parallel-tests-harderror.test 
  parallel-tests-log-override-1.test \
  parallel-tests-log-override-2.test \
  parallel-tests-log-override-recheck.test \
 +parallel-tests-log-compiler-example.test \
 +parallel-tests-cmdline-override.test \
  parallel-tests-empty-testlogs.test \
  parallel-tests-driver-install.test \
+ parallel-tests-no-color-in-log.test \
  parallel-tests-no-spurious-summary.test \
  parallel-tests-exit-statuses.test \
  parallel-tests-console-output.test \