tests: more explicative names for few aclocal tests

* t/aclocal3.sh: Rename ...
* t/aclocal-missing-macros.sh: ... like this.
* t/aclocal4.sh: Rename ...
* t/aclocal-deps.sh: ... like this.
* t/aclocal5.sh: Rename ...
* t/aclocal-deps-subdir.sh: ... like this.
* t/aclocal6.sh: Rename ...
* t/aclocal-remake-misc.sh: ... like this.
* t/aclocal7.sh: Rename ...
* t/aclocal-no-force.sh: ... like this.
* t/acloca8.sh: Rename ...
* t/aclocal-no-unused-required.sh: ... like this.
* t/acloca9.sh: Rename ...
* t/aclocal-I-order-1.sh: ... like this.
* t/acloca11.sh: Rename ...
* t/aclocal-I-order-2.sh: ... like this, and update heading comments.
* t/acloca12.sh: Rename ...
* t/aclocal-I-order-3.sh: ... like this, and update heading comments.
* t/acloca13.sh: Rename ...
* t/aclocal-m4-sinclude.sh: ... like this, and update heading comments.
* t/acloca14.sh: Rename ...
* t/aclocal-m4-include-are-scanned.sh: ... like this.
* t/acloca14.sh: Rename ...
* t/aclocal-m4-include-are-scanned-aclocal-amflags.sh: ... like this,
and update heading comments.
* t/acloca15.sh: Rename ...
* t/aclocal-scan-configure-ac-pr319.sh: ... like this.
* t/acloca16.sh: Rename ...
* t/aclocal-no-extra-scan.sh: ... like this, and enhance slightly.
* t/acloca18.sh: Rename ...
* t/aclocal-serial.sh: ... like this.
* t/acloca19.sh: Rename ...
* t/aclocal-pr450.sh: ... like this.
* t/acloca20.sh: Rename ...
* t/aclocal-no-symlinked-overwrite.sh: ... like this.
* t/acloca21.sh: Rename ...
* t/aclocal-comments-respected.sh: ... like this.
* t/acloca22.sh: Rename ...
* t/aclocal-deleted-header.sh: ... like this.
* t/acloca22b.sh: Rename ...
* t/aclocal-deleted-header-aclocal-amflags.sh: ... like this.
* t/acloca23.sh: Rename ...
* t/aclocal-underquoted-defun.sh: ... like this.
* t/list-of-tests.mk: Update.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

22 files changed, 33 insertions, 30 deletions

diff --git a/t/aclocal9.sh b/t/aclocal-I-order-1.sh
index bcdecb022..bcdecb022 100755
--- a/t/aclocal9.sh
+++ b/t/aclocal-I-order-1.sh
diff --git a/t/acloca11.sh b/t/aclocal-I-order-2.sh
index f24d4edbd..721b8ec03 100755
--- a/t/acloca11.sh
+++ b/t/aclocal-I-order-2.sh
@@ -16,6 +16,7 @@
 
 # Make sure that when two files define the same macro in the same
 # directory, the macro from the lexically greatest file is used.
+# See also sister test 'aclocal-I-ordering-2.sh'.
 
 am_create_testdir=empty
 . test-init.sh
diff --git a/t/acloca12.sh b/t/aclocal-I-order-3.sh
index d0d4016b6..c98841bf7 100755
--- a/t/acloca12.sh
+++ b/t/aclocal-I-order-3.sh
@@ -16,7 +16,7 @@
 
 # Make sure that when two files define the same macro in the same
 # directory, the macro from the lexically greatest file is used.
-# Same as acloca11.sh, but without calling MACRO2.
+# Same as acloca-I-ordering.sh, but without calling MACRO2.
 
 am_create_testdir=empty
 . test-init.sh
diff --git a/t/acloca21.sh b/t/aclocal-comments-respected.sh
index 812f99b21..812f99b21 100755
--- a/t/acloca21.sh
+++ b/t/aclocal-comments-respected.sh
diff --git a/t/acloca22b.sh b/t/aclocal-deleted-header-aclocal-amflags.sh
index f2806991b..ea47635c0 100755
--- a/t/acloca22b.sh
+++ b/t/aclocal-deleted-header-aclocal-amflags.sh
@@ -17,7 +17,8 @@
 # Make sure the "deleted header file" issue is fixed wrt. aclocal.m4
 # dependencies.
 # NOTE: this test works by using the obsolete 'ACLOCAL_AMFLAGS' make
-# variable; see sister test 'acloca22.test' for a modern equivalent.
+# variable; see sister test 'aclocal-deleted-header.sh' for a modern
+# equivalent.
 
 . test-init.sh
 
diff --git a/t/acloca22.sh b/t/aclocal-deleted-header.sh
index 1faf21228..1faf21228 100755
--- a/t/acloca22.sh
+++ b/t/aclocal-deleted-header.sh
diff --git a/t/aclocal5.sh b/t/aclocal-deps-subdir.sh
index 947311475..947311475 100755
--- a/t/aclocal5.sh
+++ b/t/aclocal-deps-subdir.sh
diff --git a/t/aclocal4.sh b/t/aclocal-deps.sh
index 3e77d9e06..3e77d9e06 100755
--- a/t/aclocal4.sh
+++ b/t/aclocal-deps.sh
diff --git a/t/acloca14b.sh b/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh
index 31a05409b..31a05409b 100755
--- a/t/acloca14b.sh
+++ b/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh
diff --git a/t/acloca14.sh b/t/aclocal-m4-include-are-scanned.sh
index c84023d72..c84023d72 100755
--- a/t/acloca14.sh
+++ b/t/aclocal-m4-include-are-scanned.sh
diff --git a/t/acloca13.sh b/t/aclocal-m4-sinclude.sh
index cb4c8f695..cb4c8f695 100755
--- a/t/acloca13.sh
+++ b/t/aclocal-m4-sinclude.sh
diff --git a/t/aclocal3.sh b/t/aclocal-missing-macros.sh
index ce93251da..ce93251da 100755
--- a/t/aclocal3.sh
+++ b/t/aclocal-missing-macros.sh
diff --git a/t/acloca16.sh b/t/aclocal-no-extra-scan.sh
index 8387439d7..34f66b191 100755
--- a/t/acloca16.sh
+++ b/t/aclocal-no-extra-scan.sh
@@ -21,6 +21,7 @@ am_create_testdir=empty
 . test-init.sh
 
 cat > configure.ac << 'END'
+AC_INIT([x], [0])
 AC_SUBST([POM])
 END
 
@@ -31,6 +32,6 @@ AC_DEFUN([AM_SOME_MACRO],
 EOF
 
 $ACLOCAL -I m4
-grep m4/some.m4 aclocal.m4 && exit 1
+$EGREP 'some.m4|GREPME' aclocal.m4 && exit 1
 
 :
diff --git a/t/aclocal7.sh b/t/aclocal-no-force.sh
index 9f246143e..9f246143e 100755
--- a/t/aclocal7.sh
+++ b/t/aclocal-no-force.sh
diff --git a/t/acloca20.sh b/t/aclocal-no-symlinked-overwrite.sh
index c381dd78f..c381dd78f 100755
--- a/t/acloca20.sh
+++ b/t/aclocal-no-symlinked-overwrite.sh
diff --git a/t/aclocal8.sh b/t/aclocal-no-unused-required.sh
index 9f2d1db81..9f2d1db81 100755
--- a/t/aclocal8.sh
+++ b/t/aclocal-no-unused-required.sh
diff --git a/t/acloca19.sh b/t/aclocal-pr450.sh
index 502bc6979..502bc6979 100755
--- a/t/acloca19.sh
+++ b/t/aclocal-pr450.sh
diff --git a/t/aclocal6.sh b/t/aclocal-remake-misc.sh
index 97b748243..97b748243 100755
--- a/t/aclocal6.sh
+++ b/t/aclocal-remake-misc.sh
diff --git a/t/acloca15.sh b/t/aclocal-scan-configure-ac-pr319.sh
index 4ce34abba..4ce34abba 100755
--- a/t/acloca15.sh
+++ b/t/aclocal-scan-configure-ac-pr319.sh
diff --git a/t/acloca18.sh b/t/aclocal-serial.sh
index 2e1cbb5fe..2e1cbb5fe 100755
--- a/t/acloca18.sh
+++ b/t/aclocal-serial.sh
diff --git a/t/acloca23.sh b/t/aclocal-underquoted-defun.sh
index 071ddae33..071ddae33 100755
--- a/t/acloca23.sh
+++ b/t/aclocal-underquoted-defun.sh
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 2b1915056..40e350506 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -72,44 +72,44 @@ t/get-sysconf.sh \
 $(perl_TESTS) \
 t/instspc.tap \
 t/aclocal.sh \
-t/aclocal3.sh \
-t/aclocal4.sh \
-t/aclocal5.sh \
-t/aclocal6.sh \
-t/aclocal7.sh \
-t/aclocal8.sh \
-t/aclocal9.sh \
 t/acloca10.sh \
-t/acloca11.sh \
-t/acloca12.sh \
-t/acloca13.sh \
-t/acloca14.sh \
-t/acloca14b.sh \
-t/acloca15.sh \
-t/acloca16.sh \
-t/acloca18.sh \
-t/acloca19.sh \
-t/acloca20.sh \
-t/acloca21.sh \
-t/acloca22.sh \
-t/acloca22b.sh \
-t/acloca23.sh \
+t/aclocal-I-order-1.sh \
+t/aclocal-I-order-2.sh \
+t/aclocal-I-order-3.sh \
 t/aclocal-acdir.sh \
+t/aclocal-amflags.sh \
+t/aclocal-autoconf-version-check.sh \
+t/aclocal-comments-respected.sh \
+t/aclocal-deleted-header-aclocal-amflags.sh \
+t/aclocal-deleted-header.sh \
+t/aclocal-deps-subdir.sh \
+t/aclocal-deps.sh \
 t/aclocal-install-absdir.sh \
+t/aclocal-install-fail.sh \
+t/aclocal-install-mkdir.sh \
+t/aclocal-m4-include-are-scanned-aclocal-amflags.sh \
+t/aclocal-m4-include-are-scanned.sh \
+t/aclocal-m4-sinclude.sh \
 t/aclocal-macrodir.tap \
 t/aclocal-macrodirs.tap \
-t/aclocal-amflags.sh \
-t/aclocal-print-acdir.sh \
+t/aclocal-missing-macros.sh \
+t/aclocal-no-extra-scan.sh \
+t/aclocal-no-force.sh \
+t/aclocal-no-install-no-mkdir.sh \
+t/aclocal-no-symlinked-overwrite.sh \
+t/aclocal-no-unused-required.sh \
 t/aclocal-path.sh \
 t/aclocal-path-install.sh \
 t/aclocal-path-install-serial.sh \
 t/aclocal-path-nonexistent.sh \
 t/aclocal-path-precedence.sh \
-t/aclocal-install-fail.sh \
-t/aclocal-install-mkdir.sh \
-t/aclocal-no-install-no-mkdir.sh \
+t/aclocal-pr450.sh \
+t/aclocal-print-acdir.sh \
+t/aclocal-remake-misc.sh \
+t/aclocal-scan-configure-ac-pr319.sh \
+t/aclocal-serial.sh \
+t/aclocal-underquoted-defun.sh \
 t/aclocal-verbose-install.sh \
-t/aclocal-autoconf-version-check.sh \
 t/ac-output-old.tap \
 t/acsilent.sh \
 t/acsubst.sh \