cosmetic: rename gen-tests-deps -> gen-testsuite-part

* tests/gen-tests-deps: Renamed ...
* tests/gen-testsuite-part: ... to this.
* bootstrap: Update.
* tests/Makefile.am ($(srcdir)/tests-deps.am): Don't generate
nor include this ...
($(srcdir)/testsuite-part.am): ... do with this instead.
* tests/.gitignore (tests-deps.am): Don't ignore this ...
(testsuite-part.am): ... ignore this instead.

diff --git a/ChangeLog b/ChangeLog
index 4c15e57bbef02aad0468ab19ffcf819a1fc57402..9ed2a3c6a8aed49c7331586b3b138a02324d5822 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-09-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       cosmetic: rename gen-tests-deps -> gen-testsuite-part
+       * tests/gen-tests-deps: Renamed ...
+       * tests/gen-testsuite-part: ... to this.
+       * bootstrap: Update.
+       * tests/Makefile.am ($(srcdir)/tests-deps.am): Don't generate
+       nor include this ...
+       ($(srcdir)/testsuite-part.am): ... do with this instead.
+       * tests/.gitignore (tests-deps.am): Don't ignore this ...
+       (testsuite-part.am): ... ignore this instead.
+
 2011-09-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        testsuite: revamp generation of autogenerated tests

diff --git a/bootstrap b/bootstrap
index 7b3f76f6310111a874624d12d442877e9134d5be..4c8fcd2fb3af61846a240f83a0e8e7393e12b8c6 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -105,9 +105,9 @@ dosubst automake.in automake.tmp
 
 # Create required makefile snippets.
 cd tests
-$PERL ./gen-tests-deps > tests-deps.tmp
-chmod a-w tests-deps.tmp
-mv -f tests-deps.tmp tests-deps.am
+$PERL ./gen-testsuite-part > testsuite-part.tmp
+chmod a-w testsuite-part.tmp
+mv -f testsuite-part.tmp testsuite-part.am
 cd ..
 
 # Run the autotools.

diff --git a/tests/.gitignore b/tests/.gitignore
index bb5f7e9993a6379303b77c8666cf180892301043..7b04f170db2808aaa78a7138ca018ce599aabf0b 100644 (file)
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,7 +1,7 @@
 /aclocal-*
 /automake-*
 /defs-static
-/tests-deps.am
+/testsuite-part.am
 /*-w.tap
 /*-w.test
 /*.dir

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 21c9c151ec3e0f1b87cc6cc39f90e514bf836a5f..fe6ad55ba0103dc41b532e1616ada9b9c938971b 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -80,20 +80,21 @@ EXTRA_DIST += $(handwritten_TESTS)
 # Automatically-generated tests wrapping hand-written ones.
 # Also, automatically-computed dependencies for tests.
 
-include $(srcdir)/tests-deps.am
+include $(srcdir)/testsuite-part.am
 
 TESTS += $(generated_TESTS)
 EXTRA_DIST += $(generated_TESTS)
 
-$(srcdir)/tests-deps.am:
-       $(AM_V_at)rm -f tests-deps.tmp $@
-       $(AM_V_GEN)$(PERL) $(srcdir)/gen-tests-deps --srcdir $(srcdir) \
-                    > tests-deps.tmp
-       $(AM_V_at)chmod a-w tests-deps.tmp && mv -f tests-deps.tmp $@
-EXTRA_DIST += gen-tests-deps
+$(srcdir)/testsuite-part.am:
+       $(AM_V_at)rm -f testsuite-part.tmp $@
+       $(AM_V_GEN)$(PERL) $(srcdir)/gen-testsuite-part \
+         --srcdir $(srcdir) > testsuite-part.tmp
+       $(AM_V_at)chmod a-w testsuite-part.tmp
+       $(AM_V_at)mv -f testsuite-part.tmp $@
+EXTRA_DIST += gen-testsuite-part
 
-$(generated_TESTS) $(srcdir)/tests-deps.am: \
-  gen-tests-deps list-of-tests.mk Makefile.am $(handwritten_TESTS)
+$(generated_TESTS) $(srcdir)/testsuite-part.am: \
+  gen-testsuite-part list-of-tests.mk Makefile.am $(handwritten_TESTS)
 
 # Static dependencies valid for each test case.
 $(TEST_LOGS): defs defs-static aclocal-$(APIVERSION) automake-$(APIVERSION)

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 25df95f5b035fb1152fd8c0ea5f6189641a7b7a4..91ace71c70e68d895a12f176693d0df385655ec3 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -52,7 +52,7 @@ host_triplet = @host@
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(srcdir)/aclocal.in $(srcdir)/automake.in $(srcdir)/defs \
        $(srcdir)/defs-static.in $(srcdir)/list-of-tests.mk \
-       $(srcdir)/tests-deps.am $(top_srcdir)/CheckListOfTests.am
+       $(srcdir)/testsuite-part.am $(top_srcdir)/CheckListOfTests.am
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \
@@ -295,7 +295,7 @@ AM_TAP_LOG_DRIVER_FLAGS = --merge --comments --diagnostic-string \
 EXTRA_DIST = ChangeLog-old $(handwritten_TESTS) tap-summary-aux.sh \
        tap-setup.sh extract-testsuite-summary \
        testsuite-summary-checks.sh trivial-test-driver \
-       $(generated_TESTS) gen-tests-deps tap-functions.sh \
+       $(generated_TESTS) gen-testsuite-part tap-functions.sh \
        plain-functions.sh
 
 # Hand-written tests.
@@ -1491,7 +1491,7 @@ all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .html .log .tap .test .trs
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/list-of-tests.mk $(srcdir)/tests-deps.am $(top_srcdir)/CheckListOfTests.am $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/list-of-tests.mk $(srcdir)/testsuite-part.am $(top_srcdir)/CheckListOfTests.am $(am__configure_deps)
        @for dep in $?; do \
          case '$(am__configure_deps)' in \
            *$$dep*) \
@@ -2200,14 +2200,15 @@ tap-more2-w.log: tap-more2.log
 tap-recheck-w.log: tap-recheck.test
 tap-recheck-w.log: tap-recheck.log
 
-$(srcdir)/tests-deps.am:
-       $(AM_V_at)rm -f tests-deps.tmp $@
-       $(AM_V_GEN)$(PERL) $(srcdir)/gen-tests-deps --srcdir $(srcdir) \
-                    > tests-deps.tmp
-       $(AM_V_at)chmod a-w tests-deps.tmp && mv -f tests-deps.tmp $@
+$(srcdir)/testsuite-part.am:
+       $(AM_V_at)rm -f testsuite-part.tmp $@
+       $(AM_V_GEN)$(PERL) $(srcdir)/gen-testsuite-part \
+         --srcdir $(srcdir) > testsuite-part.tmp
+       $(AM_V_at)chmod a-w testsuite-part.tmp
+       $(AM_V_at)mv -f testsuite-part.tmp $@
 
-$(generated_TESTS) $(srcdir)/tests-deps.am: \
-  gen-tests-deps list-of-tests.mk Makefile.am $(handwritten_TESTS)
+$(generated_TESTS) $(srcdir)/testsuite-part.am: \
+  gen-testsuite-part list-of-tests.mk Makefile.am $(handwritten_TESTS)
 
 # Static dependencies valid for each test case.
 $(TEST_LOGS): defs defs-static aclocal-$(APIVERSION) automake-$(APIVERSION)

diff --git a/tests/gen-tests-deps b/tests/gen-testsuite-part
similarity index 100%
rename from tests/gen-tests-deps
rename to tests/gen-testsuite-part