From: Stefano Lattarini Date: Sun, 18 Sep 2011 15:51:31 +0000 (+0200) Subject: coverage: test interactions of `nobase_' and `nodist_' X-Git-Tag: v1.11.1b~18^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b7d3cbc93055201bc58497e6519f477d0b72701;p=thirdparty%2Fautomake.git coverage: test interactions of `nobase_' and `nodist_' * tests/nobase-nodist.test: New test. * tests/Makefile.am (TESTS): Add it. --- diff --git a/ChangeLog b/ChangeLog index 468c205b6..386fedaf0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-09-18 Stefano Lattarini + + coverage: test interactions of `nobase_' and `nodist_' + * tests/nobase-nodist.test: New test. + * tests/Makefile.am (TESTS): Add it. + 2011-09-18 Stefano Lattarini java: fix various blunders in test 'java-mix.test' diff --git a/tests/Makefile.am b/tests/Makefile.am index abbd8301d..c20314cd7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -565,6 +565,7 @@ multlib.test \ nobase.test \ nobase-libtool.test \ nobase-python.test \ +nobase-nodist.test \ nodef.test \ nodef2.test \ nodep.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index ffb1764f3..64561ef80 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -843,6 +843,7 @@ multlib.test \ nobase.test \ nobase-libtool.test \ nobase-python.test \ +nobase-nodist.test \ nodef.test \ nodef2.test \ nodep.test \ diff --git a/tests/nobase-nodist.test b/tests/nobase-nodist.test new file mode 100644 index 000000000..90823e2a3 --- /dev/null +++ b/tests/nobase-nodist.test @@ -0,0 +1,62 @@ +#! /bin/sh +# Copyright (C) 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 . + +# Interaction of `nobase_' and `nodist_' prefixes. + +. ./defs || Exit 1 + +set -e + +# Simulate no emacs and no python (it shouldn't be needed in this test). +EMACS="no" PYTHON=":"; export EMCAS PYTHON + +cat >> configure.in << 'END' +AM_PATH_LISPDIR +AM_PATH_PYTHON([], [], [:]) +# Simulate no javac (it shouldn't be needed in this test). +AC_SUBST([JAVAC], [false]) +AC_OUTPUT +END + +cat > Makefile.am << 'END' +nobase_nodist_noinst_PYTHON = baz1.py sub/baz2.py +# Lisp and Java sources are not distributed by default, so try both +# with and without the `nodist_' prefix, for more coverage. +nobase_noinst_LISP = foo1.el sub/foo2.el +nobase_nodist_noinst_LISP = foo3.el sub/foo4.el +nobase_noinst_JAVA = bar1.java sub/bar2.java +nobase_nodist_noinst_JAVA = bar3.java sub/bar4.java +END + +$ACLOCAL +$AUTOCONF +$AUTOMAKE -a +./configure +$MAKE distdir + +ls -l $distdir $distdir/* # For debugging. +test ! -f $distdir/foo1.el +test ! -f $distdir/sub/foo2.el +test ! -f $distdir/foo3.el +test ! -f $distdir/sub/foo4.el +test ! -f $distdir/bar1.java +test ! -f $distdir/sub/bar2.java +test ! -f $distdir/bar3.java +test ! -f $distdir/sub/bar4.java +test ! -f $distdir/baz1.py +test ! -f $distdir/sub/baz2.py + +: