[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.2-700-g0a7fabf

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=0a7fabf99ba53705ffbeb2b2917ba574857cac2a

The branch, ng/master has been updated
       via  0a7fabf99ba53705ffbeb2b2917ba574857cac2a (commit)
       via  f82210f345531325d3f7200197af6a12f4cd8ab5 (commit)
       via  115281f351a1b55811b627d313e041f56ba1148e (commit)
       via  77d61950a5a0c9ce760b9a5603ee2bd544adc3b4 (commit)
       via  d8d26befac77fd510a2415b2560fd16400d7d5e6 (commit)
      from  599ee404cde64c516c7c5041d099702eea2ea3c1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0a7fabf99ba53705ffbeb2b2917ba574857cac2a
Author: Stefano Lattarini <address@hidden>
Date:   Fri Jul 27 18:44:05 2012 +0200

    [ng] refactor: read 'serial-tests.am' more verbatim
    
    * lib/am/serial-tests.am: Adjust to use the "ifeq" built-in and
    the internal variable '$(am.conf.handle-exeext)' instead of the
    transform '%?HANDLE-EXEEXT%'.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit f82210f345531325d3f7200197af6a12f4cd8ab5
Author: Stefano Lattarini <address@hidden>
Date:   Fri Jul 27 16:33:08 2012 +0200

    [ng] check: use few more GNU make capabilities
    
    We can do so now that the 'parallel-tests.am' file is now
    processed "almost verbatim" by Automake.
    
    * lib/am/parallel-tests.am (check-TESTS): Here, use "ifeq" to check
    whether $(AM_LAZY_CHECK) is "yes".  This removes the need for ...
    (am__remove_if_not_lazy_check): ... this variable, which has thus
    been removed.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 115281f351a1b55811b627d313e041f56ba1148e
Author: Stefano Lattarini <address@hidden>
Date:   Fri Jul 27 16:19:47 2012 +0200

    [ng] check: prefer '#' over '##' for some comments
    
    * lib/am/parallel-tests.am: Here.  This will make it easier for someone
    reading the generated Makefile.in to understand what is going on.

commit 77d61950a5a0c9ce760b9a5603ee2bd544adc3b4
Author: Stefano Lattarini <address@hidden>
Date:   Fri Jul 27 16:13:01 2012 +0200

    [ng] cosmetics: remove a partly obsolete, partly redundant comment
    
    * lib/am/parallel-tests.am (recheck): Here.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit d8d26befac77fd510a2415b2560fd16400d7d5e6
Author: Stefano Lattarini <address@hidden>
Date:   Fri Jul 27 15:23:52 2012 +0200

    [ng] refactor: read 'parallel-tests.am' more verbatim
    
    * automake.in (handle_tests): Process 'parallel-tests.am' with
    '&almost_verbatim', not with '&file_contents'.  As a related
    change, we now *must* include 'color-tests.am' explicitly.
    * lib/am/parallel-tests.am: Related adjustments.  In particular,
    remove use of explicit '!' verbatim-escaping of some sections,
    and do not try to include 'color-tests.am'.
    * lib/am/serial-tests.am: Do not include 'color-tests.am'.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 automake.in              |   10 +---
 lib/am/parallel-tests.am |  127 ++++++++++++++++++++++------------------------
 lib/am/serial-tests.am   |    8 +--
 3 files changed, 67 insertions(+), 78 deletions(-)

diff --git a/automake.in b/automake.in
index 17ec3ab..4799dd6 100644
--- a/automake.in
+++ b/automake.in
@@ -4102,20 +4102,16 @@ sub handle_tests
   if (var ('TESTS'))
     {
       push (@check_tests, 'check-TESTS');
-
+      $output_rules .= file_contents ('color-tests', new Automake::Location);
       if (option 'serial-tests')
         {
-          $output_rules .=
-            file_contents ('serial-tests', new Automake::Location,
-                           CHECK_DEPS => "@check");
+          almost_verbatim ('serial-tests');
         }
       else
         {
          define_variable ('TEST_SUITE_LOG', INTERNAL, 'test-suite.log');
           require_conf_file ("parallel-tests", FOREIGN, 'test-driver');
-          $output_rules .=
-            file_contents ('parallel-tests', new Automake::Location,
-                           CHECK_DEPS => "@check");
+          almost_verbatim ('parallel-tests', 'CHECK-DEPS' => "@check");
        }
     }
 }
diff --git a/lib/am/parallel-tests.am b/lib/am/parallel-tests.am
index ac62fbc..bb4ce64 100644
--- a/lib/am/parallel-tests.am
+++ b/lib/am/parallel-tests.am
@@ -14,8 +14,6 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-include color-tests.am
-
 ## New parallel test driver.
 ##
 ## The first version of the code here was adapted from check.mk, which was
@@ -62,42 +60,42 @@ am.test-suite.runtest = \
   "$$tst"                                                              \
   $(AM_TESTS_FD_REDIRECT)
 
-## Turn e.g., ".test" in "_TEST", and return the empty string unchanged.
+# Turn e.g., ".test" in "_TEST", and return the empty string unchanged.
 am__tpfx = \
   $(if $1,$(call am.util.toupper,$(patsubst .%,%_,$1)))
 
-!define am.test-suite.handle-suffix
-!
-## FIXME: This will pick up the default from the environment; are we sure
-## FIXME: we want that?
-!$$(call am__tpfx,$1)LOG_DRIVER ?= $(SHELL) $(am.conf.aux-dir)/test-driver
-!
-!%.log %.trs: %$1 $$($$(call am__tpfx,$1)LOG_DEPENDENCIES)
-!      @$$(call am.test-suite.runtest,$$(call am__tpfx,$1))
-!
-!ifeq ($(am.conf.handle-exeext),yes)
-!ifdef EXEEXT
-!%.log %.trs: %$1$(EXEEXT) $$($$(call am__tpfx,$1)LOG_DEPENDENCIES)
-!      @$$(call am.test-suite.runtest,$$(call am__tpfx,$1))
-!endif # defined EXEEXT
-!endif # am.conf.handle-exeext = yes
-!
-!endef # am.test-suite.handle-suffix
-!
-## FIXME: this will pick up the default from the environment; are we sure
-## FIXME: we want that?
-!TEST_EXTENSIONS ?= .test
-!$(foreach e,$(filter-out .%,$(TEST_EXTENSIONS)),\
-!     $(call am.error,invalid test extension: '$e'))
-!$(foreach e,$(TEST_EXTENSIONS), \
-!  $(eval $(call am.test-suite.handle-suffix,$e)))
-## It is *imperative* that the "empty" suffix goes last.  Otherwise, a
-## declaration like "TESTS = all.test" would cause GNU make to mistakenly
-## try to build the 'all.log' and 'all.trs' files from a non-existent
-## 'all' program (because the Makefile contains an explicit 'all' target,
-## albeit .PHONY), rather than from the 'all.test' script, thus causing
-## all sort of mishaps and confusion.
-!$(eval $(call am.test-suite.handle-suffix))
+define am.test-suite.handle-suffix
+
+# FIXME: This will pick up the default from the environment; are we sure
+# FIXME: we want that?
+$$(call am__tpfx,$1)LOG_DRIVER ?= $(SHELL) $(am.conf.aux-dir)/test-driver
+
+%.log %.trs: %$1 $$($$(call am__tpfx,$1)LOG_DEPENDENCIES)
+       @$$(call am.test-suite.runtest,$$(call am__tpfx,$1))
+
+ifeq ($(am.conf.handle-exeext),yes)
+ifdef EXEEXT
+%.log %.trs: %$1$(EXEEXT) $$($$(call am__tpfx,$1)LOG_DEPENDENCIES)
+       @$$(call am.test-suite.runtest,$$(call am__tpfx,$1))
+endif # defined EXEEXT
+endif # am.conf.handle-exeext = yes
+
+endef # am.test-suite.handle-suffix
+
+# FIXME: this will pick up the default from the environment; are we sure
+# FIXME: we want that?
+TEST_EXTENSIONS ?= .test
+$(foreach e,$(filter-out .%,$(TEST_EXTENSIONS)),\
+     $(call am.error,invalid test extension: '$e'))
+$(foreach e,$(TEST_EXTENSIONS), \
+  $(eval $(call am.test-suite.handle-suffix,$e)))
+# It is *imperative* that the "empty" suffix goes last.  Otherwise, a
+# declaration like "TESTS = all.test" would cause GNU make to mistakenly
+# try to build the 'all.log' and 'all.trs' files from a non-existent
+# 'all' program (because the Makefile contains an explicit 'all' target,
+# albeit .PHONY), rather than from the 'all.test' script, thus causing
+# all sort of mishaps and confusion.
+$(eval $(call am.test-suite.handle-suffix))
 
 # The names of the given tests scripts with any possible registered
 # test extension removed, as well as any leading '$(srcdir)' component
@@ -280,8 +278,8 @@ am.test-suite.rst-title = { sed 's/.*/   &   
/;h;s/./=/g;p;x;s/ *$$//;p;g' && ec
 # These support runtime overriding of $(TESTS) and $(XFAIL_TESTS).
 # The first one must be left overridable (hence the definition with '?=',
 # because the 'recheck' target need to override  it (and in a tricky way).
-!am.test-suite.test-bases ?= \
-!  $(call am.memoize,am.test-suite.test-bases,$(call 
am.test-suite.get-test-bases,$(TESTS)))
+am.test-suite.test-bases ?= \
+  $(call am.memoize,am.test-suite.test-bases,$(call 
am.test-suite.get-test-bases,$(TESTS)))
 am.test-suite.xfail-test-bases = \
   $(call am.memoize,am.test-suite.xfail-test-bases,$(call 
am.test-suite.get-test-bases,$(XFAIL_TESTS)))
 
@@ -304,16 +302,16 @@ am.test-suite.append-to-list-of-bases = \
   @lst='$1'; for x in $$lst; do echo $$x; done \
     >> $(am.test-suite.workdir)/bases$(am.chars.newline)
 
-!define am.setup-test-harness-workdir
-!      @rm -rf $(am.test-suite.workdir)
-!      @$(MKDIR_P) $(am.test-suite.workdir)
-!      @touch $(am.test-suite.workdir)/bases
-!      $(call am.xargs-map,am.test-suite.append-to-list-of-bases, \
-!             $(am.test-suite.test-bases))
-!      @workdir='$(am.test-suite.workdir)' \
-!        && sed 's/$$/.log/' $$workdir/bases > $$workdir/logs \
-!        && sed 's/$$/.trs/' $$workdir/bases > $$workdir/trs
-!endef
+define am.setup-test-harness-workdir
+       @rm -rf $(am.test-suite.workdir)
+       @$(MKDIR_P) $(am.test-suite.workdir)
+       @touch $(am.test-suite.workdir)/bases
+       $(call am.xargs-map,am.test-suite.append-to-list-of-bases, \
+              $(am.test-suite.test-bases))
+       @workdir='$(am.test-suite.workdir)' \
+         && sed 's/$$/.log/' $$workdir/bases > $$workdir/logs \
+         && sed 's/$$/.trs/' $$workdir/bases > $$workdir/trs
+endef
 
 $(TEST_SUITE_LOG): $(am.test-suite.test-logs) $(am.test-suite.test-results)
        $(am.setup-test-harness-workdir)
@@ -423,12 +421,11 @@ am__mostlyclean_files += $(TEST_SUITE_LOG)
 ## Running all tests, or rechecking failures. ##
 ## ------------------------------------------ ##
 
-am__remove_if_not_lazy_check = \
-  $(if $(filter yes,$(AM_LAZY_CHECK)),,$(call am.clean-cmd.f,$1))
-
 check-TESTS:
-       @$(call am__remove_if_not_lazy_check,$(am.test-suite.test-results))
-       @$(call am__remove_if_not_lazy_check,$(am.test-suite.test-logs))
+ifneq ($(AM_LAZY_CHECK),yes)
+       @$(call am.clean-cmd.f, \
+               $(am.test-suite.test-results) $(am.test-suite.test-logs))
+endif
 ## We always have to remove TEST_SUITE_LOG, to ensure its rule is run
 ## in any case even in lazy mode: otherwise, if no test needs rerunning,
 ## or a prior run plus reruns all happen within the same timestamp (can
@@ -440,15 +437,13 @@ check-TESTS:
        $(MAKE) $(TEST_SUITE_LOG)
 .PHONY: check-TESTS
 
-## Recheck must depend on $(check_SCRIPTS), $(check_PROGRAMS), etc.
-## It must also depend on the 'all' target.  See automake bug#11252.
-recheck: all %CHECK_DEPS%
+# Recheck must depend on $(check_SCRIPTS), $(check_PROGRAMS), etc.
+# It must also depend on the 'all' target.  See automake bug#11252.
+recheck: all %CHECK-DEPS%
        +$(am.setup-test-harness-workdir)
 ## See comments above in the check-TESTS recipe for why remove
 ## $(TEST_SUITE_LOG) here.
        @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-## If running a "make recheck", we must only consider tests that had an
-## unexpected outcome (FAIL or XPASS) in the earlier run.
        @bases=`$(am.test-suite.list-tests-to-recheck) \
                  <$(am.test-suite.workdir)/bases` || exit 1; \
 ## Remove newlines and normalize whitespace.
@@ -459,14 +454,14 @@ recheck: all %CHECK_DEPS%
                  $(TEST_SUITE_LOG) .am/doing-recheck=yes
 .PHONY: recheck
 
-## One tricky requirement of the "recheck" target is that, in case (say)
-## the test is a compiled program whose compilation fails, we must ensure
-## that any '.log' and '.trs' file referring to such test are preserved,
-## so that future "make recheck" invocations will still try to re-compile
-## and re-run it (automake bug#11791).  This indirection is aimed at
-## satisfying such a requirement.
-!ifeq ($(.am/doing-recheck),yes)
-!$(am.test-suite.test-logs) $(am.test-suite.test-results): .am/nil
-!endif
+# One tricky requirement of the "recheck" target is that, in case (say)
+# the test is a compiled program whose compilation fails, we must ensure
+# that any '.log' and '.trs' file referring to such test are preserved,
+# so that future "make recheck" invocations will still try to re-compile
+# and re-run it (automake bug#11791).  This indirection is aimed at
+# satisfying such a requirement.
+ifeq ($(.am/doing-recheck),yes)
+$(am.test-suite.test-logs) $(am.test-suite.test-results): .am/nil
+endif
 
 AM_RECURSIVE_TARGETS += check recheck
diff --git a/lib/am/serial-tests.am b/lib/am/serial-tests.am
index c6d7089..592a796 100644
--- a/lib/am/serial-tests.am
+++ b/lib/am/serial-tests.am
@@ -14,19 +14,17 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-include color-tests.am
-
 ## Obsolescent serial testsuite driver.
 
-if %?HANDLE-EXEEXT%
+ifeq ($(am.conf.handle-exeext),yes)
 ## This is suboptimal, but we need to preserve the order of $(TESTS).
 am__check_cook_with_exeext_1 = \
     $(if $(filter $(am.all-progs), $1), $1$(EXEEXT), $1)
 am__check_cook_with_exeext = $(strip \
   $(if $(EXEEXT), $(foreach t, $1, $(call $(0)_1, $t)), $1))
-else !%?HANDLE-EXEEXT%
+else
 am__check_cook_with_exeext = $(strip $1)
-endif !%?HANDLE-EXEEXT%
+endif
 
 # TESTS can contain compiled programs, in which case we might have
 # to account for $(EXEEXT) appending.  For matching purposes, we


hooks/post-receive
-- 
GNU Automake