[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.3-925-g280765a

[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=280765a36eed78934286c515cbc5c1e558cf564d

The branch, ng/master has been updated
       via  280765a36eed78934286c515cbc5c1e558cf564d (commit)
       via  abd2ef6359c76e27971725d6842fab16f4c73216 (commit)
       via  2296a5e1fbe39415111ad5fdce475fe49897233d (commit)
       via  696f44c0840d931656f986e9f4fb623e63df16ba (commit)
      from  84a6d5913d433020dd281d6c03754ff887cd9c83 (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 280765a36eed78934286c515cbc5c1e558cf564d
Merge: abd2ef6 2296a5e
Author: Stefano Lattarini <address@hidden>
Date:   Thu Nov 8 00:05:28 2012 +0100

    Merge branch 'master' into ng/master
    
    * master:
      tests: remove an obsolete comment
      tests: remove mostly-redundant tests on silent rules
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit abd2ef6359c76e27971725d6842fab16f4c73216
Author: Stefano Lattarini <address@hidden>
Date:   Thu Nov 8 00:02:05 2012 +0100

    maint: remove $(AM_MAKEFLAGS) usage in our Makefile
    
    * Makefile.am (check-no-trailing-backslash-in-recipes): Here.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 Makefile.am                                        |    2 +-
 t/silent-c-gcc.sh                                  |   70 -------
 t/{silent-c-generic.sh => silent-c.sh}             |    5 +-
 t/silent-cxx-gcc.sh                                |  105 ----------
 t/{silent-cxx-generic.sh => silent-cxx.sh}         |    5 +-
 t/silent-lt-gcc.sh                                 |   75 -------
 t/{silent-lt-generic.sh => silent-lt.sh}           |    5 +-
 t/silent-many-gcc.sh                               |  214 --------------------
 ...nt-many-generic.sh => silent-many-languages.sh} |    3 -
 t/silent-yacc.sh                                   |    1 -
 10 files changed, 7 insertions(+), 478 deletions(-)
 delete mode 100755 t/silent-c-gcc.sh
 rename t/{silent-c-generic.sh => silent-c.sh} (93%)
 delete mode 100755 t/silent-cxx-gcc.sh
 rename t/{silent-cxx-generic.sh => silent-cxx.sh} (93%)
 delete mode 100755 t/silent-lt-gcc.sh
 rename t/{silent-lt-generic.sh => silent-lt.sh} (94%)
 delete mode 100755 t/silent-many-gcc.sh
 rename t/{silent-many-generic.sh => silent-many-languages.sh} (97%)

diff --git a/Makefile.am b/Makefile.am
index b8ea0ce..2bb3e35 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -507,7 +507,7 @@ check-local: check-tests-syntax
 # that helps catching such problems in Automake-generated recipes.
 # See automake bug#10436.
 check-no-trailing-backslash-in-recipes:
-       $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) check \
+       $(AM_V_at)$(MAKE) check \
          CONFIG_SHELL='$(abs_top_builddir)/t/ax/shell-no-trail-bslash'
 .PHONY: check-no-trailing-backslash-in-recipes
 
diff --git a/t/silent-c-gcc.sh b/t/silent-c-gcc.sh
deleted file mode 100755
index e923e96..0000000
--- a/t/silent-c-gcc.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2009-2012 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/>.
-
-# Check silent-rules mode, without libtool, non-fastdep case
-# (so that, with GCC, we also cover the other code paths in depend2).
-
-# Please keep this file in sync with 'silent-c-generic.sh'.
-
-required=gcc
-. test-init.sh
-
-mkdir sub
-
-cat >>configure.ac <<'EOF'
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-# Need generic and non-generic rules.
-bin_PROGRAMS = foo bar sub/baz sub/bla
-bar_CFLAGS = $(AM_CFLAGS)
-sub_bla_CFLAGS = $(AM_CFLAGS)
-EOF
-
-echo 'int main (void) { return 0; }' > foo.c
-cp foo.c bar.c
-cp foo.c sub/baz.c
-cp foo.c sub/bla.c
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-./configure am_cv_CC_dependencies_compiler_type=gcc --enable-silent-rules
-$MAKE >stdout || { cat stdout; exit 1; }
-cat stdout
-$EGREP ' (-c|-o)|(mv|mkdir) '   stdout && exit 1
-grep ' CC  *foo\.o'             stdout
-grep ' CC  *bar-bar\.o'         stdout
-grep ' CC  *sub/baz\.o'         stdout
-grep ' CC  *sub/sub_bla-bla\.o' stdout
-grep ' CCLD  *foo'              stdout
-grep ' CCLD  *bar'              stdout
-grep ' CCLD  *sub/baz'          stdout
-grep ' CCLD  *sub/bla'          stdout
-
-$MAKE clean
-$MAKE V=1 >stdout || { cat stdout; exit 1; }
-cat stdout
-grep ' -c' stdout
-grep ' -o foo' stdout
-grep ' -o sub/baz' stdout
-$EGREP '(CC|LD) ' stdout && exit 1
-
-:
diff --git a/t/silent-c-generic.sh b/t/silent-c.sh
similarity index 93%
rename from t/silent-c-generic.sh
rename to t/silent-c.sh
index ac9dd72..701f108 100755
--- a/t/silent-c-generic.sh
+++ b/t/silent-c.sh
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check silent-rules mode, without libtool, standard depmode case.
-
-# Please keep this file in sync with 'silent-c-gcc.sh'.
+# Check silent-rules mode for C, without libtool, both with and without
+# automatic dependency tracking.
 
 required=cc
 . test-init.sh
diff --git a/t/silent-cxx-gcc.sh b/t/silent-cxx-gcc.sh
deleted file mode 100755
index cb04829..0000000
--- a/t/silent-cxx-gcc.sh
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2010-2012 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/>.
-
-# Check silent-rules mode for C++.
-# This test requires the GNU C++ compiler; keep it in sync with sister
-# test 'silent-cxx-generic.sh', which should work with generic compilers.
-
-required=g++
-. test-init.sh
-
-mkdir sub
-
-cat >>configure.ac <<'EOF'
-AC_PROG_CXX
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-# Need generic and non-generic rules.
-bin_PROGRAMS = foo1 foo2 bar1 bar2
-foo1_SOURCES = foo.cpp baz.cxx quux.cc
-foo2_SOURCES = $(foo1_SOURCES)
-foo2_CXXFLAGS = $(AM_CXXFLAGS)
-bar1_SOURCES = sub/bar.cpp
-bar2_SOURCES = $(bar1_SOURCES)
-bar2_CXXFLAGS = $(AM_CXXFLAGS)
-EOF
-
-cat > foo.cpp <<'EOF'
-using namespace std; /* C compilers fail on this. */
-int main (void) { return 0; }
-EOF
-
-# Let's try out other extensions too.
-echo 'class Baz  { public: int i;  };' > baz.cxx
-echo 'class Quux { public: bool b; };' > quux.cc
-
-cp foo.cpp sub/bar.cpp
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-# Sanity check: make sure the cache variable we force is really used
-# by configure.
-$FGREP am_cv_CXX_dependencies_compiler_type configure
-
-# Force gcc ("fast") depmode.
-# This apparently useless "for" loop is here to simplify the syncing
-# with sister test 'silentcxx.sh'.
-for config_args in \
-  am_cv_CXX_dependencies_compiler_type=gcc
-do
-  ./configure $config_args --enable-silent-rules
-  $MAKE >stdout || { cat stdout; exit 1; }
-  cat stdout
-
-  $EGREP ' (-c|-o)' stdout && exit 1
-  grep 'mv ' stdout && exit 1
-
-  grep ' CXX  *foo\.o'          stdout
-  grep ' CXX  *baz\.o'          stdout
-  grep ' CXX  *quux\.o'         stdout
-  grep ' CXX  *foo2-foo\.o'     stdout
-  grep ' CXX  *foo2-baz\.o'     stdout
-  grep ' CXX  *foo2-quux\.o'    stdout
-  grep ' CXX  *sub/bar\.o'      stdout
-  grep ' CXX  *sub/bar2-bar\.o' stdout
-  grep ' CXXLD  *foo1'          stdout
-  grep ' CXXLD  *bar1'          stdout
-  grep ' CXXLD  *foo2'          stdout
-  grep ' CXXLD  *bar2'          stdout
-
-  # Ensure a clean rebuild.
-  $MAKE clean
-
-  $MAKE V=1 >stdout || { cat stdout; exit 1; }
-  cat stdout
-
-  grep ' -c ' stdout
-  grep ' -o quux' stdout
-  grep ' -o bar2' stdout
-
-  $EGREP '(CC|CXX|LD) ' stdout && exit 1
-
-  # Ensure a clean reconfiguration/rebuild.
-  $MAKE clean
-  $MAKE maintainer-clean
-
-done
-
-:
diff --git a/t/silent-cxx-generic.sh b/t/silent-cxx.sh
similarity index 93%
rename from t/silent-cxx-generic.sh
rename to t/silent-cxx.sh
index ea8c558..28f6112 100755
--- a/t/silent-cxx-generic.sh
+++ b/t/silent-cxx.sh
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# This test should work with generic C++ compilers; keep it in sync with
-# sister test 'silent-cxx-gcc.sh', which requires the GNU C++ compiler
-# and forces the use of gcc depmode.
+# Check silent-rules mode for C++, both with and without automatic
+# dependency tracking.
 
 required=c++
 . test-init.sh
diff --git a/t/silent-lt-gcc.sh b/t/silent-lt-gcc.sh
deleted file mode 100755
index 6b08f22..0000000
--- a/t/silent-lt-gcc.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2009-2012 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/>.
-
-# Check silent-rules mode, with libtool, non-fastdep case
-# (so that, with GCC, we also cover the other code paths in depend2).
-
-# Please keep this file in sync with 'silent-lt-generic.sh'.
-
-required="libtoolize gcc"
-. test-init.sh
-
-mkdir sub
-
-cat >>configure.ac <<'EOF'
-AC_PROG_CC
-AM_PROG_AR
-AM_PROG_CC_C_O
-AC_PROG_LIBTOOL
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-# Need generic and non-generic rules.
-lib_LTLIBRARIES = libfoo.la libbar.la sub/libbaz.la sub/libbla.la
-libbar_la_CFLAGS = $(AM_CFLAGS)
-# Need generic and non-generic rules.
-sub_libbla_la_CFLAGS = $(AM_CFLAGS)
-EOF
-
-echo 'int main (void) { return 0; }' > libfoo.c
-cp libfoo.c libbar.c
-cp libfoo.c sub/libbaz.c
-cp libfoo.c sub/libbla.c
-
-libtoolize
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-./configure am_cv_CC_dependencies_compiler_type=gcc --enable-silent-rules
-$MAKE >stdout || { cat stdout; exit 1; }
-cat stdout
-$EGREP ' (-c|-o)|(mv|mkdir) '             stdout && exit 1
-grep ' CC  *libfoo\.lo'                   stdout
-grep ' CC  *libbar_la-libbar\.lo'         stdout
-grep ' CC  *sub/libbaz\.lo'               stdout
-grep ' CC  *sub/sub_libbla_la-libbla\.lo' stdout
-grep ' CCLD  *libfoo\.la'                 stdout
-grep ' CCLD  *libbar\.la'                 stdout
-grep ' CCLD  *sub/libbaz\.la'             stdout
-grep ' CCLD  *sub/libbla\.la'             stdout
-
-$MAKE clean
-$MAKE V=1 >stdout || { cat stdout; exit 1; }
-cat stdout
-grep ' -c' stdout
-grep ' -o libfoo' stdout
-grep ' -o sub/libbaz' stdout
-# The libtool command line can contain e.g. a '--tag=CC' option.
-sed 's/--tag=[^ ]*/--tag=x/g' stdout | $EGREP '(CC|LD) ' && exit 1
-
-:
diff --git a/t/silent-lt-generic.sh b/t/silent-lt.sh
similarity index 94%
rename from t/silent-lt-generic.sh
rename to t/silent-lt.sh
index d1cc5e2..2dd0d37 100755
--- a/t/silent-lt-generic.sh
+++ b/t/silent-lt.sh
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check silent-rules mode, with libtool, standard depmode case.
-
-# Please keep this file in sync with 'silent-lt-gcc.sh'.
+# Check silent-rules mode for C, with libtool, both with and without
+# automatic dependency tracking.
 
 required='cc libtoolize'
 . test-init.sh
diff --git a/t/silent-many-gcc.sh b/t/silent-many-gcc.sh
deleted file mode 100755
index bd59879..0000000
--- a/t/silent-many-gcc.sh
+++ /dev/null
@@ -1,214 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2009-2012 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/>.
-
-# Check silent-rules mode, with gcc depmode and many languages at once.
-# This test partly overlaps with other 'silent*.sh', but it serves as
-# a stress test by using many different languages at once -- so don't
-# remove this test script.
-# This test requires the GNU compilers; keep it in sync with sister test
-# 'silent-many-generic.sh', which should work with generic compilers.
-
-required='gcc g++ gfortran lex yacc'
-. test-init.sh
-
-# Avoids too much code duplication.
-do_and_check_silent_build ()
-{
-  case $1 in
-    --rebuild) rebuild=true;;
-            *) rebuild=false;;
-  esac
-
-  $MAKE >stdout || { cat stdout; exit 1; }
-  cat stdout
-  # Avoid spurious failures with SunStudio Fortran compilers.
-  sed '/^NOTICE:/d' stdout > t
-  mv -f t stdout
-  cat stdout
-
-  $EGREP ' (-c|-o)' stdout && exit 1
-  $EGREP '(mv|ylwrap) ' stdout && exit 1
-
-  grep ' CC .*bar\.'  stdout
-  grep 'CXX .*foo1\.' stdout
-  grep ' FC .*foo2\.' stdout
-  grep 'F77 .*foo3\.' stdout
-  grep ' CC .*foo5\.' stdout
-  grep ' CC .*foo6\.' stdout
-
-  grep 'CXXLD .*foo' stdout
-  grep ' CCLD .*bar' stdout
-  grep 'CXXLD .*baz' stdout
-
-  if ! $rebuild; then
-    grep 'YACC .*foo6\.' stdout
-    grep 'LEX .*foo5\.'  stdout
-  fi
-
-  unset rebuild
-}
-
-# Avoids too much code duplication.
-do_and_check_verbose_build ()
-{
-  case $1 in
-    --rebuild) rebuild=true;;
-            *) rebuild=false;;
-  esac
-
-  $MAKE V=1 >stdout || { cat stdout; exit 1; }
-  cat stdout
-
-  grep ' -c ' stdout
-  grep ' -o ' stdout
-
-  $EGREP '(CC|CXX|FC|F77|LD) ' stdout && exit 1
-
-  if ! $rebuild; then
-    grep 'ylwrap ' stdout
-    $EGREP '(LEX|YACC) ' stdout && exit 1
-  fi
-
-  unset rebuild
-}
-
-cat >>configure.ac <<'EOF'
-AM_PROG_CC_C_O
-AC_PROG_CXX
-AC_PROG_F77
-AC_PROG_FC
-AC_PROG_LEX
-AC_PROG_YACC
-AC_OUTPUT
-EOF
-
-cat > Makefile.am <<'EOF'
-# Need generic and non-generic rules.
-bin_PROGRAMS = foo bar baz
-bar_CFLAGS = $(AM_CFLAGS)
-foo_SOURCES = foo1.cpp foo2.f90 foo3.f foo5.l foo6.y
-baz_SOURCES = $(foo_SOURCES)
-baz_CPPFLAGS = $(AM_CPPFLAGS)
-baz_FFLAGS = $(AM_FFLAGS)
-baz_FCFLAGS = $(AM_FCFLAGS)
-baz_YFLAGS = -v
-baz_LFLAGS = -n
-AM_YFLAGS = -d
-LDADD = $(LEXLIB)
-BUILT_SOURCES = foo6.h
-EOF
-
-cat > bar.c <<'EOF'
-/* Valid C, invalid C++. */
-int main (void)
-{
-  int new = 0;
-  return new;
-}
-EOF
-cat > foo1.cpp <<'EOF'
-/* Valid C++, invalid C. */
-using namespace std;
-int main (void)
-{
-  return 0;
-}
-EOF
-cat > foo2.f90 <<'EOF'
-      subroutine foo2
-      return
-      end
-EOF
-cat > foo3.f <<'EOF'
-      subroutine foo3
-      return
-      end
-EOF
-cat > foo5.l <<'EOF'
-%{
-#define YY_NO_UNISTD_H 1
-%}
-%%
-"END"   return EOF;
-.
-%%
-/* Avoid possible link errors. */
-int yywrap (void)
-{
-  return 1;
-}
-EOF
-cat > foo6.y <<'EOF'
-%{
-void yyerror (char *s) {}
-%}
-%token EOF
-%%
-fubar : 'f' 'o' 'o' 'b' 'a' 'r' EOF {};
-EOF
-
-$ACLOCAL
-$AUTOMAKE --add-missing
-$AUTOCONF
-
-# Sanity check: make sure the cache variables we force are really
-# used by configure.
-$FGREP am_cv_CC_dependencies_compiler_type configure
-$FGREP am_cv_CXX_dependencies_compiler_type configure
-# Ensure per-target rules are used, to ensure their coverage below.
-# (We do not do an exhaustive check, that wouldn't be practical).
-$FGREP 'bar-bar.$(OBJEXT)'  Makefile.in || exit 99
-$FGREP 'baz-foo5.c' Makefile.in || exit 99
-$FGREP 'baz-foo6.c' Makefile.in || exit 99
-
-# Force gcc ("fast") depmode.
-depmodes="am_cv_CC_dependencies_compiler_type=gcc \
-          am_cv_CXX_dependencies_compiler_type=gcc"
-# This apparently useless "for" loop is here to simplify the syncing
-# with sister test 'silent-many-generic.sh'.
-for config_args in \
-  "$depmodes"
-do
-
-  ./configure $config_args --enable-silent-rules
-
-  do_and_check_silent_build
-  # Cleaning and then rebuilding with the same V flag (and without
-  # removing the generated sources in between) shouldn't trigger a
-  # different set of rules.
-  $MAKE clean
-  do_and_check_silent_build --rebuild
-
-  # Ensure a clean rebuild.
-  $MAKE clean
-  # This is required, since these files are not removed by 'make clean'
-  # (as dictated by the GNU Coding Standards).
-  rm -f *foo5.c *foo6.[ch]
-
-  do_and_check_verbose_build
-  # Cleaning and then rebuilding with the same V flag (and without
-  # removing the generated sources in between) shouldn't trigger a
-  # different set of rules.
-  $MAKE clean
-  do_and_check_verbose_build --rebuild
-
-  # Ensure a clean reconfiguration/rebuild.
-  $MAKE clean
-  $MAKE maintainer-clean
-
-done
-
-:
diff --git a/t/silent-many-generic.sh b/t/silent-many-languages.sh
similarity index 97%
rename from t/silent-many-generic.sh
rename to t/silent-many-languages.sh
index 592bc73..0ecfb40 100755
--- a/t/silent-many-generic.sh
+++ b/t/silent-many-languages.sh
@@ -18,9 +18,6 @@
 # This test partly overlaps with other 'silent*.sh', but it serves as
 # a stress test by using many different languages at once -- so don't
 # remove this test script.
-# This test should work with generic compilers; keep it in sync with
-# sister test 'silent-many-gcc.sh', which requires the GNU compilers
-# and forces the use of gcc depmode.
 
 required='cc c++ fortran fortran77 lex yacc'
 . test-init.sh
diff --git a/t/silent-yacc.sh b/t/silent-yacc.sh
index 4d7eb83..99d7b4c 100755
--- a/t/silent-yacc.sh
+++ b/t/silent-yacc.sh
@@ -15,7 +15,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Check silent-rules mode for Yacc.
-# Keep this in sync with sister test 'silent-yacc-gcc.sh'.
 
 required='cc yacc'
 . test-init.sh


hooks/post-receive
-- 
GNU Automake