[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-749-gb153660

[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=b153660787dd7dea409ad969c29393c105e13bf2

The branch, maint has been updated
       via  b153660787dd7dea409ad969c29393c105e13bf2 (commit)
      from  370e5775c20872a8f2b5c1e520b31dc1544b9cd8 (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 b153660787dd7dea409ad969c29393c105e13bf2
Author: Daiki Ueno <address@hidden>
Date:   Mon Mar 12 11:46:04 2012 +0100

    coverage: expose automake bug#10997
    
    * tests/instdir-cond.test: New test.
    * tests/list-of-tests.mk: Add it.
    * tests/Makefile.am (XFAIL_TESTS): Likewise.
    
    Copyright-paperwork-exempt: yes
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 tests/Makefile.am                           |    1 +
 tests/{condhook2.test => instdir-cond.test} |   30 +++++++++++++-------------
 tests/list-of-tests.mk                      |    1 +
 3 files changed, 17 insertions(+), 15 deletions(-)
 copy tests/{condhook2.test => instdir-cond.test} (65%)
 mode change 100755 => 100644

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b8ede30..9cac904 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -25,6 +25,7 @@ dist-auxfile.test \
 dist-auxfile-2.test \
 dist-pr109765.test \
 gcj6.test \
+instdir-cond.test \
 java-nobase.test \
 objext-pr10128.test \
 pr8365-remake-timing.test \
diff --git a/tests/condhook2.test b/tests/instdir-cond.test
old mode 100755
new mode 100644
similarity index 65%
copy from tests/condhook2.test
copy to tests/instdir-cond.test
index 45e2d43..8d83f88
--- a/tests/condhook2.test
+++ b/tests/instdir-cond.test
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
+#! /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
@@ -14,36 +14,36 @@
 # 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 install when a conditional install-*-hook is defined.
-# Keep this in sync with sister test condhook.test.
+# Check against automake bug#10997: directories holding only
+# conditionally-installed files should not be created unconditionally.
 
 . ./defs || Exit 1
 
 set -e
 
 cat >> configure.in << 'END'
-AM_CONDITIONAL([TEST], [true])
+AM_CONDITIONAL([ENABLE_FOO], [false])
 AC_OUTPUT
 END
 
+: > foo
+: > bar
+
 cat > Makefile.am << 'END'
-sysconf_DATA = mumble
-if TEST
-install-data-hook:
-       : > $(top_srcdir)/good
+if ENABLE_FOO
+pkgdata_DATA = foo
+pkglibexec_SCRIPTS = bar
 endif
 END
 
-: > mumble
-
 $ACLOCAL
-$AUTOCONF
 $AUTOMAKE
+$AUTOCONF
 
-./configure --prefix "`pwd`/inst"
+./configure --prefix="`pwd`/inst"
 
 $MAKE install
-test -f inst/etc/mumble
-test -f good
+test ! -d inst/share/instdir-cond
+test ! -d inst/libexec/instdir-cond
 
 :
diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk
index 023bf3b..7fd0376 100644
--- a/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@ -459,6 +459,7 @@ instdat.test \
 instdat2.test \
 instdir.test \
 instdir2.test \
+instdir-cond.test \
 instdir-java.test \
 instdir-lisp.test \
 instdir-ltlib.test \


hooks/post-receive
-- 
GNU Automake