[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-2033-g7828edb

[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=7828edbe2c2a4a7952d0a4932979eb193c724b14

The branch, master has been updated
       via  7828edbe2c2a4a7952d0a4932979eb193c724b14 (commit)
       via  e36f246a790e1856cf6cb5a0aae37296c30d66a9 (commit)
       via  b6e00b6b36a2593bb4afa23dec20c3c57b84db94 (commit)
       via  29158391fa018aba646b8ddd9d2022c5552ebd9f (commit)
      from  bb061d336f318da0adb85ae3002a6e0f4246332f (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 7828edbe2c2a4a7952d0a4932979eb193c724b14
Author: Dave Goodell <address@hidden>
Date:   Tue Feb 28 13:49:22 2012 -0600

    tests: fix spurious failure with Portland Compilers
    
    * tests/silent-many-generic.test (configure.ac): Be more careful
    in the workaround to avoid spurious failures with C++ compilers
    containing the string "CC" in their names; this avoids spurious
    failures with at least the Sun Studio C++ compiler (when named
    "sunCC") and the Portland Group C++ Compiler ("pgCC").
    Also handle arguments with whitespace correctly in the 'am--cxx'
    temporary wrapper.
    * THANKS: Update.
    
    Co-authored-by: Stefano Lattarini <address@hidden>
    Copyright-paperwork-exempt: yes

commit e36f246a790e1856cf6cb5a0aae37296c30d66a9
Author: Stefano Lattarini <address@hidden>
Date:   Tue Feb 28 20:07:34 2012 +0100

    tests: fix spurious failure when dependency tracking is unavailable
    
    Report by Dave Goodell.  See automake bug#8880.
    
    * tests/yacc-dist-nobuild.test: Run the sanity check that aims at
    ensuring we really cover the expected code paths in a new build
    directory, to avoid spurious failures when automatic dependency
    tracking is disabled.

commit b6e00b6b36a2593bb4afa23dec20c3c57b84db94
Author: Stefano Lattarini <address@hidden>
Date:   Mon Feb 27 09:34:29 2012 +0100

    cosmetics: remove a duplicated copyright line
    
    * tests/list-of-tests.mk: Remove a duplicated copyright line.

commit 29158391fa018aba646b8ddd9d2022c5552ebd9f
Author: Stefano Lattarini <address@hidden>
Date:   Mon Feb 27 09:28:47 2012 +0100

    coverage: --program-transform shouldn't transform too much
    
    Stemmed from a report by Vladimir 'φ-coder/phcoder' Serbinenko:
    <http://lists.gnu.org/archive/html/automake/2012-02/msg00025.html>
    
    * tests/transform3.test: New test, checking that --program-transform
    does not transform too much stuff (in particular, pkglibexecdir,
    pgklibdir and pkgdatadir).
    * tests/list-of-tests.mk: Add it.
    * THANKS: Update.

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

Summary of changes:
 THANKS                         |    2 +
 tests/list-of-tests.mk         |    2 +-
 tests/silent-many-generic.test |   18 +++++---
 tests/transform3.test          |   87 ++++++++++++++++++++++++++++++++++++++++
 tests/yacc-dist-nobuild.test   |   10 +++-
 5 files changed, 108 insertions(+), 11 deletions(-)
 create mode 100755 tests/transform3.test

diff --git a/THANKS b/THANKS
index 7b7c9df..9d3c32c 100644
--- a/THANKS
+++ b/THANKS
@@ -71,6 +71,7 @@ Daniel Kahn Gillmor   address@hidden
 Daniel Richard G.      address@hidden
 Debarshi Ray           address@hidden
 Dave Brolley           address@hidden
+Dave Goodell           address@hidden
 Dave Hart              address@hidden
 Dave Korn              address@hidden
 Dave Morrison          address@hidden
@@ -370,6 +371,7 @@ Ulrich Eckhardt             address@hidden
 Václav Haisman                address@hidden
 Vadim Zeitlin          address@hidden
 Vincent Lefevre                address@hidden
+Vladimir Serbinenko    address@hidden
 Volker Boerchers       address@hidden
 Werner John            address@hidden
 Werner Koch            address@hidden
diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk
index 89cff2f..28a6b2a 100644
--- a/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@ -3,7 +3,6 @@
 ## but also to be executed directly by make when bootstrapping automake.
 
 ## Copyright (C) 2011-2012 Free Software Foundation, Inc.
-## Copyright (C) 2011, 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
@@ -1144,6 +1143,7 @@ txinfo33.test \
 txinfo-unrecognized-extension.test \
 transform.test \
 transform2.test \
+transform3.test \
 uninstall-fail.test \
 uninstall-pr9578.test \
 unused.test \
diff --git a/tests/silent-many-generic.test b/tests/silent-many-generic.test
index a7a0487..a3d3b81 100755
--- a/tests/silent-many-generic.test
+++ b/tests/silent-many-generic.test
@@ -110,17 +110,21 @@ test -n "`echo $CXX`" || AC_MSG_ERROR([C++ compiler not 
found], [77])
 test -n "`echo $FC`"  || AC_MSG_ERROR([Fortran compiler not found], [77])
 test -n "`echo $F77`" || AC_MSG_ERROR([Fortran 77 compiler not found], [77])
 
-# The SunStudio C++ compiler is unfortunately named 'CC' (yuck!),
-# and this can cause problems with our grepping checks on the
-# output from make.  Avoid these problems by invoking a wrapper
-# script, as filtering the make output proved too fragile.
+# The SunStudio C++ compiler is unfortunately named 'sunCC' (or even just
+# 'CC', yuck!); similarly and the Portland group C++ compiler is named
+# 'pgCC'.  This can cause problems with our grepping checks on the output
+# from make.  Avoid these problems by invoking a wrapper script, as
+# filtering the make output proved too fragile.
 case " $CXX " in
-  *' CC '*|*'/CC '*)
-    AC_MSG_WARN([the C++ compiler '$CXX' seems to be named 'CC'])
+  *'CC '*)
+    AC_MSG_WARN([the C++ compiler '$CXX' name ends with 'CC'])
     AC_MSG_WARN([it will be wrapped with the custom script 'am--cxx'])
     echo '#!/bin/sh' > bin/am--cxx
     echo 'PATH=$saved_PATH; export PATH' >> bin/am--cxx
-    echo "exec $CXX \${1+"\$@"}" >> bin/am--cxx
+    echo "case \$# in" >> bin/am--cxx
+    echo "  0) exec $CXX ;;" >> bin/am--cxx
+    echo "  *) exec $CXX \"address@hidden" ;;" >> bin/am--cxx
+    echo "esac" >> bin/am--cxx
     chmod a+x bin/am--cxx
     CXX=am--cxx
 esac
diff --git a/tests/transform3.test b/tests/transform3.test
new file mode 100755
index 0000000..aaa69cb
--- /dev/null
+++ b/tests/transform3.test
@@ -0,0 +1,87 @@
+#! /bin/sh
+# Copyright (C) 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/>.
+
+# Make sure that --program-transform does not transform too much
+# stuff (in particular, pgklibdir, pkgdatadir and pkglibexecdir).
+
+required=cc
+. ./defs || Exit 1
+
+cat > configure.ac <<'END'
+AC_INIT([foo], [1.0])
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_OUTPUT
+END
+
+cat > Makefile.am <<'END'
+bin_SCRIPTS = foo
+pkgdata_DATA = bar.txt
+pkglib_LIBRARIES = libzap.a
+pkglibexec_SCRIPTS = mu
+END
+
+cat > libzap.c <<'END'
+int zap (void)
+{
+  return 0;
+}
+END
+
+echo 'To be or not to be ...' > bar.txt
+
+cat > foo <<'END'
+#!/bin/sh
+exit 0
+END
+cp foo mu
+chmod a+x foo mu
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+
+./configure --program-prefix=gnu- --prefix "`pwd`/inst"
+
+$MAKE install
+find inst # For debugging.
+test -f inst/bin/gnu-foo
+test -x inst/bin/gnu-foo
+test -f inst/share/foo/bar.txt
+test ! -d inst/share/gnu-foo
+test -f inst/lib/foo/libzap.a
+test ! -d inst/lib/gnu-foo
+test -f inst/libexec/foo/gnu-mu
+test -x inst/libexec/foo/gnu-mu
+test ! -d inst/libexec/gnu-foo
+
+$MAKE uninstall
+test `find inst -type f -print | wc -l` = 0
+
+# Opportunistically test for installdirs.
+rm -rf inst
+$MAKE installdirs
+test -d inst/share/foo
+test ! -d inst/share/gnu-foo
+test -d inst/lib/foo
+test ! -d inst/lib/gnu-foo
+test -d inst/libexec/foo
+test ! -d inst/libexec/gnu-foo
+
+:
diff --git a/tests/yacc-dist-nobuild.test b/tests/yacc-dist-nobuild.test
index bdfaca6..6f02f11 100755
--- a/tests/yacc-dist-nobuild.test
+++ b/tests/yacc-dist-nobuild.test
@@ -76,9 +76,13 @@ cd build
 $MAKE
 
 # Sanity check.
-chmod u+w ../$distdir
-rm -f ../$distdir/parse.c
-chmod a-w ../$distdir
+cd ..
+chmod u+w $distdir
+rm -f $distdir/parse.c
+chmod a-w $distdir
+mkdir build2
+cd build2
+../$distdir/configure
 $MAKE >out 2>&1 && { cat out; Exit 1; }
 cat out
 $FGREP parse.c out


hooks/post-receive
-- 
GNU Automake