[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.13.2-1056-g313db7c

[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=313db7c6a9ad24f059326cc43223056ca3814f23

The branch, ng/master has been updated
       via  313db7c6a9ad24f059326cc43223056ca3814f23 (commit)
       via  5178a2c72f23deea3e1e17a3bf029687a4eca97d (commit)
       via  ef098fa615d758dcae99ad546286abe0cb23e8a1 (commit)
       via  ac13ca500648395417e5d9bcf110475b42841bee (commit)
       via  d19eb85cc3fda93c0dd3df93a2c126dcae1de16a (commit)
       via  f859f346f66769dd6f66e472701d59fe6d88eda1 (commit)
      from  b757a99bd3c2d77c319bb7876f0ad324ac3b93a9 (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 313db7c6a9ad24f059326cc43223056ca3814f23
Author: Stefano Lattarini <address@hidden>
Date:   Fri May 24 13:38:18 2013 +0200

    maint: fix package name: it is "GNU Automake-NG", not "GNU Automake"
    
    The name was involuntarily changed in the merge commit
    'v1.13.1d-926-g9b18369' of 2013-05-07.
    
    * configure.ac (AC_INIT): Fix package name.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 5178a2c72f23deea3e1e17a3bf029687a4eca97d
Merge: b757a99 ef098fa
Author: Stefano Lattarini <address@hidden>
Date:   Fri May 24 13:37:56 2013 +0200

    Merge branch 'master' into ng/master
    
    * master:
      tests: use append mode to capture parallel make output
      tests: new convenience target 'check-parallel'
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 configure.ac                    |    2 +-
 t/Makefile.inc                  |    6 ++++
 t/ax/am-test-lib.sh             |   54 ++++++++++++++++++++++++++++----------
 t/lisp8.sh                      |   17 +++---------
 t/parallel-tests-concurrency.sh |    6 +---
 t/tap-more.sh                   |   15 +++--------
 6 files changed, 56 insertions(+), 44 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8f1bdcb..dc89ce1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.69])
-AC_INIT([GNU Automake], [1.99a], address@hidden)
+AC_INIT([GNU Automake-NG], [1.99a], address@hidden)
 
 AC_CONFIG_SRCDIR([bin/automake.in])
 AC_CONFIG_AUX_DIR([lib])
diff --git a/t/Makefile.inc b/t/Makefile.inc
index f43efd6..87763e0 100644
--- a/t/Makefile.inc
+++ b/t/Makefile.inc
@@ -270,6 +270,12 @@ check-cc-no-c-o:
        $(AM_V_GEN)$(MAKE) check AM_TESTSUITE_SIMULATING_NO_CC_C_O=yes
 .PHONY: check-cc-no-c-o
 
+# Automake-generated Makefiles should work when run with parallel make.
+check-parallel:
+       $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \
+         AM_TESTSUITE_MAKE="$${AM_TESTSUITE_MAKE-$${MAKE-make}} -j4"
+.PHONY: check-parallel
+
 # Run the testsuite with the installed aclocal and automake.
 installcheck-local: installcheck-testsuite
 installcheck-testsuite:
diff --git a/t/ax/am-test-lib.sh b/t/ax/am-test-lib.sh
index 903254e..a46576b 100644
--- a/t/ax/am-test-lib.sh
+++ b/t/ax/am-test-lib.sh
@@ -180,7 +180,9 @@ is_valid_varname ()
 #
 run_make ()
 {
-  am__make_redirect=
+  am__make_redirect_stdout=no
+  am__make_redirect_stderr=no
+  am__make_redirect_stdall=no
   am__make_flags=
   # Follow-up code might want to analyse these, so don't make them as
   # private, nor unset them later.
@@ -190,25 +192,50 @@ run_make ()
   while test $# -gt 0; do
     case $1 in
       -e) am_make_rc_exp=$2; shift;;
-      -O) am__make_redirect="$am__make_redirect >stdout";;
-      -E) am__make_redirect="$am__make_redirect 2>stderr";;
-      -M) am__make_redirect=">output 2>&1";;
+      -O) am__make_redirect_stdout=yes;;
+      -E) am__make_redirect_stderr=yes;;
+      -M) am__make_redirect_stdall=yes;;
       --) shift; break;;
        *) break;;
     esac
     shift
   done
 
-  eval "\$MAKE${am__make_redirect}"' ${1+"$@"}' || am_make_rc_got=$?
+  # In redirecting make output below, use append mode, to avoid
+  # dropping output.  See automake bug#11413 for details.
+  # The exit status of 253 is a more-or-less random choice, to
+  # help us catch possible errors in redirections and error out
+  # accordingly.
+  (
+    : exec $MAKE ${1+"$@"} # Display traces for future command.
+    set +x # We need to remove them now, not to pollute redirected stderr.
+    if test $am__make_redirect_stdall = yes; then
+      : > output && exec 1>>output 2>&1 || exit 253
+    else
+      if test $am__make_redirect_stdout = yes; then
+        : > stdout && exec 1>>stdout || exit 253
+      fi
+      if test $am__make_redirect_stderr = yes; then
+        : > stderr && exec 2>>stderr || exit 253
+      fi
+    fi
+    exec $MAKE ${1+"$@"}
+  ) || am_make_rc_got=$?
 
-  case $am__make_redirect in
-           *output*) cat output;;
-    *stderr*stdout*) cat stdout && cat stderr >&2;;
-    *stdout*stderr*) cat stdout && cat stderr >&2;;
-           *stdout*) cat stdout;;
-           *stderr*) cat stderr >&2;;
-  esac \
-    || fatal_ "displaying make output"
+  if test $am_make_rc_got -eq 253; then
+    fatal_ "run_make: problems in redirecting make output"
+  fi
+
+  if test $am__make_redirect_stdall = yes; then
+    cat output || fatal_ "displaying make output"
+  else
+    if test $am__make_redirect_stdout = yes; then
+      cat stdout || fatal_ "displaying make output"
+    fi
+    if test $am__make_redirect_stderr = yes; then
+      cat stderr >&2 || fatal_ "displaying make output"
+    fi
+  fi
 
   case $am_make_rc_exp in
     IGNORE)
@@ -223,7 +250,6 @@ run_make ()
      test $am_make_rc_exp -eq $am_make_rc_got || return 1
      ;;
   esac
-  unset am__make_redirect
 }
 
 # AUTOMAKE_run [-e STATUS] [-d DESCRIPTION] [--] [AUTOMAKE-ARGS...]
diff --git a/t/lisp8.sh b/t/lisp8.sh
index 3ea15c5..1014984 100644
--- a/t/lisp8.sh
+++ b/t/lisp8.sh
@@ -37,26 +37,17 @@ $AUTOCONF
 $AUTOMAKE --add-missing
 ./configure
 
-# Use append mode here to avoid dropping output.  See automake bug#11413.
-# TODO: port this to to run_make(), and rewrite this hunk to use that
-#       function ...
-: >stdout
-$MAKE -j >>stdout || { cat stdout; exit 1; }
-cat stdout
+run_make -O -- -j
 
 test -f am-one.elc
 test -f am-two.elc
 test -f am-three.elc
 
+# Delete ...
 rm -f am-*.elc
 
-# Use append mode here to avoid dropping output.  See automake bug#11413.
-# TODO: port this to to run_make(), and rewrite this hunk to use that
-#       function ...
-: >stdout
-$MAKE -j >>stdout || { cat stdout; exit 1; }
-cat stdout
-
+# ... and recover.
+run_make -O -- -j
 test -f am-one.elc
 test -f am-two.elc
 test -f am-three.elc
diff --git a/t/parallel-tests-concurrency.sh b/t/parallel-tests-concurrency.sh
index 235b9ee..df86f52 100644
--- a/t/parallel-tests-concurrency.sh
+++ b/t/parallel-tests-concurrency.sh
@@ -71,11 +71,7 @@ cd serial
 $MAKE -j1 check &
 cd ../parallel
 $sleep
-# Use append mode here to avoid dropping output.  See automake bug#11413.
-# TODO: port this to to run_make(), and rewrite this hunk to use that
-#       function ...
-: > stdout
-$MAKE -j4 check >> stdout
+run_make -O -- -j4 check
 cd ..
 # Ensure the tests are really being run in parallel mode: if this is
 # the case, the serial run of the dummy testsuite started above should
diff --git a/t/tap-more.sh b/t/tap-more.sh
index eed0f5e..39b452d 100644
--- a/t/tap-more.sh
+++ b/t/tap-more.sh
@@ -93,7 +93,6 @@ for try in 0 1; do
     mkdir build
     cd build
     srcdir=..
-    run_make=$MAKE
   elif test $try -eq 1; then
     # In-tree parallel build.
     srcdir=.
@@ -101,10 +100,10 @@ for try in 0 1; do
       *\ -j*)
         # Degree of parallelism already specified by the user: do
         # not override it.
-        run_make=$MAKE
+        :
         ;;
       *)
-        run_make="$MAKE -j3"
+        MAKE="$MAKE -j3"
         ;;
     esac
   else
@@ -116,10 +115,7 @@ for try in 0 1; do
 
   # Success.
 
-  # Use append mode here to avoid dropping output.  See automake bug#11413.
-  : >stdout
-  $run_make check >>stdout || { cat stdout; exit 1; }
-  cat stdout
+  run_make -O check
   count_test_results total=6 pass=4 fail=0 xpass=0 xfail=1 skip=1 error=0
   grep '^PASS: 1\.test 1 - mu$' stdout
   grep '^SKIP: 1\.test 2 zardoz # SKIP$' stdout
@@ -136,10 +132,7 @@ for try in 0 1; do
 
   : > not-skip
   : > bail-out
-  # Use append mode here to avoid dropping output.  See automake bug#11413.
-  : >stdout
-  $run_make check >>stdout && { cat stdout; exit 1; }
-  cat stdout
+  run_make -e FAIL -O check
   count_test_results total=7 pass=4 fail=1 xpass=0 xfail=1 skip=0 error=1
   grep '^PASS: 1\.test 1 - mu$' stdout
   grep '^FAIL: 1\.test 2 zardoz$' stdout


hooks/post-receive
-- 
GNU Automake