From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 16 Jul 2012 09:27:35 +0000 (+0200)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c38a39baa41230085dbe5b135055e4bef13267b9;p=thirdparty%2Fautomake.git

Merge branch 'master' into ng/master

* master: (23 commits)
  fixup: delete "# serial" line in m4/amversion.in
  news: update about recent ylwrap changes and fixes
  m4: get rid of "# serial" lines
  configure: ${#param} must be supported by the shell for the testsuite
  yacc tests: fix a spurious failure with parallel make
  ylwrap: use proper quoting inside a `...` substitution
  ylwrap: don't uselessly reset the exit status in case of failure
  ylwrap: fix C++ support for Bison
  ylwrap: refactor: move loop invariant
  ylwrap: refactoring: don't rely on the file order
  tests: upgrade and fix Bison test case
  tests: fix bison input file
  ylwrap: comment changes
  ylwrap: modernize idioms
  ylwrap: rename header inclusion in generated parsers
  ylwrap: simplify the list of renamings
  ylwrap: refactor: less duplication
  news: mention fixed testsuite weaknesses
  news: bump, for future 1.12.3
  tests: verify the shell test scripts are syntactically valid
  tests: don't use C instead of C++ compiler on case-insensitive platforms
  tests: avoid spurious TAP errors on Mac OS X 10.7
  tests: fix spurious failure in aclocal7.sh on fast machines

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

c38a39baa41230085dbe5b135055e4bef13267b9
diff --cc Makefile.am
index e0c10424a,a5332d373..2d9101711
--- a/Makefile.am
+++ b/Makefile.am
@@@ -436,6 -426,45 +436,41 @@@ check-no-repeated-test-name
  check-local: check-no-repeated-test-name
  .PHONY: check-no-repeated-test-name
  
+ # Check that our test cases are syntactically correct.
+ # See automake bug#11898.
+ check-tests-syntax:
+ 	@st=0; \
+ 	err () { echo "$@: $$*" >&2; st=1; }; \
+ ## The user might do something like "make check TESTS=t/foo" or
+ ## "make check TESTS_LOGS=t/foo.log" and expect (say) the test
+ ## 't/foo.sh' to be run; this has worked well until today, and
+ ## we want to continue supporting this use case.
+ 	bases=`for log in : $(TEST_LOGS); do echo $$log; done \
+ 	  | sed -e '/^:$$/d' -e 's/\.log$$//'`; \
+ 	for bas in $$bases; do \
+ 	  for suf in sh tap pl; do \
+ 	    tst=$$bas.$$suf; \
+ ## Emulate VPATH search.
+ 	    if test -f $$tst; then \
+ 	      break; \
+ 	    elif test -f $(srcdir)/$$tst; then \
+ 	      tst=$(srcdir)/$$tst; \
+ 	      break; \
+ 	    else \
+ 	      tst=''; \
+ 	    fi; \
+ 	  done; \
+ 	  test -n "$$tst" || err "couldn't find test '$$bas'"; \
+ ## Don't check that perl tests are valid shell scripts!
+ 	  test $$suf = pl && continue; \
+ 	  $(AM_V_P) && echo " $(AM_TEST_RUNNER_SHELL) -n $$tst"; \
+ 	  $(AM_TEST_RUNNER_SHELL) -n "$$tst" \
+ 	    || err "test '$$tst' syntactically invalid"; \
+ 	done; \
+ 	exit $$st
+ check-local: check-tests-syntax
+ .PHONY: check-tests-syntax
+ 
 -## Checking the list of tests.
 -test_subdirs = t t/pm t/perf contrib/t
 -include $(srcdir)/t/CheckListOfTests.am
 -
  # Run the testsuite with the installed aclocal and automake.
  installcheck-local: installcheck-testsuite
  installcheck-testsuite:
diff --cc lib/ylwrap
index 3911cb0d7,7befa46de..867b99f0d
--- a/lib/ylwrap
+++ b/lib/ylwrap
@@@ -25,10 -25,41 +25,41 @@@ scriptversion=2012-07-14.08; # UT
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that program.
  
 -# This file is maintained in Automake, please report
 +# This file is maintained in Automake-NG, please report
  # bugs to <bug-automake@gnu.org> or send patches to
 -# <automake-patches@gnu.org>.
 +# <automake-ng@gnu.org>.
  
+ get_dirname ()
+ {
+   case $1 in
+     */*|*\\*) printf '%s\n' "$1" | sed -e 's|\([\\/]\)[^\\/]*$|\1|';;
+     # Otherwise,  we want the empty string (not ".").
+   esac
+ }
+ 
+ # guard FILE
+ # ----------
+ # The CPP macro used to guard inclusion of FILE.
+ guard()
+ {
+   printf '%s\n' "$from" \
+     | sed \
+         -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
+         -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'
+ }
+ 
+ # quote_for_sed [STRING]
+ # ----------------------
+ # Return STRING (or stdin) quoted to be used as a sed pattern.
+ quote_for_sed ()
+ {
+   case $# in
+     0) cat;;
+     1) printf '%s\n' "$1";;
+   esac \
+     | sed -e 's|[][\\.*]|\\&|g'
+ }
+ 
  case "$1" in
    '')
      echo "$0: No files given.  Try '$0 --help' for more information." 1>&2
diff --cc m4/substnot.m4
index 22a2612e3,1830e796d..d86585a59
--- a/m4/substnot.m4
+++ b/m4/substnot.m4
@@@ -5,12 -5,10 +5,10 @@@
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
  
- # serial 3
- 
  # _AM_SUBST_NOTMAKE(VARIABLE)
  # ---------------------------
 -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
 -# This macro is traced by Automake.
 +# Prevent Automake-NG from outputting VARIABLE = @VARIABLE@ in Makefile.in.
 +# This macro is traced by Automake-NG.
  AC_DEFUN([_AM_SUBST_NOTMAKE])
  
  # AM_SUBST_NOTMAKE(VARIABLE)