Merge branch 'maint'

* maint:
  parallel-tests: warn on conditional TEST_EXTENSIONS definition

diff --cc ChangeLog
Simple merge

diff --cc NEWS
Simple merge

diff --cc automake.in
index b69884a972fd0adc30123b9d42989a67e839ad82,516e594c172bf2eab51ebdccf6ed790cd93b1909..00fcbf19f4962cbdaeaaceeb06eecb4c0ac17ec1
mode 100644,100755..100644
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in

diff --cc tests/Makefile.am
index 530024b195a18cf4c590597ecd99d34b8132a228,884ea65a9c906315559e4fdbaf3588034310b5f7..6b14a305688fb0d4e43e4e394b46bcc127c09c35
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -753,10 -633,9 +753,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-cmdline-override.test \
  parallel-tests-log-compiler-example.test \
 +parallel-tests-fork-bomb.test \
  test-extensions.test \
+ test-extensions-cond.test \
  parse.test \
  percent.test \
  percent2.test \

diff --cc tests/Makefile.in
index 5f78d77aec72c546228aae9530028b739fc7eaec,f1bfcddef1f8722c22135890f7159fb784dcfcba..2bc73d706a368b429795bdeccaa0558f6efcbf38
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -1029,10 -917,9 +1029,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-cmdline-override.test \
  parallel-tests-log-compiler-example.test \
 +parallel-tests-fork-bomb.test \
  test-extensions.test \
+ test-extensions-cond.test \
  parse.test \
  percent.test \
  percent2.test \