kc3-lang/automake/t/subst-no-trailing-empty-line.sh

• Show log

  Commit

• Hash : ffd4ecc9
  Author :
  Date : 2013-05-20T11:23:01
  

  tests: better idiom to override make macro defs on the cmdline
  
  We now do so with a new wrapper shell function 'run_make()', which
  relies on the use of AM_MAKEFLAGS, avoiding the use of the '-e' make
  option.  The use of that option (that causes the environment variables
  to take precedence over the macro definitions in the Makefile) has
  proved to be quite brittle in the past, causing annoying and sometimes
  problematic spurious failures.  This has worsened in some still
  unpublished work going on in development branches.  It's time to solve
  the issue once and for all.
  
  Note that we do not convert all uses of $MAKE in the testsuite right
  away; we might do so in follow-up changes, with leisure, to avoid a
  "patch bomb" effect (this commit is already too much of a bomb itself).
  What we do in this commit is to get rid of all "$MAKE -e" invocations.
  
  We admit that the implementation and feature-set of 'run_make()' are
  far from perfect, but good enough for our current purposes.  We'll
  improve 'run_make()' if and when the need arises.
  
  * syntax-checks.mk (sc_tests_no_make_e): New syntax check, guard against
  the use of "$MAKE -e".
  (syntax_check_rules): Add it.
  (sc_tests_overriding_macros_on_cmdline): Adjust.
  (lint): New, alias for 'maintainer-check', for lazy typists.  Idea
  backported from the 'maint' branch (Automake 1.13a).
  * t/ax/am-test-lib.sh (run_make): New function.  Run $MAKE with the
  given command-line arguments, handling command-line override of variable
  definitions in a smart way (using AM_MAKEFLAGS if a non-GNU make
  implementation is detected to be in use).
  (useless_vpath_rebuild): Adjust to use 'run_make', to avoid a spurious
  maintainer check failure.
  (yl_distcheck): Use 'run_make' rather than bare '$MAKE'.
  (single_quote, append_single_quoted, is_valid_varname): New auxiliary
  function, used, directly or indirectly, by it.
  * Many tests: Adjust to avoid the use of "$MAKE -e", and prefer the
  use of 'run_make' in few other contexts as well, where it makes sense.
  Other minor fixlets while at it.
  
  Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
  

Download

• t/subst-no-trailing-empty-line.sh

• #! /bin/sh
  # Copyright (C) 2003-2013 Free Software Foundation, Inc.
  #
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
  # the Free Software Foundation; either version 2, or (at your option)
  # any later version.
  #
  # This program is distributed in the hope that it will be useful,
  # but WITHOUT ANY WARRANTY; without even the implied warranty of
  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  # GNU General Public License for more details.
  #
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
  # If the last line of a automake-rewritten definition is made only of
  # @substitutions@, automake should take care of appending an empty
  # variable to make sure that line cannot end up substituted as a blank
  # line (that would confuse HP-UX Make).
  # These checks have been introduced in commit 'Release-1-9-254-g9d0eaef'
  # into the former test 'subst2.test'.
  
  . test-init.sh
  
  # These are deliberately quite long, so that the xxx_PROGRAMS definition
  # in Makefile.am below will be split on multiple lines, with the last
  # line containing only @substituted@ stuff that expands to empty (this is
  # required to expose the bug we are testing).
  v1=ABCDEFGHIJKLMNOPQRSTUVWX
  v2=ABCDEFGHIJKLMNOPQRSTUVWXY
  v3=ABCDEFGHIJKLMNOPQRSTUVWXYZ
  
  # Literal backslash for use by grep.
  bs='\\'
  
  cat >> configure.ac <<END
  AC_SUBST([A], [''])
  AC_SUBST([$v1], [''])
  AC_SUBST([$v2], [''])
  AC_SUBST([$v3], [''])
  AC_OUTPUT
  END
  
  cat >Makefile.am <<END
  AUTOMAKE_OPTIONS = no-dependencies
  CC = false
  EXEEXT =
  
  ## The "x" and "zardoz" strings and the use of '+=' are there to ensure
  ## that these variables get rewritten by Automake.
  noinst_PROGRAMS = x @$v1@ @$v2@ @$v3@
  bin_PROGRAMS = @A@
  bin_PROGRAMS += @$v1@ @$v2@ @$v3@
  check_PROGRAMS = zardoz \$(noinst_PROGRAMS)
  
  ## Required whenever there are @substituted@ values in the
  ## PROGRAMS primary, otherwise automake will complain.
  EXTRA_PROGRAMS =
  
  print-programs:
  	@echo BEG1: \$(noinst_PROGRAMS) :END1
  	@echo BEG2: \$(bin_PROGRAMS) :END2
  	@echo BEG3: \$(check_PROGRAMS) :END3
  END
  
  $ACLOCAL
  $AUTOCONF
  $AUTOMAKE
  # For debugging.
  $EGREP -n 'ABCD|am__empty' Makefile.in
  # Sanity check.
  test $($EGREP -c "^[ $tab]*@$v2@ @$v3@[ $tab]*$bs?$" Makefile.in) -eq 3
  
  ./configure
  {
    sed -n '/^noinst_PROGRAMS *=/,/[^\\]$/p' Makefile
    sed -n '/^bin_PROGRAMS *=/,/[^\\]$/p' Makefile
    sed -n '/^check_PROGRAMS *=/,/[^\\]$/p' Makefile
    sed -n '/^am__EXEEXT.*=/,/[^\\]$/p' Makefile
  } >t-programs
  cat t-programs
  grep '^ *$' t-programs && exit 1
  
  run_make print-programs >stdout || { cat stdout; exit 1; }
  cat stdout
  grep '^BEG1: x :END1$' stdout
  grep '^BEG2: :END2$' stdout
  grep '^BEG3: zardoz x :END3$' stdout
  
  run_make am__empty=X print-programs >stdout || { cat stdout; exit 1; }
  cat stdout
  grep '^BEG1: x X :END1$' stdout
  grep '^BEG2: X :END2$' stdout
  grep '^BEG3: zardoz x X :END3$' stdout
  
  :
  

Download