[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-2082
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-2082-gd1afb32 |
|
Date: |
Wed, 14 Mar 2012 21:51:34 +0000 |
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=d1afb320a6bae3b94bfe53c7f6e32bc998bc28cf
The branch, master has been updated
via d1afb320a6bae3b94bfe53c7f6e32bc998bc28cf (commit)
via 895e13693b56efe2aa2f42bbb673a8ce80819317 (commit)
via 6a6bc51eebe4c702b1ae26acca79c3b865fd8981 (commit)
via 52ce42bbaf56e5eae76ea8f4fe1484c23c0fa10d (commit)
via fdde53d3a416c0f709f9f5b95c121fc5b13072fd (commit)
via 327358d84a5b4a098c8483bce4e87fb27ee9a9d3 (commit)
via e9927ea32d8fe5056123b021ff771cb906b1b3df (commit)
via 650dba0873f6c894461ce29cb26a1b3104287d24 (commit)
via b153660787dd7dea409ad969c29393c105e13bf2 (commit)
via 370e5775c20872a8f2b5c1e520b31dc1544b9cd8 (commit)
via ddac05053058efd64d67609d30bae20445ae584b (commit)
from 28ed42d905141d2ab4f8431b0599c906fe7c6408 (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 d1afb320a6bae3b94bfe53c7f6e32bc998bc28cf
Author: Stefano Lattarini <address@hidden>
Date: Wed Mar 14 22:48:22 2012 +0100
tests: one more use of 'unindent' function
* tests/yacc-d-cxx.test (write_parse, write_main): Use 'unindent'
instead of ad-hoc sed invocation to strip extra leading whitespace.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 895e13693b56efe2aa2f42bbb673a8ce80819317
Author: Stefano Lattarini <address@hidden>
Date: Wed Mar 14 22:45:16 2012 +0100
tests: remove redundant 'set -e' calls
* tests/dist-pr109765.test: Do not set the 'errexit' shell flag,
as it is already set by 'tests/defs'.
* tests/instdir-cond.test: Likewise.
* tests/instdir-empty.test: Likewise.
* tests/lex-clean-cxx.test: Likewise.
* tests/lex-clean.test: Likewise.
* tests/lex-depend-cxx.test: Likewise.
* tests/lex-depend.test: Likewise.
* tests/lex-line.test: Likewise.
* tests/lex-nodist.test: Likewise.
* tests/lex-pr204.test: Likewise.
* tests/silent-lex.test: Likewise.
* tests/silent-yacc-headers.test: Likewise.
* tests/silent-yacc.test: Likewise.
* tests/vala-mix2.test: Likewise.
* tests/yacc-auxdir.test: Likewise.
* tests/yacc-bison-skeleton-cxx.test: Likewise.
* tests/yacc-bison-skeleton.test: Likewise.
* tests/yacc-clean-cxx.test: Likewise.
* tests/yacc-cxx.test: Likewise.
* tests/yacc-d-cxx.test: Likewise.
* tests/yacc-deleted-headers.test: Likewise.
* tests/yacc-depend.test: Likewise.
* tests/yacc-depend2.test: Likewise.
* tests/yacc-line.test: Likewise.
* tests/yacc-mix-c-cxx.test: Likewise.
* tests/yacc-weirdnames.test: Likewise.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 6a6bc51eebe4c702b1ae26acca79c3b865fd8981
Merge: 28ed42d 52ce42b
Author: Stefano Lattarini <address@hidden>
Date: Wed Mar 14 22:29:59 2012 +0100
Merge branch 'maint'
* maint:
tests: avoid spurious failures in get-sysconf.test
scripts: bump the depcomp scriptversion
sync: some auxiliary files synced from upstream
coverage: an empty foo_PRIMARY should create directory $(foodir)
coverage: make sure am__py_compile is defined when needed
coverage: expose automake bug#10997
coverage: expose automake bug#10975
getopt: relax version requirement for perl
+ Extra non-trivial edits:
* tests/dist-pr109765.test: Use 'configure.ac', not 'configure.in'.
* tests/instdir-cond.test: Likewise.
* tests/instdir-empty.test: Likewise.
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
lib/depcomp | 2 +-
lib/gnupload | 2 +-
lib/texinfo.tex | 111 +++++++++++++++++----------
tests/Makefile.am | 2 +
tests/{insh2.test => dist-pr109765.test} | 34 +++++----
tests/get-sysconf.test | 13 ++-
tests/{condhook2.test => instdir-cond.test} | 30 ++++----
tests/{insh2.test => instdir-empty.test} | 36 ++++++---
tests/lex-clean-cxx.test | 2 -
tests/lex-clean.test | 2 -
tests/lex-depend-cxx.test | 2 -
tests/lex-depend.test | 2 -
tests/lex-line.test | 2 -
tests/lex-nodist.test | 2 -
tests/lex-pr204.test | 2 -
tests/list-of-tests.mk | 3 +
tests/python.test | 19 +++++-
tests/silent-lex.test | 2 -
tests/silent-yacc-headers.test | 2 -
tests/silent-yacc.test | 2 -
tests/vala-mix2.test | 2 -
tests/yacc-auxdir.test | 2 -
tests/yacc-bison-skeleton-cxx.test | 2 -
tests/yacc-bison-skeleton.test | 2 -
tests/yacc-clean-cxx.test | 2 -
tests/yacc-cxx.test | 2 -
tests/yacc-d-cxx.test | 6 +-
tests/yacc-deleted-headers.test | 2 -
tests/yacc-depend.test | 2 -
tests/yacc-depend2.test | 2 -
tests/yacc-line.test | 2 -
tests/yacc-mix-c-cxx.test | 2 -
tests/yacc-weirdnames.test | 2 -
33 files changed, 165 insertions(+), 137 deletions(-)
copy tests/{insh2.test => dist-pr109765.test} (54%)
copy tests/{condhook2.test => instdir-cond.test} (65%)
mode change 100755 => 100644
copy tests/{insh2.test => instdir-empty.test} (56%)
mode change 100755 => 100644
diff --git a/lib/depcomp b/lib/depcomp
index 793b902..81e64f6 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -1,7 +1,7 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2012-02-03.15; # UTC
+scriptversion=2012-03-12.15; # UTC
# Copyright (C) 1999-2012 Free Software Foundation, Inc.
diff --git a/lib/gnupload b/lib/gnupload
index 51e17c6..b71ddfd 100755
--- a/lib/gnupload
+++ b/lib/gnupload
@@ -3,7 +3,7 @@
scriptversion=2012-01-15.15; # UTC
-# Copyright (C) 2004-2010, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-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
diff --git a/lib/texinfo.tex b/lib/texinfo.tex
index dcdeb9b..85b68e7 100644
--- a/lib/texinfo.tex
+++ b/lib/texinfo.tex
@@ -3,11 +3,11 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2012-01-19.16}
+\def\texinfoversion{2012-03-11.15}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-% 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+% 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
%
% This texinfo.tex file is free software: you can redistribute it and/or
% modify it under the terms of the GNU General Public License as
@@ -887,7 +887,7 @@ where each line of input produces a line of output.}
\def\popthisfilestack{\errthisfilestackempty}
\def\errthisfilestackempty{\errmessage{Internal error:
the stack of filenames is empty.}}
-
+%
\def\thisfile{}
% @center line
@@ -895,36 +895,46 @@ where each line of input produces a line of output.}
%
\parseargdef\center{%
\ifhmode
- \let\next\centerH
+ \let\centersub\centerH
\else
- \let\next\centerV
+ \let\centersub\centerV
\fi
- \next{\hfil \ignorespaces#1\unskip \hfil}%
+ \centersub{\hfil \ignorespaces#1\unskip \hfil}%
+ \let\centersub\relax % don't let the definition persist, just in case
}
-\def\centerH#1{%
- {%
- \hfil\break
- \advance\hsize by -\leftskip
- \advance\hsize by -\rightskip
- \line{#1}%
- \break
- }%
+\def\centerH#1{{%
+ \hfil\break
+ \advance\hsize by -\leftskip
+ \advance\hsize by -\rightskip
+ \line{#1}%
+ \break
+}}
+%
+\newcount\centerpenalty
+\def\centerV#1{%
+ % The idea here is the same as in \startdefun, \cartouche, etc.: if
+ % @center is the first thing after a section heading, we need to wipe
+ % out the negative parskip inserted by \sectionheading, but still
+ % prevent a page break here.
+ \centerpenalty = \lastpenalty
+ \ifnum\centerpenalty>10000 \vskip\parskip \fi
+ \ifnum\centerpenalty>9999 \penalty\centerpenalty \fi
+ \line{\kern\leftskip #1\kern\rightskip}%
}
-\def\centerV#1{\line{\kern\leftskip #1\kern\rightskip}}
% @sp n outputs n lines of vertical space
-
+%
\parseargdef\sp{\vskip #1\baselineskip}
% @comment ...line which is ignored...
% @c is the same as @comment
% @ignore ... @end ignore is another way to write a comment
-
+%
\def\comment{\begingroup \catcode`\^^M=\other%
address@hidden \catcode`\{=\other \catcode`\}=\other%
\commentxxx}
{\catcode`\^^M=\other \gdef\commentxxx#1^^M{\endgroup}}
-
+%
\let\c=\comment
% @paragraphindent NCHARS
@@ -1173,8 +1183,8 @@ output) for that.)}
%
% #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
\def\dopdfimage#1#2#3{%
- \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
- \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
+ \def\pdfimagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
+ \def\pdfimageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
%
% pdftex (and the PDF format) support .pdf, .png, .jpg (among
% others). Let's try in that order, PDF first since if
@@ -1212,8 +1222,8 @@ output) for that.)}
\else
\immediate\pdfximage
\fi
- \ifdim \wd0 >0pt width \imagewidth \fi
- \ifdim \wd2 >0pt height \imageheight \fi
+ \ifdim \wd0 >0pt width \pdfimagewidth \fi
+ \ifdim \wd2 >0pt height \pdfimageheight \fi
\ifnum\pdftexversion<13
#1.\pdfimgext
\else
@@ -1362,7 +1372,13 @@ output) for that.)}
\fi
\fi
\nextsp}
- \def\getfilename#1{\filenamelength=0\expandafter\skipspaces#1|\relax}
+ \def\getfilename#1{%
+ \filenamelength=0
+ % If we don't expand the argument now, \skipspaces will get
+ % snagged on things like "@value{foo}".
+ \edef\temp{#1}%
+ \expandafter\skipspaces\temp|\relax
+ }
\ifnum\pdftexversion < 14
\let \startlink \pdfannotlink
\else
@@ -4732,10 +4748,9 @@ end
%
% ..., ready, GO:
%
-\def\safewhatsit#1{%
-\ifhmode
+\def\safewhatsit#1{\ifhmode
#1%
-\else
+ \else
% \lastskip and \lastpenalty cannot both be nonzero simultaneously.
\whatsitskip = \lastskip
\edef\lastskipmacro{\the\lastskip}%
@@ -4759,7 +4774,6 @@ end
% to re-insert the same penalty (values >10000 are used for various
% signals); since we just inserted a non-discardable item, any
% following glue (such as a \parskip) would be a breakpoint. For example:
- %
% @deffn deffn-whatever
% @vindex index-whatever
% Description.
@@ -4772,8 +4786,7 @@ end
% (the whatsit from the \write), so we must insert a \nobreak.
\nobreak\vskip\whatsitskip
\fi
-\fi
-}
+\fi}
% The index entry written in the file actually looks like
% \entry {sortstring}{page}{topic}
@@ -5876,14 +5889,15 @@ end
%
% We'll almost certainly start a paragraph next, so don't let that
% glue accumulate. (Not a breakpoint because it's preceded by a
- % discardable item.)
+ % discardable item.) However, when a paragraph is not started next
+ % (\startdefun, \cartouche, \center, etc.), this needs to be wiped out
+ % or the negative glue will cause weirdly wrong output, typically
+ % obscuring the section heading with something else.
\vskip-\parskip
%
- % This is purely so the last item on the list is a known \penalty >
- % 10000. This is so \startdefun can avoid allowing breakpoints after
- % section headings. Otherwise, it would insert a valid breakpoint between:
- % @section sec-whatever
- % @deffn def-whatever
+ % This is so the last item on the main vertical list is a known
+ % \penalty > 10000, so \startdefun, etc., can recognize the situation
+ % and do the needful.
\penalty 10001
}
@@ -6303,7 +6317,7 @@ end
% If this cartouche directly follows a sectioning command, we need the
% \parskip glue (backspaced over by default) or the cartouche can
% collide with the section heading.
- \ifnum\lastpenalty>10000 \vskip\parskip \fi
+ \ifnum\lastpenalty>10000 \vskip\parskip \penalty\lastpenalty \fi
%
\vbox\bgroup
\baselineskip=0pt\parskip=0pt\lineskip=0pt
@@ -7845,6 +7859,7 @@ end
\ifpdf
{\indexnofonts
\turnoffactive
+ \makevalueexpandable
% This expands tokens, so do it after making catcode changes, so _
% etc. don't get their TeX definitions.
\getfilename{#4}%
@@ -8316,7 +8331,7 @@ end
it from ftp://tug.org/tex/epsf.tex.}
%
\def\image#1{%
- \ifx\epsfbox\thisiundefined
+ \ifx\epsfbox\thisisundefined
\ifwarnednoepsf \else
\errhelp = \noepsfhelp
\errmessage{epsf.tex not found, images will be ignored}%
@@ -8340,6 +8355,13 @@ end
% If the image is by itself, center it.
\ifvmode
\imagevmodetrue
+ \else \ifx\centersub\centerV
+ % for @center @image, we need a vbox so we can have our vertical space
+ \imagevmodetrue
+ \vbox\bgroup % vbox has better behavior than vtop herev
+ \fi\fi
+ %
+ \ifimagevmode
\nobreak\medskip
% Usually we'll have text after the image which will insert
% \parskip glue, so insert it here too to equalize the space
@@ -8349,9 +8371,13 @@ end
\fi
%
% Leave vertical mode so that indentation from an enclosing
- % environment such as @quotation is respected. On the other hand, if
- % it's at the top level, we don't want the normal paragraph indentation.
- \noindent
+ % environment such as @quotation is respected.
+ % However, if we're at the top level, we don't want the
+ % normal paragraph indentation.
+ % On the other hand, if we are in the case of @center @image, we don't
+ % want to start a paragraph, which will create a hsize-width box and
+ % eradicate the centering.
+ \ifx\centersub\centerV\else \noindent \fi
%
% Output the image.
\ifpdf
@@ -8363,7 +8389,10 @@ end
\epsfbox{#1.eps}%
\fi
%
- \ifimagevmode \medskip \fi % space after the standalone image
+ \ifimagevmode
+ \medskip % space after a standalone image
+ \fi
+ \ifx\centersub\centerV \egroup \fi
\endgroup}
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c14a390..1126204 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -39,6 +39,8 @@ yacc-bison-skeleton.test \
cond17.test \
gcj6.test \
override-conditional-2.test \
+dist-pr109765.test \
+instdir-cond.test \
java-nobase.test \
objext-pr10128.test \
parallel-tests-many.test \
diff --git a/tests/insh2.test b/tests/dist-pr109765.test
similarity index 54%
copy from tests/insh2.test
copy to tests/dist-pr109765.test
index cd74f82..2e22e84 100755
--- a/tests/insh2.test
+++ b/tests/dist-pr109765.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+# 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,27 +14,29 @@
# 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 for bug where install-sh not included in distribution.
+# Expose automake bug#10975: when several "dist-*" targets are invoked
+# on the make command line, the first one ends up removing the distdir,
+# so that the latter ones fail.
+required=bzip2
. ./defs || Exit 1
echo AC_OUTPUT >> configure.ac
+: > Makefile.am
-cat > Makefile.am << 'END'
-pkgdata_DATA =
-.PHONY: test
-test: distdir
- find $(distdir) ;: For debugging.
- echo ' ' $(DISTFILES) ' ' | grep '[ /]install-sh '
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]install-sh '
- test -f $(distdir)/install-sh
-END
-
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
+$ACLOCAL || fatal_ "aclocal failed"
+$AUTOCONF || fatal_ "autoconf failed"
+$AUTOMAKE || fatal_ "automake failed"
./configure
-$MAKE test
+$MAKE dist-gzip dist-bzip2
+
+gzip -dc $distdir.tar.gz | tar tf - > one || { cat one; Exit 1; }
+cat one
+bzip2 -dc $distdir.tar.gz | tar tf - > two || { cat two; Exit 1; }
+cat two
+
+$FGREP "$distdir/Makefile.am" one
+diff one two
:
diff --git a/tests/get-sysconf.test b/tests/get-sysconf.test
index 5b3c9e2..ae3310e 100755
--- a/tests/get-sysconf.test
+++ b/tests/get-sysconf.test
@@ -25,16 +25,21 @@
st=0
if test -d "$top_testsrcdir"/.git; then
# We are running from a git checkout.
- git log -1 || st=1
-else
- # We are probably running from a distribution tarball, so
- # the ChangeLog file must be present.
+ (cd "$top_testsrcdir" && git log -1) || st=1
+elif test -f "$top_testsrcdir"/ChangeLog; then
+ # We are probably running from a distribution tarball.
awk '
BEGIN { first = 1 }
(first == 1) { print; first = 0; next; }
/^[^\t]/ { exit(0); }
{ print }
' "$top_testsrcdir"/ChangeLog || st=1
+else
+ # Some non-common but possibly valid setup (see for example the Homebrew
+ # problem reported in automake bug#10866); so just give an harmless
+ # warning instead of failing.
+ warn_ "no .git directory nor ChangeLog file found, some info won't" \
+ "be available"
fi
$PERL -V || st=1
# It's OK for the user not to have the TAP::Parser module; this can
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 a853e37..d078a8c
--- a/tests/condhook2.test
+++ b/tests/instdir-cond.test
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright (C) 2010-2012 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,34 +14,34 @@
# 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
cat >> configure.ac << '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/insh2.test b/tests/instdir-empty.test
old mode 100755
new mode 100644
similarity index 56%
copy from tests/insh2.test
copy to tests/instdir-empty.test
index cd74f82..ccac92d
--- a/tests/insh2.test
+++ b/tests/instdir-empty.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+# 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,7 +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/>.
-# Test for bug where install-sh not included in distribution.
+# An empty "foo_PRIMARY" declaration should cause "make install" to create
+# directory $(foodir). Suggested in discussion on automake bug#10997.
. ./defs || Exit 1
@@ -22,19 +23,34 @@ echo AC_OUTPUT >> configure.ac
cat > Makefile.am << 'END'
pkgdata_DATA =
-.PHONY: test
-test: distdir
- find $(distdir) ;: For debugging.
- echo ' ' $(DISTFILES) ' ' | grep '[ /]install-sh '
- echo ' ' $(DIST_COMMON) ' ' | grep '[ /]install-sh '
- test -f $(distdir)/install-sh
+libexec_SCRIPTS =
END
$ACLOCAL
$AUTOMAKE
$AUTOCONF
-./configure
-$MAKE test
+cwd=`pwd`
+./configure --prefix="$cwd/inst"
+
+$MAKE install
+test -d inst/share/$me
+test -d inst/libexec
+rm -rf inst
+
+$MAKE install-exec
+test ! -d inst/share
+test -d inst/libexec
+rm -rf inst
+
+$MAKE install-data
+test -d inst/share/$me
+test ! -d inst/libexec
+rm -rf inst
+
+./configure --prefix=/foo
+$MAKE install DESTDIR=$cwd/dest
+test -d dest/foo/share/$me
+test -d dest/foo/libexec
:
diff --git a/tests/lex-clean-cxx.test b/tests/lex-clean-cxx.test
index b29bd40..9ff2dbc 100755
--- a/tests/lex-clean-cxx.test
+++ b/tests/lex-clean-cxx.test
@@ -23,8 +23,6 @@
required=lex
. ./defs || Exit 1
-set -e
-
cat >> configure.ac << 'END'
AC_PROG_CXX
AC_PROG_LEX
diff --git a/tests/lex-clean.test b/tests/lex-clean.test
index 6988f92..9b23f01 100755
--- a/tests/lex-clean.test
+++ b/tests/lex-clean.test
@@ -22,8 +22,6 @@
required=yacc
. ./defs || Exit 1
-set -e
-
cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_LEX
diff --git a/tests/lex-depend-cxx.test b/tests/lex-depend-cxx.test
index 2686a5e..5249102 100755
--- a/tests/lex-depend-cxx.test
+++ b/tests/lex-depend-cxx.test
@@ -20,8 +20,6 @@
required=lex
. ./defs || Exit 1
-set -e
-
cat >> configure.ac << 'END'
AC_PROG_CXX
AM_PROG_LEX
diff --git a/tests/lex-depend.test b/tests/lex-depend.test
index 2982845..9487f4a 100755
--- a/tests/lex-depend.test
+++ b/tests/lex-depend.test
@@ -20,8 +20,6 @@
required=lex
. ./defs || Exit 1
-set -e
-
cat >> configure.ac << 'END'
AC_PROG_CC
AM_PROG_LEX
diff --git a/tests/lex-line.test b/tests/lex-line.test
index 5888c51..05b6f99 100755
--- a/tests/lex-line.test
+++ b/tests/lex-line.test
@@ -22,8 +22,6 @@
required=lex
. ./defs || Exit 1
-set -e
-
cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/Makefile])
AC_PROG_CC
diff --git a/tests/lex-nodist.test b/tests/lex-nodist.test
index 70cd2f7..99e6b7b 100755
--- a/tests/lex-nodist.test
+++ b/tests/lex-nodist.test
@@ -23,8 +23,6 @@
required=lex
. ./defs || Exit 1
-set -e
-
cat >> configure.ac << 'END'
AC_PROG_CC
dnl Sister test 'lex-pr204.test' should use 'AC_PROG_LEX' instead.
diff --git a/tests/lex-pr204.test b/tests/lex-pr204.test
index 07b5644..2e1b4e3 100755
--- a/tests/lex-pr204.test
+++ b/tests/lex-pr204.test
@@ -23,8 +23,6 @@
required=lex
. ./defs || Exit 1
-set -e
-
cat >> configure.ac <<'EOF'
AM_MAINTAINER_MODE
AC_PROG_CC
diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk
index b36d76c..7665db1 100644
--- a/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@ -347,6 +347,7 @@ dist-missing-included-m4.test \
dist-missing-m4.test \
dist-readonly.test \
dist-repeated.test \
+dist-pr109765.test \
distcleancheck.test \
distcom2.test \
distcom3.test \
@@ -471,6 +472,8 @@ instdat.test \
instdat2.test \
instdir.test \
instdir2.test \
+instdir-cond.test \
+instdir-empty.test \
instdir-java.test \
instdir-lisp.test \
instdir-ltlib.test \
diff --git a/tests/python.test b/tests/python.test
index 8a39f9f..2200d63 100755
--- a/tests/python.test
+++ b/tests/python.test
@@ -14,7 +14,7 @@
# 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 py_compile is defined.
+# Test to make sure py_compile and am__py_compile are correctly defined.
. ./defs || Exit 1
@@ -24,6 +24,14 @@ cat > Makefile.am << 'END'
python_PYTHON = foo.py
END
+cat > Makefile2.am << 'END'
+python_PYTHON = a.py
+nodist_python_PYTHON = b.py
+nobase_python_PYTHON = x/c.py
+mydir = ${prefix}
+my_PYTHON = d.py
+END
+
$ACLOCAL
AUTOMAKE_fails
@@ -33,4 +41,13 @@ $AUTOMAKE -a
grep '^py_compile *=' Makefile.in
test -f py-compile
+$AUTOMAKE Makefile2
+
+grep "py" Makefile.in Makefile2.in # For debugging.
+
+for f in Makefile.in Makefile2.in; do
+ test `grep -c '^py_compile =' $f` -eq 1
+ test `grep -c '^am__py_compile =' $f` -eq 1
+done
+
:
diff --git a/tests/silent-lex.test b/tests/silent-lex.test
index 1855538..2838d6e 100755
--- a/tests/silent-lex.test
+++ b/tests/silent-lex.test
@@ -19,8 +19,6 @@
required=lex
. ./defs || Exit 1
-set -e
-
mkdir sub
cat >>configure.ac <<'EOF'
diff --git a/tests/silent-yacc-headers.test b/tests/silent-yacc-headers.test
index 63baaec..55ba247 100755
--- a/tests/silent-yacc-headers.test
+++ b/tests/silent-yacc-headers.test
@@ -20,8 +20,6 @@
required=yacc
. ./defs || Exit 1
-set -e
-
mkdir sub
cat >>configure.ac <<'EOF'
diff --git a/tests/silent-yacc.test b/tests/silent-yacc.test
index 15db628..35415bf 100755
--- a/tests/silent-yacc.test
+++ b/tests/silent-yacc.test
@@ -20,8 +20,6 @@
required=yacc
. ./defs || Exit 1
-set -e
-
mkdir sub
cat >>configure.ac <<'EOF'
diff --git a/tests/vala-mix2.test b/tests/vala-mix2.test
index 4ac5444..e9a0aa4 100755
--- a/tests/vala-mix2.test
+++ b/tests/vala-mix2.test
@@ -20,8 +20,6 @@
required='valac cc c++ GNUmake'
. ./defs || Exit 1
-set -e
-
cat >> configure.ac <<'END'
AC_PROG_CC
AC_PROG_CXX
diff --git a/tests/yacc-auxdir.test b/tests/yacc-auxdir.test
index d268fc5..1b494e8 100755
--- a/tests/yacc-auxdir.test
+++ b/tests/yacc-auxdir.test
@@ -19,8 +19,6 @@
. ./defs || Exit 1
-set -e
-
mkdir aux1 sub
cat > configure.ac << END
diff --git a/tests/yacc-bison-skeleton-cxx.test
b/tests/yacc-bison-skeleton-cxx.test
index 63ed608..30f2543 100755
--- a/tests/yacc-bison-skeleton-cxx.test
+++ b/tests/yacc-bison-skeleton-cxx.test
@@ -20,8 +20,6 @@
required=bison
. ./defs || Exit 1
-set -e
-
cat >> configure.ac << 'END'
AC_PROG_CXX
AC_PROG_YACC
diff --git a/tests/yacc-bison-skeleton.test b/tests/yacc-bison-skeleton.test
index c42063c..b341401 100755
--- a/tests/yacc-bison-skeleton.test
+++ b/tests/yacc-bison-skeleton.test
@@ -20,8 +20,6 @@
required=bison
. ./defs || Exit 1
-set -e
-
cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_YACC
diff --git a/tests/yacc-clean-cxx.test b/tests/yacc-clean-cxx.test
index 7d9e1ae..ea21bff 100755
--- a/tests/yacc-clean-cxx.test
+++ b/tests/yacc-clean-cxx.test
@@ -23,8 +23,6 @@
required=yacc
. ./defs || Exit 1
-set -e
-
cat >> configure.ac << 'END'
AC_PROG_CXX
AC_PROG_YACC
diff --git a/tests/yacc-cxx.test b/tests/yacc-cxx.test
index 0286247..fe348cb 100755
--- a/tests/yacc-cxx.test
+++ b/tests/yacc-cxx.test
@@ -21,8 +21,6 @@
required=yacc
. ./defs || Exit 1
-set -e
-
cat >> configure.ac << 'END'
AC_PROG_CXX
AC_PROG_YACC
diff --git a/tests/yacc-d-cxx.test b/tests/yacc-d-cxx.test
index 2e3c737..51d78f1 100755
--- a/tests/yacc-d-cxx.test
+++ b/tests/yacc-d-cxx.test
@@ -21,12 +21,10 @@
required=yacc
. ./defs || Exit 1
-set -e
-
write_parse ()
{
header=$1
- sed 's/^ *//' <<END
+ unindent <<END
%{
// Valid C++, but deliberately invalid C.
#include <cstdlib>
@@ -43,7 +41,7 @@ END
write_main ()
{
header=$1
- sed 's/^ *//' <<END
+ unindent <<END
// Valid C++, but deliberately invalid C.
#include <cstdio>
#include "$header"
diff --git a/tests/yacc-deleted-headers.test b/tests/yacc-deleted-headers.test
index cb6af0f..5ab8d87 100755
--- a/tests/yacc-deleted-headers.test
+++ b/tests/yacc-deleted-headers.test
@@ -19,8 +19,6 @@
required=yacc
. ./defs || Exit 1
-set -e
-
cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_YACC
diff --git a/tests/yacc-depend.test b/tests/yacc-depend.test
index 8a3c0ee..73d64ad 100755
--- a/tests/yacc-depend.test
+++ b/tests/yacc-depend.test
@@ -20,8 +20,6 @@
required=yacc
. ./defs || Exit 1
-set -e
-
cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_YACC
diff --git a/tests/yacc-depend2.test b/tests/yacc-depend2.test
index 205c21c..879cc59 100755
--- a/tests/yacc-depend2.test
+++ b/tests/yacc-depend2.test
@@ -21,8 +21,6 @@
required=yacc
. ./defs || Exit 1
-set -e
-
cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_YACC
diff --git a/tests/yacc-line.test b/tests/yacc-line.test
index 90c5e2f..ac6a0aa 100755
--- a/tests/yacc-line.test
+++ b/tests/yacc-line.test
@@ -22,8 +22,6 @@
required=yacc
. ./defs || Exit 1
-set -e
-
cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/Makefile])
AC_PROG_CC
diff --git a/tests/yacc-mix-c-cxx.test b/tests/yacc-mix-c-cxx.test
index 82350c6..8f72b35 100755
--- a/tests/yacc-mix-c-cxx.test
+++ b/tests/yacc-mix-c-cxx.test
@@ -20,8 +20,6 @@
required=yacc
. ./defs || Exit 1
-set -e
-
cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_CXX
diff --git a/tests/yacc-weirdnames.test b/tests/yacc-weirdnames.test
index 909b018..82270fe 100755
--- a/tests/yacc-weirdnames.test
+++ b/tests/yacc-weirdnames.test
@@ -19,8 +19,6 @@
. ./defs || Exit 1
-set -e
-
cat >> configure.ac << 'END'
AC_PROG_CC
AC_PROG_CXX
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-2082-gd1afb32,
Stefano Lattarini <=