[Automake-commit] [SCM] GNU Automake branch, experimental/ng/parallel-tests, updated. v1.12-198-g66ec87f

[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=66ec87fa417f599a0340bccae2d5f75365a33792

The branch, experimental/ng/parallel-tests has been updated
       via  66ec87fa417f599a0340bccae2d5f75365a33792 (commit)
       via  2fdef6eb77aaff9df84d16fd3ed45ae1e4112599 (commit)
      from  77bd27ab19e0dab21c5dd8f0294a110940c3e3f9 (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 66ec87fa417f599a0340bccae2d5f75365a33792
Author: Stefano Lattarini <address@hidden>
Date:   Mon May 7 20:28:09 2012 +0200

    parallel-tests: minor refactoring (make time over recipe time)
    
    No semantic change intended.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 2fdef6eb77aaff9df84d16fd3ed45ae1e4112599
Author: Stefano Lattarini <address@hidden>
Date:   Mon May 7 20:12:17 2012 +0200

    parallel-tests: minor refactoring (reorder code)
    
    This is a pure code movement; no semantic change is intended.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 lib/am/check.am       |   40 ----------------------------------------
 lib/am/check2.am      |   46 +++++++++++++++++++++++++++++++++-------------
 lib/am/header-vars.am |    5 +++++
 3 files changed, 38 insertions(+), 53 deletions(-)

diff --git a/lib/am/check.am b/lib/am/check.am
index 8741a5c..dac8027 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -194,46 +194,6 @@ END { \
 # Restructured Text title.
 am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
 
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Executes the developer-defined
-# test setup AM_TESTS_ENVIRONMENT (if any), and passes TESTS_ENVIRONMENT.
-# Set up options for the wrapper that will run the test scripts (or their
-# associated LOG_COMPILER, if they have one).
-am__check_pre =                                                \
-$(am__sh_e_setup);                                     \
-$(am__tty_colors);                                     \
-srcdir=$(srcdir); export srcdir;                       \
-test x$(@D) = x. || test -d $(@D) || $(MKDIR_P) $(@D) || exit $$?; \
-f='$(patsubst $(srcdir)/%,%,$<)';                      \
-## We need to invoke the test in way that won't cause a PATH search.
-## Quotes around '$<' are required to avoid extra errors when a circular
-## dependency is detected (e.g., because $(TEST_SUITE_LOG) is in
-## $(TEST_LOGS)), because in that case '$<' expands to empty and an
-## unquote usage of it could cause syntax errors in the shell.
-case '$<' in */*) tst='$<';; *) tst=./'$<';; esac;     \
-if test -n '$(DISABLE_HARD_ERRORS)'; then              \
-  am__enable_hard_errors=no;                           \
-else                                                   \
-  am__enable_hard_errors=yes;                          \
-fi;                                                    \
-f2='$(patsubst $(srcdir)/%,%,$*)';                     \
-case " $(am__xfail_test_bases) " in                    \
-  *" $$f2 "*) am__expect_failure=yes;;                 \
-           *) am__expect_failure=no;;                  \
-esac;                                                  \
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-
 # This supports runtime overriding of $(TESTS) and $(XFAIL_TESTS).
 am__test_bases       = $(call am__get_test_bases, $(TESTS))
 am__xfail_test_bases = $(call am__get_test_bases, $(XFAIL_TESTS))
diff --git a/lib/am/check2.am b/lib/am/check2.am
index a9a4a47..4448780 100644
--- a/lib/am/check2.am
+++ b/lib/am/check2.am
@@ -15,21 +15,41 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 if %?FIRST%
+
+am__is_xfail_test = \
+  $(if $(filter $(am__xfail_test_bases),\
+                $(patsubst $(srcdir)/%,%,$(1))),yes,no)
 am__runtest = \
-  $(am__check_pre) \
-  $($(1)LOG_DRIVER) \
-  --test-name "$$f" \
-  --log-file $*.log \
-  --trs-file $*.trs \
-  $(am__common_driver_flags) \
-  $(AM_$(1)LOG_DRIVER_FLAGS) \
-  $($(1)LOG_DRIVER_FLAGS) \
-  -- \
-  $($(1)LOG_COMPILER) \
-  $(AM_$(1)LOG_FLAGS) \
-  $($(1)LOG_FLAGS) \
-  "$$tst" \
+  $(am__sh_e_setup);                                                   \
+  $(am__tty_colors);                                                   \
+  srcdir=$(srcdir); export srcdir;                                     \
+## Creates the directory for the log if needed.
+  test x$(@D) = x. || test -d $(@D) || $(MKDIR_P) $(@D) || exit $$?;   \
+## We need to invoke the test in way that won't cause a PATH search.
+## Quotes around '$<' are required to avoid extra errors when a circular
+## dependency is detected (e.g., because $(TEST_SUITE_LOG) is in
+## $(TEST_LOGS)), because in that case '$<' expands to empty and an
+## unquote usage of it could cause syntax errors in the shell.
+  case '$<' in */*) tst='$<';; *) tst=./'$<';; esac;                   \
+## Executes the developer-defined and user-defined test
+## setups (if any), in that order.
+  $(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)                         \
+  $($(1)LOG_DRIVER)                                                    \
+  --test-name '$(patsubst $(srcdir)/%,%,$<)'                           \
+  --log-file $*.log                                                    \
+  --trs-file $*.trs                                                    \
+  --color-tests "$$am__color_tests"                                    \
+  --enable-hard-errors $(if $(DISABLE_HARD_ERRORS),yes,no)             \
+  --expect-failure $(call am__is_xfail_test,$*)                                
\
+  $(AM_$(1)LOG_DRIVER_FLAGS)                                           \
+  $($(1)LOG_DRIVER_FLAGS)                                              \
+  --                                                                   \
+  $($(1)LOG_COMPILER)                                                  \
+  $(AM_$(1)LOG_FLAGS)                                                  \
+  $($(1)LOG_FLAGS)                                                     \
+  "$$tst"                                                              \
   $(AM_TESTS_FD_REDIRECT)
+
 endif %?FIRST%
 
 ## From a test file to a .log and .trs file.
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index 1d6571c..7509148 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -16,6 +16,11 @@
 
 VPATH = @srcdir@
 
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+
 ## Emulate VPATH rewrites.  This uses only GNU make primitives, which
 ## allows us to avoid extra forks.
 am__vpath_rewrite = \


hooks/post-receive
-- 
GNU Automake