Merge branch 'maint'

* maint:
  tests: remove remaining exec bits ('maint' branch)
  tests: remove exec bit from all of them ('micro' branch)
  maint: tests no longer need to have executable bit set
  PLANS: subdir-objects: various updates

diff --cc maintainer/syntax-checks.mk
Simple merge

diff --cc t/aclocal-acdir.sh
index e363e670e32e279719511bbd09e8e0b980e3d170,80eba31269521d86029d9d358141288d8d38585a..e363e670e32e279719511bbd09e8e0b980e3d170
mode 100755,100644..100644
--- 1/t/aclocal-acdir.sh
--- 2/t/aclocal-acdir.sh
+++ b/t/aclocal-acdir.sh

diff --cc t/aclocal-amflags.sh
index 10f0cb185d4aec7d7707ffda825900600cb5ee80,c712d96001908a2d4474c3c41a5114a6d48131f1..10f0cb185d4aec7d7707ffda825900600cb5ee80
mode 100755,100644..100644
--- 1/t/aclocal-amflags.sh
--- 2/t/aclocal-amflags.sh
+++ b/t/aclocal-amflags.sh

diff --cc t/aclocal-deleted-header-aclocal-amflags.sh
index 88c83e59ffa92e5aba574f90b34e0115d5ab60fc,e36315779b7d6aeaa77ef83623d85ea75b5a261b..88c83e59ffa92e5aba574f90b34e0115d5ab60fc
mode 100755,100644..100644
--- 1/t/aclocal-deleted-header-aclocal-amflags.sh
--- 2/t/aclocal-deleted-header-aclocal-amflags.sh
+++ b/t/aclocal-deleted-header-aclocal-amflags.sh

diff --cc t/aclocal-dirlist.sh
index a97256f7229eed0a6a93551d28bf0b710925178f,c8cf0a2ea1cec971361cb31fc4552d1b5536bbfc..a97256f7229eed0a6a93551d28bf0b710925178f
mode 100755,100644..100644
--- 1/t/aclocal-dirlist.sh
--- 2/t/aclocal-dirlist.sh
+++ b/t/aclocal-dirlist.sh

diff --cc t/aclocal-m4-include-are-scanned-aclocal-amflags.sh
index 233388ce70bf163a6bebcd111a313b105f3db4b9,4adf05c5917598f3d87884c70b5a738f638d772f..233388ce70bf163a6bebcd111a313b105f3db4b9
mode 100755,100644..100644
--- 1/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh
--- 2/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh
+++ b/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh

diff --cc t/aclocal-path-precedence.sh
index a4e9d08d9c049c3dfb2aa2e0ae4e535327335b6f,1d666dfb002ab407a59c81b4b6f1ce314eadbc4a..a4e9d08d9c049c3dfb2aa2e0ae4e535327335b6f
mode 100755,100644..100644
--- 1/t/aclocal-path-precedence.sh
--- 2/t/aclocal-path-precedence.sh
+++ b/t/aclocal-path-precedence.sh

diff --cc t/autodist-configure-no-subdir.sh
index d85d2703749ef7db318e96b56b3267ff31945a26,44f382570cf65f1984544d030b2e351ca69d9e4e..d85d2703749ef7db318e96b56b3267ff31945a26
mode 100755,100644..100644
--- 1/t/autodist-configure-no-subdir.sh
--- 2/t/autodist-configure-no-subdir.sh
+++ b/t/autodist-configure-no-subdir.sh

diff --cc t/backcompat6.sh
index e9e14cc0e04bd4395892d6f6c276f5a9f34ae244,d84ea97e1fd7337ddbd2860bbd8948687d3b317d..e9e14cc0e04bd4395892d6f6c276f5a9f34ae244
mode 100755,100644..100644
--- 1/t/backcompat6.sh
--- 2/t/backcompat6.sh
+++ b/t/backcompat6.sh

diff --cc t/dist-missing-m4.sh
index 411c40070fd1c51908a563ec489d138ddbadf5ab,fd8a68390eea765963465596f60b3d48736e742f..411c40070fd1c51908a563ec489d138ddbadf5ab
mode 100755,100644..100644
--- 1/t/dist-missing-m4.sh
--- 2/t/dist-missing-m4.sh
+++ b/t/dist-missing-m4.sh

diff --cc t/dist-shar.sh
index 5db0ade774653fe139da74b5d5c614fe214397a1,cd0442552fee08808e71e2fb6970b9e8c7d0286a..5db0ade774653fe139da74b5d5c614fe214397a1
mode 100755,100644..100644
--- 1/t/dist-shar.sh
--- 2/t/dist-shar.sh
+++ b/t/dist-shar.sh

diff --cc t/dist-tarZ.sh
index 03a813775be0df626f8a8f687d2d44f555550f92,f27648166a22c864ef171c4364662e2618190845..03a813775be0df626f8a8f687d2d44f555550f92
mode 100755,100644..100644
--- 1/t/dist-tarZ.sh
--- 2/t/dist-tarZ.sh
+++ b/t/dist-tarZ.sh

diff --cc t/gettext-macros.sh
index 5a932401250a941375a2311bf2d685825f2878a6,639a17263fab39d4a10373f74ecd350703ac80e8..5a932401250a941375a2311bf2d685825f2878a6
mode 100755,100644..100644
--- 1/t/gettext-macros.sh
--- 2/t/gettext-macros.sh
+++ b/t/gettext-macros.sh

diff --cc t/help.sh
index 85a0a1ae6dcec21bf96dad399e392e73b2455e18,e3c4e28ba82a14f7592b869844008423ddc80b95..85a0a1ae6dcec21bf96dad399e392e73b2455e18
mode 100755,100644..100644
--- 1/t/help.sh
--- 2/t/help.sh
+++ b/t/help.sh

diff --cc t/includes-deprecation.sh
index ec54359aece702cd348f5e03490f7ca715de58ec,2e834239af48b8302450f4662c858d1f66a24318..ec54359aece702cd348f5e03490f7ca715de58ec
mode 100755,100644..100644
--- 1/t/includes-deprecation.sh
--- 2/t/mkdir_p.sh
+++ b/t/includes-deprecation.sh

diff --cc t/libtool-macros.sh
index b9d328638a4fcb114774a20004c5126ccf99d3c0,1e1e95c8b7fe6b7ea565e78cd165bb5c71aab68c..b9d328638a4fcb114774a20004c5126ccf99d3c0
mode 100755,100644..100644
--- 1/t/libtool-macros.sh
--- 2/t/libtool-macros.sh
+++ b/t/libtool-macros.sh

diff --cc t/pluseq5.sh
index bbabebdaaecc5e0759f819f2e49ce03b89894426,7b16dbb0562488ca2a4ae6f71796ac95de7d886f..bbabebdaaecc5e0759f819f2e49ce03b89894426
mode 100755,100644..100644
--- 1/t/pluseq5.sh
--- 2/t/pluseq5.sh
+++ b/t/pluseq5.sh

diff --cc t/remake-deleted-m4-file.sh
index 756b6eda5031af938335867fd6d380929ce8dd59,18c481cc88263b9d751dbae2152c0e55715a76a8..756b6eda5031af938335867fd6d380929ce8dd59
mode 100755,100644..100644
--- 1/t/remake-deleted-m4-file.sh
--- 2/t/remake-deleted-m4-file.sh
+++ b/t/remake-deleted-m4-file.sh

diff --cc t/remake-gnulib-add-acsubst.sh
index 3ac3df1fca0952d7a177f5abefb60f951dfd1d2b,38dd38f3321c9c5607df4ce684652e58c4e5850d..3ac3df1fca0952d7a177f5abefb60f951dfd1d2b
mode 100755,100644..100644
--- 1/t/remake-gnulib-add-acsubst.sh
--- 2/t/remake-gnulib-add-acsubst.sh
+++ b/t/remake-gnulib-add-acsubst.sh

diff --cc t/remake-gnulib-add-header.sh
index fe7bc363553a1f024ca6e1db52ab624610bc2e17,82a08e2cf9cff7740a489817df55d50782344e17..fe7bc363553a1f024ca6e1db52ab624610bc2e17
mode 100755,100644..100644
--- 1/t/remake-gnulib-add-header.sh
--- 2/t/remake-gnulib-add-header.sh
+++ b/t/remake-gnulib-add-header.sh

diff --cc t/remake-gnulib-remove-header.sh
index bde1e4536f380fed34b65a510d5d9b2f83254947,15479a2f45e1f92adc72c438f1a1549fda2b7217..bde1e4536f380fed34b65a510d5d9b2f83254947
mode 100755,100644..100644
--- 1/t/remake-gnulib-remove-header.sh
--- 2/t/remake-gnulib-remove-header.sh
+++ b/t/remake-gnulib-remove-header.sh

diff --cc t/remake-moved-m4-file.sh
index 5d3eec81a5ec22dfc163e0d565a3736dd75502fc,e8b4ea19d9149d63f3945cad00cff2a584d2b3a8..5d3eec81a5ec22dfc163e0d565a3736dd75502fc
mode 100755,100644..100644
--- 1/t/remake-moved-m4-file.sh
--- 2/t/remake-moved-m4-file.sh
+++ b/t/remake-moved-m4-file.sh

diff --cc t/remake-renamed-m4-file.sh
index 4c49b44220aeda7cbe5a803e4433d8b5fe8fab05,6ca5afff984eeb628a3e67a61a98e8cdadd1d7dc..4c49b44220aeda7cbe5a803e4433d8b5fe8fab05
mode 100755,100644..100644
--- 1/t/remake-renamed-m4-file.sh
--- 2/t/remake-renamed-m4-file.sh
+++ b/t/remake-renamed-m4-file.sh

diff --cc t/remake-renamed-m4-macro-and-file.sh
index 6b09738ad96132e9df8f388b04ac8b42ef33bf46,9cd3bc995a763b2412e59a8f8389e67d5524ace0..6b09738ad96132e9df8f388b04ac8b42ef33bf46
mode 100755,100644..100644
--- 1/t/remake-renamed-m4-macro-and-file.sh
--- 2/t/remake-renamed-m4-macro-and-file.sh
+++ b/t/remake-renamed-m4-macro-and-file.sh

diff --cc t/remake-renamed-m4-macro.sh
index d149a5052bf2fd56da0c08049b6796c7f9460bac,f83c77685c9eee2090352525826d9a5145a4e0aa..d149a5052bf2fd56da0c08049b6796c7f9460bac
mode 100755,100644..100644
--- 1/t/remake-renamed-m4-macro.sh
--- 2/t/remake-renamed-m4-macro.sh
+++ b/t/remake-renamed-m4-macro.sh

diff --cc t/subobj11a.sh
index 15c704232681717311b827de77eb922009c2919a,2ff04b5678a87bfcb272b8c7287348c6bc36bb5e..15c704232681717311b827de77eb922009c2919a
mode 100755,100644..100644
--- 1/t/subobj11a.sh
--- 2/t/subobj11a.sh
+++ b/t/subobj11a.sh

diff --cc t/txinfo-makeinfo-error-no-clobber.sh
index c567e89f094ad7b4f3caf2d2efe432d2c0fff900,f4b7d01b1af879bf7529f4c0a9fea3c4cd963390..c567e89f094ad7b4f3caf2d2efe432d2c0fff900
mode 100755,100644..100644
--- 1/t/txinfo-makeinfo-error-no-clobber.sh
--- 2/t/txinfo-makeinfo-error-no-clobber.sh
+++ b/t/txinfo-makeinfo-error-no-clobber.sh

diff --cc t/txinfo-no-extra-dist.sh
index 245d3e02b74d52eaf98ccc512074424d3c8ebe15,aa7bec22cce0d15de933c9e70b05827b1c0b5841..245d3e02b74d52eaf98ccc512074424d3c8ebe15
mode 100755,100644..100644
--- 1/t/txinfo-no-extra-dist.sh
--- 2/t/txinfo-no-extra-dist.sh
+++ b/t/txinfo-no-extra-dist.sh

diff --cc t/warnings-obsolete-default.sh
index 80be4d11003aee434d922777625fcb9dc1c01c77,91055e3ce368e09248057e922ed091e3c3327580..80be4d11003aee434d922777625fcb9dc1c01c77
mode 100755,100644..100644
--- 1/t/warnings-obsolete-default.sh
--- 2/t/warnings-obsolete-default.sh
+++ b/t/warnings-obsolete-default.sh

diff --cc t/warnopts.sh
index f1c4c8c34264501b9cc26a55bcca6043185318cf,447357ab2e5b9af6d81ab205c4e03a825cae222f..f1c4c8c34264501b9cc26a55bcca6043185318cf
mode 100755,100644..100644
--- 1/t/warnopts.sh
--- 2/t/warnopts.sh
+++ b/t/warnopts.sh

diff --cc t/werror2.sh
index 963e11e077281d9a19bf53eab727260c9c8b5586,0d86953c1648992caa324757c407e8d1efda6a08..963e11e077281d9a19bf53eab727260c9c8b5586
mode 100755,100644..100644
--- 1/t/werror2.sh
--- 2/t/werror2.sh
+++ b/t/werror2.sh