kc3-lang/automake/tests/distcom-subdir.test

• Show log

  Commit

• Hash : 326ecba2
  Author :
  Date : 2011-09-30T12:12:43
  

  dist: auxiliary files can be distributed from subdir Makefiles
  
  With this change, we make it possible for a subdir Makefile.am
  to distribute files in the config auxdir; while this means that
  some files might be copied multiple times, it simplify some logic
  in the automake script, and fix at least one important bug.  In
  fact, before this change, the auxiliary script `test-driver' was
  not being distributed as expected when TESTS was defined only in
  a subdir Makefile (which is a pretty common setup indeed).  Now
  this does not happen anymore: so the present change fixes automake
  bug#9546.
  
  Another welcome collateral effect is that `dist-auxfile-2.test'
  now passes.
  
  OTOH, the present changes *breaks threaded automake*.  The reason
  is that automake needs to serialize file installations spawned
  by `--add-missing' (this isn't for cosmetic reasons, but is
  really needed to avoid possible race conditions and botched output
  files).  Currently the code that installs required files is
  intertwined with the code that declares the DIST_COMMON variables;
  so, upon de-serialization, the definition of DIST_COMMON might get
  emitted in the wrong Makefile.in.
  
  Some follow-up refactoring in automake will soon take care of
  remedying this situation.  For the moment, we just declare some
  "parallel-am" tests as xfailing.
  
  * automake.in (maybe_push_required_file): Add ad-hoc handling for
  the case where the directory part of the required file is different
  from the subdir where the current Makefile.am resides, but is equal
  to the "config-aux directory" ($config_auxdir).  This is needed to
  allow a construct in a non-top-level Makefile.am to require a file
  in the config-aux directory.
  * tests/test-driver-is-distributed.test: Extend and adjust.  This
  test now passes.
  * tests/java-compile-run-nested.test: Call automake with the `-a'
  option to ensure that the `test-driver' auxiliary script gets
  correctly installed.  This test now passes.
  * tests/distcom-subdir.test: New test.
  * tests/dist-readonly.test: Likewise.
  * tests/dist-repeated.test: Likewise.
  * tests/dist-auxdir-many-subdirs.test: Likewise.
  * tests/distcom7.test: Removed, it's obsolete now.
  * tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
  

Download

• tests/distcom-subdir.test

• #! /bin/sh
  # Copyright (C) 2004, 2009, 2010, 2011 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/>.
  
  # Test to make sure that if an auxfile (here depcomp) is required
  # by a subdir Makefile.am, it is distributed by that Makefile.am.
  
  . ./defs || Exit 1
  
  cat >> configure.in << 'END'
  AC_CONFIG_FILES([subdir/Makefile])
  AC_PROG_CC
  AC_OUTPUT
  END
  
  cat > Makefile.am << 'END'
  SUBDIRS = subdir
  END
  
  rm -f depcomp
  mkdir subdir
  
  : > subdir/Makefile.am
  
  $ACLOCAL
  $AUTOCONF
  $AUTOMAKE
  test ! -f depcomp
  
  cat > subdir/Makefile.am << 'END'
  bin_PROGRAMS = foo
  END
  
  : > subdir/foo.c
  
  $AUTOMAKE -a subdir/Makefile
  test -f depcomp
  
  # FIXME: the logic of this check and other similar ones in other
  # FIXME: `distcom*.test' files should be factored out in a common
  # FIXME: subroutine in `defs'...
  sed -n -e "
    /^DIST_COMMON =.*\\\\$/ {
      :loop
      p
      n
      t clear
      :clear
      s/\\\\$/\\\\/
      t loop
      s/$/ /
      s/[$tab ][$tab ]*/ /g
      p
      n
    }" subdir/Makefile.in > dc.txt
  cat dc.txt
  $FGREP ' $(top_srcdir)/depcomp ' dc.txt
  
  ./configure
  $MAKE distdir
  test -f $distdir/depcomp
  
  :
  

Download