From: Stefano Lattarini Date: Thu, 8 Sep 2011 14:06:40 +0000 (+0200) Subject: cosmetic: rename gen-tests-deps -> gen-testsuite-part X-Git-Tag: ng-0.5a~89^2~66 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03f4a090c023339ed268e5c13c3fab00c37fdb36;p=thirdparty%2Fautomake.git 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 4c15e57bb..9ed2a3c6a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2011-09-08 Stefano Lattarini + + 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 testsuite: revamp generation of autogenerated tests diff --git a/bootstrap b/bootstrap index 7b3f76f63..4c8fcd2fb 100755 --- 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 bb5f7e999..7b04f170d 100644 --- 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 21c9c151e..fe6ad55ba 100644 --- 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 25df95f5b..91ace71c7 100644 --- 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