From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 6 May 2012 09:24:28 +0000 (+0200)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=159606fdc45e00fb976f5ac0104ccd46ce94274a;p=thirdparty%2Fautomake.git

Merge branch 'master' into ng/master

* master:
  m4: prepend m4 builtins with "m4_"
  require: autoconf >= 2.65; related simplifications
  docs: fix clumsy grammar in the scripts-based testsuite chapter
  tests: use append mode to capture parallel make output
  parallel-tests: separate different logs with an empty line

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

159606fdc45e00fb976f5ac0104ccd46ce94274a
diff --cc lib/am/check.am
index f158e1611,9cda82aba..8d5aa403e
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@@ -174,16 -153,15 +174,17 @@@ BEGIN { exit_status = 0; } 
        while ((rc = (getline line < ($$0 ".log"))) != 0) \
        { \
          if (rc < 0) \
 -          fatal("failed to read from " $$0 ".log"); \
 +          input_error($$0 ".log"); \
          print line; \
        }; \
+       printf "\n"; \
      }; \
 -## Don't leak open file descriptors, as this could cause serious
 -## problems when there are many tests (yes, even on Linux).
 -  close ($$0 ".trs"); \
 -  close ($$0 ".log"); \
 +  close_current(); \
 +} \
 +END { \
 +  if (exit_status != 0) \
 +    error("fatal: making $@: I/O error reading test results"); \
 +  exit(exit_status); \
  }'
  
  # Restructured Text title.
diff --cc syntax-checks.mk
index 10e1fcf9a,f8d9f8650..86a1faef8
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@@ -39,9 -39,8 +39,8 @@@ ams := $(shell find $(srcdir) -name '*.
  # guaranteed to work on my machine.
  syntax_check_rules = \
  $(sc_tests_plain_check_rules) \
- sc_test_names \
  sc_diff_automake_in_automake \
 -sc_diff_aclocal_in_automake \
 +sc_diff_aclocal_in_aclocal \
  sc_perl_syntax \
  sc_no_brace_variable_expansions \
  sc_rm_minus_f \
diff --cc t/parallel-tests3.sh
index 151580f6e,98467e6ae..e5063c72f
--- a/t/parallel-tests3.sh
+++ b/t/parallel-tests3.sh
@@@ -66,13 -87,12 +66,12 @@@ for build in serial parallel; d
  done
  
  cd serial
 -$MAKE ${j}1 check &
 +$MAKE -j1 check &
  cd ../parallel
  $sleep
- # Use append mode here to avoid dropping output.
- # Yes, this actually happens.
- : >stdout
+ # Use append mode here to avoid dropping output.  See automake bug#11413.
+ : > stdout
 -$MAKE ${j}4 check >> stdout
 +$MAKE -j4 check >> stdout
  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