[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-496-
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-496-gacc9335 |
|
Date: |
Mon, 06 Dec 2010 21:30:38 +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=acc93358b841a579393c0e037b2a702952cf82e7
The branch, master has been updated
via acc93358b841a579393c0e037b2a702952cf82e7 (commit)
via 80bbbbd980036b67d4c5598c331dbabe94dbfa8a (commit)
via a06fad53c65346e8b209de31b3a58c1b3fcba1a2 (commit)
via 3f8c6cc89903355bf3dbef19a4a94070229c69f3 (commit)
via deef1c3bc249879e07345f7146ab09231dc65648 (commit)
via 39a6752f0a0bf9678299f30ec00d0279ef77c8fe (commit)
via 2e6a7406859301154d81472b4a94f0c17411ba29 (commit)
from bdbfb77af3c0618b319d328d4af69299182de25c (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 acc93358b841a579393c0e037b2a702952cf82e7
Author: Stefano Lattarini <address@hidden>
Date: Mon Dec 6 22:23:03 2010 +0100
tweaked ChangeLog after merge
commit 80bbbbd980036b67d4c5598c331dbabe94dbfa8a
Merge: a06fad5 39a6752
Author: Stefano Lattarini <address@hidden>
Date: Mon Dec 6 22:21:53 2010 +0100
Merge branch 'test-overrid-split'
commit a06fad53c65346e8b209de31b3a58c1b3fcba1a2
Merge: 3f8c6cc 2e6a740
Author: Stefano Lattarini <address@hidden>
Date: Mon Dec 6 22:19:36 2010 +0100
Merge branch 'tests-set-e-enable-1'
commit 3f8c6cc89903355bf3dbef19a4a94070229c69f3
Merge: bdbfb77 deef1c3
Author: Stefano Lattarini <address@hidden>
Date: Mon Dec 6 22:19:36 2010 +0100
Merge branch 'tests-misc-fixes-3'
commit deef1c3bc249879e07345f7146ab09231dc65648
Author: Stefano Lattarini <address@hidden>
Date: Mon Jun 14 17:40:42 2010 +0200
Modernize, improve and/or tweak some test scripts.
* tests/maintclean.test: Use proper m4 quoting. Add trailing `:'
command.
* tests/sinclude.test: Likewise, and add a couple of blank lines,
for clarity.
* tests/make.test: Move setting of `errexit' shell flag earlier in
the script (just after inclusion of ./defs). Use the configure.in
stub created by ./defs, rather than writing it from scratch. Some
cosmetic changes in spacing. Ensure we wait enough time before
touching configure.in to trigger the rebuild rules.
* tests/makej.test: Use `$me' instead of hard-coding the test
name. Add trailing `:' command.
* tests/version7.test: Likewise.
* tests/space.test: Enable `errexit' shell flag, and related
changes.
* tests/makevars.test: Likewise. Also, prefer trailing `:' over
trailing `Exit 0', and be more tolerant of white spaces when
grepping Makefile.in.
commit 39a6752f0a0bf9678299f30ec00d0279ef77c8fe
Author: Stefano Lattarini <address@hidden>
Date: Wed Nov 24 15:01:31 2010 +0100
Separate checks on target overriding into multiple test scripts.
* tests/overrid.test: Deleted, its contents separated into ...
* tests/override-suggest-local.test: ... this new test ...
* tests/override-html.test: ... and this new test ...
* tests/override-conditional-1.test: ... and this new test ...
* tests/override-conditional-2.test: ... and this new test (still
xfailing).
* tests/Makefile.am (TESTS, XFAIL_TESTS): Updated.
commit 2e6a7406859301154d81472b4a94f0c17411ba29
Author: Stefano Lattarini <address@hidden>
Date: Fri Aug 20 19:53:38 2010 +0200
Enable `set -e' in more tests (plus some tweakings).
* tests/implicit.test: Enable `errexit' shell flag, and related
changes. Add trailing `:' command.
* tests/insh2.test: Likewise.
* tests/instman2.test: Likewise.
* tests/interp.test: Likewise.
* tests/interp2.test: Likewise.
* tests/library.test: Likewise.
* tests/mclean.test: Likewise.
* tests/info.test: Enable `errexit' shell flag, and related
changes. Add trailing `:' command. Remove useless chaff from
generated Makefile.am. Add a "FIXME" comment.
* tests/include.test: Enable `errexit' shell flag, and related
changes. Add trailing `:' command. Prefer cat + here-doc over
echo to append to configure.in. Make tests more robust by using
longer and less common names to grep. Remove an useless call to
echo. Remove an useless subshell.
* tests/header.test: Enable `errexit' shell flag, and related
changes. Use proper m4 quoting. Add excerpts from the original
report of the bug tested for by this script.
* tests/gcj.test: Enable `errexit' shell flag, and related
changes. Use proper m4 quoting. Add trailing `:' command.
* tests/gcj3.test: Likewise.
* tests/ldflags.test: Likewise.
* tests/libtool.test: Likewise.
* tests/listval.test: Likewise.
* tests/javaprim.test: Likewise, and prefer cat + here-doc over
echo to append to configure.in.
* tests/javasubst.test: Likewise.
* tests/discorver.test: Enable `errexit' shell flag. Prefer
trailing `:' over trailing `Exit 0'.
* tests/instdat.test: Enable `errexit' shell flag, and related
changes. Use proper m4 quoting. Avoid usless subshell. Prefer
cat + here-doc over echo to append to configure.in.
* tests/libtool2.test: Enable `errexit' shell flag, and related
changes. Add trailing `:' command. Use the configure.in
stub provided by ./defs, rather than writing it from scratch.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 68 ++++++++++++++++++++
tests/Makefile.am | 6 ++-
tests/Makefile.in | 8 ++-
tests/discover.test | 4 +-
tests/gcj.test | 14 +++--
tests/gcj3.test | 14 +++--
tests/header.test | 17 ++++-
tests/implicit.test | 10 ++-
tests/include.test | 28 +++++---
tests/info.test | 16 +++--
tests/insh2.test | 12 ++-
tests/instdat.test | 14 +++--
tests/instman2.test | 10 ++-
tests/interp.test | 10 ++-
tests/interp2.test | 8 ++-
tests/javaprim.test | 12 +++-
tests/javasubst.test | 14 +++-
tests/ldflags.test | 11 ++-
tests/library.test | 9 ++-
tests/libtool.test | 13 +++-
tests/libtool2.test | 20 +++---
tests/listval.test | 11 ++-
tests/maintclean.test | 6 +-
tests/make.test | 17 ++---
tests/makej.test | 8 ++-
tests/makevars.test | 12 ++--
tests/mclean.test | 10 ++-
tests/overrid.test | 67 -------------------
.../{colneq3.test => override-conditional-1.test} | 36 +++++++----
.../{colneq3.test => override-conditional-2.test} | 25 +++----
tests/{regex-obsolete.test => override-html.test} | 15 +++--
tests/{man8.test => override-suggest-local.test} | 49 +++++---------
tests/sinclude.test | 20 ++++--
tests/space.test | 6 +-
tests/version7.test | 9 ++-
35 files changed, 354 insertions(+), 255 deletions(-)
delete mode 100755 tests/overrid.test
copy tests/{colneq3.test => override-conditional-1.test} (65%)
copy tests/{colneq3.test => override-conditional-2.test} (74%)
copy tests/{regex-obsolete.test => override-html.test} (73%)
copy tests/{man8.test => override-suggest-local.test} (61%)
diff --git a/ChangeLog b/ChangeLog
index 232469c..08c5cbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,71 @@
+2010-02-06 Stefano Lattarini <address@hidden>
+
+ Separate checks on target overriding into multiple test scripts.
+ * tests/overrid.test: Deleted, its contents separated into ...
+ * tests/override-suggest-local.test: ... this new test ...
+ * tests/override-html.test: ... and this new test ...
+ * tests/override-conditional-1.test: ... and this new test ...
+ * tests/override-conditional-2.test: ... and this new test (still
+ xfailing).
+ * tests/Makefile.am (TESTS, XFAIL_TESTS): Updated.
+
+ Enable `set -e' in more tests (plus some tweakings).
+ * tests/implicit.test: Enable `errexit' shell flag, and related
+ changes. Add trailing `:' command.
+ * tests/insh2.test: Likewise.
+ * tests/instman2.test: Likewise.
+ * tests/interp.test: Likewise.
+ * tests/interp2.test: Likewise.
+ * tests/library.test: Likewise.
+ * tests/mclean.test: Likewise.
+ * tests/info.test: Enable `errexit' shell flag, and related
+ changes. Add trailing `:' command. Remove useless chaff from
+ generated Makefile.am. Add a "FIXME" comment.
+ * tests/include.test: Enable `errexit' shell flag, and related
+ changes. Add trailing `:' command. Prefer cat + here-doc over
+ echo to append to configure.in. Make tests more robust by using
+ longer and less common names to grep. Remove an useless call to
+ echo. Remove an useless subshell.
+ * tests/header.test: Enable `errexit' shell flag, and related
+ changes. Use proper m4 quoting. Add excerpts from the original
+ report of the bug tested for by this script.
+ * tests/gcj.test: Enable `errexit' shell flag, and related
+ changes. Use proper m4 quoting. Add trailing `:' command.
+ * tests/gcj3.test: Likewise.
+ * tests/ldflags.test: Likewise.
+ * tests/libtool.test: Likewise.
+ * tests/listval.test: Likewise.
+ * tests/javaprim.test: Likewise, and prefer cat + here-doc over
+ echo to append to configure.in.
+ * tests/javasubst.test: Likewise.
+ * tests/discorver.test: Enable `errexit' shell flag. Prefer
+ trailing `:' over trailing `Exit 0'.
+ * tests/instdat.test: Enable `errexit' shell flag, and related
+ changes. Use proper m4 quoting. Avoid usless subshell. Prefer
+ cat + here-doc over echo to append to configure.in.
+ * tests/libtool2.test: Enable `errexit' shell flag, and related
+ changes. Add trailing `:' command. Use the configure.in
+ stub provided by ./defs, rather than writing it from scratch.
+
+ Modernize, improve and/or tweak some test scripts.
+ * tests/maintclean.test: Use proper m4 quoting. Add trailing `:'
+ command.
+ * tests/sinclude.test: Likewise, and add a couple of blank lines,
+ for clarity.
+ * tests/make.test: Move setting of `errexit' shell flag earlier in
+ the script (just after inclusion of ./defs). Use the configure.in
+ stub created by ./defs, rather than writing it from scratch. Some
+ cosmetic changes in spacing. Ensure we wait enough time before
+ touching configure.in to trigger the rebuild rules.
+ * tests/makej.test: Use `$me' instead of hard-coding the test
+ name. Add trailing `:' command.
+ * tests/version7.test: Likewise.
+ * tests/space.test: Enable `errexit' shell flag, and related
+ changes.
+ * tests/makevars.test: Likewise. Also, prefer trailing `:' over
+ trailing `Exit 0', and be more tolerant of white spaces when
+ grepping Makefile.in.
+
2010-12-02 Stefano Lattarini <address@hidden>
* tests/silent8.test: Use "|| Exit 1" after ". ./defs".
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 83dcdf0..43a2a7f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,6 +24,7 @@ all.test \
auxdir2.test \
cond17.test \
gcj6.test \
+override-conditional-2.test \
txinfo5.test
@@ -623,7 +624,10 @@ output11.test \
output12.test \
output13.test \
output-order.test \
-overrid.test \
+override-conditional-1.test \
+override-conditional-2.test \
+override-html.test \
+override-suggest-local.test \
parallel-am.test \
parallel-am2.test \
parallel-am3.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 87dff85..154e120 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -284,7 +284,8 @@ top_srcdir = @top_srcdir@
MAINTAINERCLEANFILES = $(parallel_tests) $(instspc_tests)
EXTRA_DIST = ChangeLog-old gen-parallel-tests instspc-tests.sh \
$(TESTS)
-XFAIL_TESTS = all.test auxdir2.test cond17.test gcj6.test txinfo5.test \
+XFAIL_TESTS = all.test auxdir2.test cond17.test gcj6.test \
+ override-conditional-2.test txinfo5.test \
$(instspc_xfail_tests)
parallel_tests = backcompat5-p.test check-p.test check10-p.test \
check11-p.test check2-p.test check3-p.test check4-p.test \
@@ -885,7 +886,10 @@ output11.test \
output12.test \
output13.test \
output-order.test \
-overrid.test \
+override-conditional-1.test \
+override-conditional-2.test \
+override-html.test \
+override-suggest-local.test \
parallel-am.test \
parallel-am2.test \
parallel-am3.test \
diff --git a/tests/discover.test b/tests/discover.test
index 0e4faa3..f319604 100755
--- a/tests/discover.test
+++ b/tests/discover.test
@@ -19,6 +19,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_RANLIB
AC_PROG_CC
@@ -39,4 +41,4 @@ AUTOMAKE_fails
grep 'automatically discovered.*fsusage\.c.*explicitly mentioned' stderr
-Exit 0
+:
diff --git a/tests/gcj.test b/tests/gcj.test
index c32a1b2..b9819dd 100755
--- a/tests/gcj.test
+++ b/tests/gcj.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2010 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
@@ -18,9 +18,11 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
-_AM_DEPENDENCIES(GCJ)
-AC_SUBST(GCJ)
+_AM_DEPENDENCIES([GCJ])
+AC_SUBST([GCJ])
END
cat > Makefile.am << 'END'
@@ -28,7 +30,9 @@ bin_PROGRAMS = convert
convert_SOURCES = x/y/convert.java
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^x/y/convert' Makefile.in
+
+:
diff --git a/tests/gcj3.test b/tests/gcj3.test
index 7d8a981..5652124 100755
--- a/tests/gcj3.test
+++ b/tests/gcj3.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2010 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
@@ -18,9 +18,11 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
-_AM_DEPENDENCIES(GCJ)
-AC_SUBST(GCJ)
+_AM_DEPENDENCIES([GCJ])
+AC_SUBST([GCJ])
END
cat > Makefile.am << 'END'
@@ -28,8 +30,10 @@ bin_PROGRAMS = convert
convert_SOURCES = x/y/convert.java
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
num=`grep depcomp Makefile.in | wc -l`
test $num -gt 1
+
+:
diff --git a/tests/header.test b/tests/header.test
index 2ad2735..bd06b16 100755
--- a/tests/header.test
+++ b/tests/header.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2010 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
@@ -15,11 +15,20 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test for PR 68.
+#
+# == Report ==
+# If an autoconf substitution variable of the form "*_HEADERS" --
+# for example "MY_HEADERS" -- is used in an "include_" variable
+# in conjunction with EXTRA_HEADERS, $(MY_HEADERS) gets included
+# in the HEADERS variable for *all* generated Makefile.ins in the
+# project.
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
-AC_SUBST(MY_HEADERS)
+AC_SUBST([MY_HEADERS])
AC_PROG_CC
END
@@ -31,8 +40,8 @@ END
: > joe.c
: > qq.h
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'address@hidden' Makefile.in && Exit 1
Exit 0
diff --git a/tests/implicit.test b/tests/implicit.test
index 210b2dc..c1c3479 100755
--- a/tests/implicit.test
+++ b/tests/implicit.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1996, 2001, 2002, 2010 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
@@ -19,6 +19,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CC
END
@@ -27,7 +29,9 @@ cat > Makefile.am << 'END'
noinst_PROGRAMS = libapp_1
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^libapp_1_OBJECTS' Makefile.in | $FGREP '.$(OBJEXT)'
+
+:
diff --git a/tests/include.test b/tests/include.test
index 350f8fc..180b025 100755
--- a/tests/include.test
+++ b/tests/include.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2005, 2006, 2010 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
@@ -19,22 +20,25 @@
. ./defs || Exit 1
-echo AC_OUTPUT >> configure.in
+set -e
+
+cat >> configure.in <<END
+AC_OUTPUT
+END
cat > Makefile.am << 'END'
-include foo
+include Will_Be_Included_In_Makefile
END
-: > foo
+: > Will_Be_Included_In_Makefile
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-len="`grep '^srcdir' Makefile.in | wc -l`"
-echo "len = $len"
-test $len -eq 1 || Exit 1
+$ACLOCAL
+$AUTOMAKE
+len=`grep '^srcdir' Makefile.in | wc -l`
+test $len -eq 1
# Also make sure include file is distributed.
-(sed -n -e '/^DIST_COMMON =.*\\$/ {
+sed -n -e '/^DIST_COMMON =.*\\$/ {
:loop
p
n
@@ -44,4 +48,6 @@ test $len -eq 1 || Exit 1
t loop
p
n
- }' -e '/^DIST_COMMON =/ p' Makefile.in | grep foo)
+ }' -e '/^DIST_COMMON =/ p' Makefile.in | grep Will_Be_Included_In_Makefile
+
+:
diff --git a/tests/info.test b/tests/info.test
index 2cde524..e99a187 100755
--- a/tests/info.test
+++ b/tests/info.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 2001, 2002, 2010 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
@@ -15,21 +16,22 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test to make sure info files are distributed correctly.
+# FIXME: This test is probably obsoleted, or wrong. The generated
+# Makefile.in seems not to define any `INFOS' variable!
. ./defs || Exit 1
+set -e
+
cat > Makefile.am << 'END'
info_TEXINFOS = foo.texi
-
-magic:
- @echo $(INFOS)
END
echo '@setfilename foo.info' > foo.texi
: > texinfo.tex
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
for i in `grep '^INFOS =' Makefile.in | sed -e 's/^INFOS = //'`; do
echo $i
@@ -41,3 +43,5 @@ for i in `grep '^INFOS =' Makefile.in | sed -e 's/^INFOS =
//'`; do
;;
esac
done
+
+:
diff --git a/tests/insh2.test b/tests/insh2.test
index c64f1f7..c3da9a9 100755
--- a/tests/insh2.test
+++ b/tests/insh2.test
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2010 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
@@ -19,14 +19,18 @@
. ./defs || Exit 1
+set -e
+
cat > Makefile.am << 'END'
pkgdata_DATA =
magic:
@echo $(DISTFILES)
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
$FGREP -v @SET_MAKE@ Makefile.in > Makefile.sed
$MAKE -s -f Makefile.sed SHELL=$SHELL magic | grep install-sh
+
+:
diff --git a/tests/instdat.test b/tests/instdat.test
index a6ec01a..d5b4d07 100755
--- a/tests/instdat.test
+++ b/tests/instdat.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2001, 2002, 2010 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
@@ -19,12 +19,16 @@
. ./defs || Exit 1
-echo 'AC_SUBST(INSTALL_DATA)' >> configure.in
+set -e
+
+cat >> configure.in <<END
+AC_SUBST([INSTALL_DATA])
+END
: > Makefile.am
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
-(grep '^DATA =' Makefile.in | grep INSTALL_DATA) && Exit 1
+grep '^DATA =' Makefile.in | grep 'INSTALL_DATA' && Exit 1
Exit 0
diff --git a/tests/instman2.test b/tests/instman2.test
index 77844fa..c519214 100755
--- a/tests/instman2.test
+++ b/tests/instman2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2010 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
@@ -19,13 +19,17 @@
. ./defs || Exit 1
+set -e
+
cat > Makefile.am << 'EOF'
man8_MANS = frob.8
EOF
: > frob.8
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^install-man' Makefile.in
+
+:
diff --git a/tests/interp.test b/tests/interp.test
index af82e33..82938f9 100755
--- a/tests/interp.test
+++ b/tests/interp.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1996, 2001, 2002, 2010 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
@@ -18,6 +18,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CC
END
@@ -28,7 +30,9 @@ s1 = z.c
qqq_SOURCES = $(s1)
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
$FGREP 'z.$(OBJEXT)' Makefile.in
+
+:
diff --git a/tests/interp2.test b/tests/interp2.test
index cff8d1d..a25d531 100755
--- a/tests/interp2.test
+++ b/tests/interp2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1996, 2001, 2002, 2010 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
@@ -19,6 +19,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CC
AC_PATH_X
@@ -31,5 +33,7 @@ x_SOURCES = x.c
x_LDADD = $(X_EXTRA_LIBS)
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
+
+:
diff --git a/tests/javaprim.test b/tests/javaprim.test
index aa1506b..988024d 100755
--- a/tests/javaprim.test
+++ b/tests/javaprim.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2001, 2002, 2010 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
@@ -18,12 +18,18 @@
. ./defs || Exit 1
-echo 'AC_SUBST(JAVA)' >> configure.in
+set -e
+
+cat >> configure.in << 'END'
+AC_SUBST([JAVA])
+END
cat > Makefile.am << 'END'
javadir = $(datadir)/java
java_JAVA = a.java b.java c.java
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
+
+:
diff --git a/tests/javasubst.test b/tests/javasubst.test
index d018645..ae6bb78 100755
--- a/tests/javasubst.test
+++ b/tests/javasubst.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2001, 2002, 2010 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
@@ -18,14 +18,20 @@
. ./defs || Exit 1
-echo 'AC_SUBST(JAVAC)' >> configure.in
+set -e
+
+cat >> configure.in << 'END'
+AC_SUBST([JAVAC])
+END
cat > Makefile.am << 'END'
javadir = $(datadir)/java
java_JAVA = a.java b.java c.java
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'address@hidden@' Makefile.in
+
+:
diff --git a/tests/ldflags.test b/tests/ldflags.test
index 39ca274..d078eaa 100755
--- a/tests/ldflags.test
+++ b/tests/ldflags.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2010 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
@@ -16,14 +16,17 @@
# Check for LDFLAGS in conditional.
# PR 77.
+
required=libtool
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_LIBTOOL
AC_SUBST([LTLIBOBJS], [q.o])
-AM_CONDITIONAL(USE_SWIG, :)
+AM_CONDITIONAL([USE_SWIG], [:])
AC_OUTPUT
END
@@ -41,5 +44,7 @@ END
: > config.sub
: > q.c
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
+
+:
diff --git a/tests/library.test b/tests/library.test
index 1e2b58b..b35e883 100755
--- a/tests/library.test
+++ b/tests/library.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2008 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2001, 2002, 2008, 2010 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
@@ -18,6 +19,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_RANLIB
AM_MAINTAINER_MODE
@@ -30,5 +33,7 @@ lib_LIBRARIES = libfoo.a
libfoo_a_DEPENDENCIES = libzot.a
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
+
+:
diff --git a/tests/libtool.test b/tests/libtool.test
index dd2a939..a75eada 100755
--- a/tests/libtool.test
+++ b/tests/libtool.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2010 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
@@ -16,14 +16,17 @@
# Make sure libtool is removed.
# Report from Kevin Dalley
+
required=libtool
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_LIBTOOL_DLOPEN
AC_DISABLE_SHARED
AC_PROG_LIBTOOL
-AC_SUBST(LIBTOOL_DEPS)
+AC_SUBST([LIBTOOL_DEPS])
END
: > Makefile.am
@@ -32,7 +35,9 @@ END
: > config.guess
: > config.sub
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'rm -f libtool' Makefile.in
+
+:
diff --git a/tests/libtool2.test b/tests/libtool2.test
index a50f6a4..e4ea89e 100755
--- a/tests/libtool2.test
+++ b/tests/libtool2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2010 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
@@ -16,20 +16,16 @@
# Make sure libtool clean targets exist.
# Report from Eric Magnien.
+
required=libtoolize
. ./defs || Exit 1
-cat > configure.in << 'END'
-AC_INIT
-AM_INIT_AUTOMAKE(mypackage,0.1)
+set -e
+cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_LIBTOOL
-
-AC_CONFIG_FILES([
- sub/Makefile
- Makefile
-])
+AC_CONFIG_FILES([sub/Makefile])
AC_OUTPUT
END
@@ -45,8 +41,10 @@ lib_LTLIBRARIES = libfoo.la
libfoo_la_SOURCES = foo.c
END
-$ACLOCAL || Exit 1
+$ACLOCAL
: > ltmain.sh
-$AUTOMAKE -a || Exit 1
+$AUTOMAKE -a
grep 'rm -f .*\.lo' sub/Makefile.in
+
+:
diff --git a/tests/listval.test b/tests/listval.test
index 5ff75db..5a71a05 100755
--- a/tests/listval.test
+++ b/tests/listval.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2010 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
@@ -16,11 +16,14 @@
# Test to make sure variable is expanded properly.
# From Adam J. Richter.
+
required=libtool
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
-AC_SUBST(LTLIBOBJS)
+AC_SUBST([LTLIBOBJS])
AC_PROG_LIBTOOL
END
@@ -37,5 +40,7 @@ END
: > config.guess
: > config.sub
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
+
+:
diff --git a/tests/maintclean.test b/tests/maintclean.test
index a66464b..e4f09fd 100755
--- a/tests/maintclean.test
+++ b/tests/maintclean.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2010 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
@@ -21,7 +21,7 @@
set -e
cat >> configure.in << 'END'
-AC_CONFIG_FILES(bar)
+AC_CONFIG_FILES([bar])
AC_OUTPUT
END
@@ -74,3 +74,5 @@ test ! -f foo.c
test ! -f Makefile
test ! -f config.status
test ! -d autom4te.cache
+
+:
diff --git a/tests/make.test b/tests/make.test
index 1e3184d..f866b31 100755
--- a/tests/make.test
+++ b/tests/make.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2010 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
@@ -20,17 +20,15 @@
required=GNUmake
. ./defs || Exit 1
-cat > configure.in << 'END'
-AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(foo,0,no)
+set -e
+
+cat >> configure.in << 'END'
AM_MAKE_INCLUDE
-AC_OUTPUT(Makefile)
+AC_OUTPUT
END
: > Makefile.am
-set -e
-
$ACLOCAL
$AUTOCONF
$AUTOMAKE
@@ -45,14 +43,11 @@ export AUTOMAKE
save="$MAKE"
for flag in '' -w; do
MAKE="$save $flag" ./configure
-
$FGREP 'am__include = include' Makefile
-
+ $sleep
touch configure.in
$MAKE $flag
-
$FGREP 'am__include = include' Makefile
-
rm -f config.cache
done
diff --git a/tests/makej.test b/tests/makej.test
index e5d55a1..d85be0f 100755
--- a/tests/makej.test
+++ b/tests/makej.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2010 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
@@ -26,9 +26,9 @@ required=GNUmake
set -e
-cat >configure.in <<'END'
+cat >configure.in <<END
m4_include([version.m4])
-AC_INIT([version7], [THE_VERSION])
+AC_INIT([$me], [THE_VERSION])
AM_INIT_AUTOMAKE
AC_CONFIG_HEADER([config.h])
AC_CONFIG_FILES([Makefile])
@@ -51,3 +51,5 @@ $sleep
echo 'm4_define([THE_VERSION], [3.141])' > version.m4
$MAKE -j
./configure --version | grep '3\.141'
+
+:
diff --git a/tests/makevars.test b/tests/makevars.test
index f4a80aa..31fdd56 100755
--- a/tests/makevars.test
+++ b/tests/makevars.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2010 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
@@ -19,15 +19,17 @@
. ./defs || Exit 1
+set -e
+
# Find the macros wanted by Automake.
-$ACLOCAL || Exit 1
+$ACLOCAL
# Create some dummy Makefile.in.
: > Makefile.am
-$AUTOMAKE || Exit 1
+$AUTOMAKE
# We are definitely not needing a compiler or preprocessor.
-$EGREP '^(CC|CPP|CXX|CXXCPP) =' Makefile.in && Exit 1
+$EGREP '^ *(CC|CPP|CXX|CXXCPP) *=' Makefile.in && Exit 1
-Exit 0
+:
diff --git a/tests/mclean.test b/tests/mclean.test
index dcbe818..331b3d7 100755
--- a/tests/mclean.test
+++ b/tests/mclean.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2010 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
@@ -19,13 +19,17 @@
. ./defs || Exit 1
+set -e
+
cat > Makefile.am << 'END'
MAINTAINERCLEANFILES = foo
END
: > FOO
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'rm -f .*MAINTAINERCLEANFILES' Makefile.in
+
+:
diff --git a/tests/overrid.test b/tests/overrid.test
deleted file mode 100755
index df453ca..0000000
--- a/tests/overrid.test
+++ /dev/null
@@ -1,67 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2003, 2004, 2006 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 automake -Woverride suggests using TARGET-local instead
-# of TARGET when possible.
-
-. ./defs || Exit 1
-
-set -e
-
-cat >> configure.in << 'END'
-AM_CONDITIONAL([COND], [:])
-END
-
-cat > Makefile.am << 'END'
-install:
- :
-installcheck:
- :
-html:
- :
-clean-am:
- :
-
-if COND
-ps: mine
- :
-endif
-END
-
-$ACLOCAL
-$AUTOMAKE -Wno-override
-AUTOMAKE_fails
-grep ':.*install-local' stderr && Exit 1 # There is no such thing as
install-local
-grep ':.*installcheck-local' stderr
-grep ':.*html-local' stderr
-# Make sure overriding *-am targets suggest using *-local, not *-am.
-grep ':.*clean-am-local' stderr && Exit 1
-grep ':.*clean-local' stderr
-
-# Conditional overrides ought to be diagnosed, but it can't be done yet.
-# See the FIXME in Automake::Rule::define. Once this is fixed, the grep below
-# will fail. If you see the failure, it means you fixed Automake. Well done!
-# Just strip out the next '&& Exit 1' and this comment.
-grep ':.*overrides.*ps' stderr && Exit 1
-
-# Test for another issue. Overriding html: should cause only one
-# html: rule to be output.
-test `grep '^html:' Makefile.in | wc -l` = 1
-
-# ps: should be output in two conditions
-test `grep '[^-]ps:' Makefile.in | wc -l` = 2
-grep '@address@hidden: mine' Makefile.in
-grep '@address@hidden: ps-am' Makefile.in
diff --git a/tests/colneq3.test b/tests/override-conditional-1.test
similarity index 65%
copy from tests/colneq3.test
copy to tests/override-conditional-1.test
index 0ff8bce..fe0bbba 100755
--- a/tests/colneq3.test
+++ b/tests/override-conditional-1.test
@@ -1,3 +1,4 @@
+
#! /bin/sh
# Copyright (C) 2010 Free Software Foundation, Inc.
#
@@ -14,33 +15,42 @@
# 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 that := definitions work as expected at make time.
+# Test for conditionally-defined overrides.
-required=GNUmake
. ./defs || Exit 1
set -e
cat >> configure.in << 'END'
+AM_CONDITIONAL([COND], [test x"$cond" = x"yes"])
AC_OUTPUT
END
cat > Makefile.am << 'END'
-BAR := $(FOO)
-BAZ = $(FOO)
-FOO := foo
-.PHONY: test
-test:
- test x'$(FOO)' = x'foo'
- test x'$(BAZ)' = x'foo'
- test x'$(BAR)' = x
+foobar:
+ : > $@
+if COND
+ps: foobar
+ :
+endif
END
$ACLOCAL
+$AUTOMAKE -Wno-override
+
+# "ps:" should be output in two conditions
+test `grep '[^-]ps:' Makefile.in | wc -l` = 2
+grep '@address@hidden: *foobar' Makefile.in
+grep '@address@hidden: *ps-am' Makefile.in
+
$AUTOCONF
-$AUTOMAKE -Wno-portability
-./configure
-$MAKE test
+./configure cond=no
+$MAKE ps
+test ! -r foobar
+
+./configure cond=yes
+$MAKE ps
+test -f foobar
:
diff --git a/tests/colneq3.test b/tests/override-conditional-2.test
similarity index 74%
copy from tests/colneq3.test
copy to tests/override-conditional-2.test
index 0ff8bce..132b841 100755
--- a/tests/colneq3.test
+++ b/tests/override-conditional-2.test
@@ -14,33 +14,28 @@
# 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 that := definitions work as expected at make time.
+# Test that conditional overrides are diagnosed.
+# This test is still xfailing; see the FIXME in Automake::Rule::define.
+# Once that is fixed, the test should succeed.
-required=GNUmake
. ./defs || Exit 1
set -e
cat >> configure.in << 'END'
-AC_OUTPUT
+AM_CONDITIONAL([COND], [:])
END
cat > Makefile.am << 'END'
-BAR := $(FOO)
-BAZ = $(FOO)
-FOO := foo
-.PHONY: test
-test:
- test x'$(FOO)' = x'foo'
- test x'$(BAZ)' = x'foo'
- test x'$(BAR)' = x
+if COND
+all:
+ :
+endif
END
$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -Wno-portability
-./configure
-$MAKE test
+AUTOMAKE_fails
+grep ':.*overrides.*all' stderr
:
diff --git a/tests/regex-obsolete.test b/tests/override-html.test
similarity index 73%
copy from tests/regex-obsolete.test
copy to tests/override-html.test
index c283025..baece42 100755
--- a/tests/regex-obsolete.test
+++ b/tests/override-html.test
@@ -14,19 +14,22 @@
# 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 tha the AM_WITH_REGEX macro is reported as obsolete.
+# Test that overriding `html' target causes only one "html:" rule to
+# be output.
. ./defs || Exit 1
set -e
-cat >> configure.in << 'END'
-AM_WITH_REGEX
+cat > Makefile.am << 'END'
+html:
+ :
END
$ACLOCAL
-$AUTOCONF -Werror -Wobsolete 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep '^configure\.in:.*AM_WITH_REGEX.*obsolete' stderr
+$AUTOMAKE -Wno-override
+
+# Overriding `html' should cause only one "html:" rule to be output.
+test `grep '^html:' Makefile.in | wc -l` = 1
:
diff --git a/tests/man8.test b/tests/override-suggest-local.test
similarity index 61%
copy from tests/man8.test
copy to tests/override-suggest-local.test
index 2ef52b4..851393a 100755
--- a/tests/man8.test
+++ b/tests/override-suggest-local.test
@@ -14,45 +14,32 @@
# 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 for a bug in distcheck w.r.t. generated manpages.
+# Make sure automake -Woverride suggests using TARGET-local instead
+# of TARGET when possible.
. ./defs || Exit 1
set -e
cat > Makefile.am << 'END'
-dist_man_MANS = foo.1
-foo.1:
- rm -f $(srcdir)/$@ # fails if $(srcdir) is unwritable
- : > $(srcdir)/$@
-END
-
-cat >> configure.in <<'END'
-AC_OUTPUT
+install:
+ :
+installcheck:
+ :
+html:
+ :
+clean-am:
+ :
END
$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-
-mkdir build
-cd build
-../configure
-
-$MAKE
-test -f ../foo.1
-$MAKE distdir
-test -f $me-1.0/foo.1
-$MAKE distcheck
-
-cd ..
-rm -f foo.1
-./configure
-
-$MAKE
-test -f foo.1
-$MAKE distdir
-test -f $me-1.0/foo.1
-$MAKE distcheck
+$AUTOMAKE -Wno-override
+AUTOMAKE_fails
+grep ':.*install-local' stderr && Exit 1 # There is no such thing as
install-local
+grep ':.*installcheck-local' stderr
+grep ':.*html-local' stderr
+# Make sure overriding *-am targets suggest using *-local, not *-am.
+grep ':.*clean-am-local' stderr && Exit 1
+grep ':.*clean-local' stderr
:
diff --git a/tests/sinclude.test b/tests/sinclude.test
index cc8898b..7aff525 100755
--- a/tests/sinclude.test
+++ b/tests/sinclude.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2001, 2002, 2003, 2005, 2010 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
@@ -31,27 +32,28 @@ sinclude([doesntexist.m4])
EOF
mkdir sub
+
cat > sub/p.m4 << 'END'
-AC_SUBST(MAGICALPIG)
+AC_SUBST([MAGICALPIG])
END
cat > sub/h.m4 << 'END'
-AC_SUBST(MAGICALHOG)
+AC_SUBST([MAGICALHOG])
END
cat > sub/g.m4 << 'END'
-AC_SUBST(GREPME)
+AC_SUBST([GREPME])
END
: > Makefile.am
-echo 'sinclude(sub/g.m4)' >> acinclude.m4
-echo 'm4_sinclude(sub/doesntexist.m4)' >> acinclude.m4
+echo 'sinclude([sub/g.m4])' >> acinclude.m4
+echo 'm4_sinclude([sub/doesntexist.m4])' >> acinclude.m4
$ACLOCAL
-echo 'm4_sinclude(sub/p.m4)' >> aclocal.m4
-echo 'm4_include(sub/h.m4)' >> aclocal.m4
+echo 'm4_sinclude([sub/p.m4])' >> aclocal.m4
+echo 'm4_include([sub/h.m4])' >> aclocal.m4
$AUTOMAKE
@@ -59,3 +61,5 @@ grep doesntexist Makefile.in && Exit 1
grep MAGICALPIG Makefile.in
grep MAGICALHOG Makefile.in
grep GREPME Makefile.in
+
+:
diff --git a/tests/space.test b/tests/space.test
index a4ab5a8..05a90dd 100755
--- a/tests/space.test
+++ b/tests/space.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2010 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
@@ -18,6 +18,8 @@
. ./defs || Exit 1
+set -e
+
echo AC_PROG_CC >> configure.in
cat > Makefile.am << 'END'
@@ -25,5 +27,5 @@ cat > Makefile.am << 'END'
foo_SOURCES = foo.c
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/version7.test b/tests/version7.test
index 4df84ed..a87b2b8 100755
--- a/tests/version7.test
+++ b/tests/version7.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2008, 2010 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
@@ -24,9 +24,9 @@ required='makeinfo tex texi2dvi GNUmake'
set -e
-cat >configure.in <<'END'
+cat >configure.in <<END
m4_include([version.m4])
-AC_INIT([version7], [THE_VERSION])
+AC_INIT([$me], [THE_VERSION])
AM_INIT_AUTOMAKE
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
@@ -59,9 +59,10 @@ $AUTOMAKE --add-missing
$MAKE
grep '2\.718' version.texi
-
$sleep
echo 'm4_define([THE_VERSION], [3.141])' > version.m4
$MAKE distcheck
./configure --version | grep '3\.141'
grep '3\.141' version.texi
+
+:
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-496-gacc9335,
Stefano Lattarini <=