[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11
|
From: |
Ralf Wildenhues |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-97-g5b6cbc0 |
|
Date: |
Sun, 06 Jun 2010 12:48:14 +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=5b6cbc0fdfdc514237611c6c17c1222726c6dc33
The branch, branch-1.11 has been updated
via 5b6cbc0fdfdc514237611c6c17c1222726c6dc33 (commit)
via ac61ca33187ca451bb01d733b472a027003e72b7 (commit)
via 121470109ab5ff5b7a4dc89f1b2916c6d4931c21 (commit)
via 949d1f0e14c06caa70c5b2b1b791e24c931cf56d (commit)
via 71288283bca6ba61325feb86badbc7719bc90234 (commit)
via d18bf57de4f2bfccf89bda9aecd3ed2440671328 (commit)
from 829c13e4c32a8990b36ab8086b64b3d3774b1059 (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 5b6cbc0fdfdc514237611c6c17c1222726c6dc33
Merge: 829c13e4c32a8990b36ab8086b64b3d3774b1059
ac61ca33187ca451bb01d733b472a027003e72b7
Author: Ralf Wildenhues <address@hidden>
Date: Sun Jun 6 14:30:27 2010 +0200
Merge branch 'maint' into branch-1.11
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 91 ++++++++++++++++++++++++++++++++++++++++++
tests/acoutnoq.test | 7 ++-
tests/acoutpt.test | 7 ++-
tests/acoutqnl.test | 8 ++-
tests/amassign.test | 4 +-
tests/ansi2.test | 9 +++-
tests/ansi4.test | 11 +++--
tests/badprog.test | 6 ++-
tests/checkall.test | 11 +++--
tests/clean.test | 8 ++-
tests/colneq2.test | 6 ++-
tests/colon.test | 7 ++-
tests/colon5.test | 9 +++-
tests/colon6.test | 7 ++-
tests/comment.test | 6 ++-
tests/compile_f90_c_cxx.test | 16 ++++---
tests/compile_f_c_cxx.test | 16 ++++---
tests/cond13.test | 8 ++-
tests/cond3.test | 11 +++--
tests/cond6.test | 6 ++-
tests/cond8.test | 12 ++++--
tests/conf2.test | 7 ++-
tests/confh4.test | 15 ++++++-
tests/confvar.test | 6 ++-
tests/confvar2.test | 4 +-
tests/cxx.test | 8 ++-
tests/cxxansi.test | 10 +++--
tests/cxxcpp.test | 9 ++--
tests/cxxlibobj.test | 8 ++-
tests/cxxlink.test | 8 ++-
tests/cxxo.test | 8 ++-
tests/dash.test | 6 ++-
tests/defun.test | 4 +-
tests/defun2.test | 6 ++-
tests/dejagnu.test | 8 ++-
tests/discover.test | 10 +++-
tests/distcom2.test | 17 +++++---
tests/double.test | 6 ++-
tests/empty2.test | 8 ++-
tests/empty3.test | 8 ++-
tests/empty4.test | 8 ++-
tests/exdir.test | 8 ++-
tests/ext.test | 12 ++++--
tests/extra.test | 10 +++--
tests/extra2.test | 8 ++-
tests/extra3.test | 6 ++-
tests/extra4.test | 7 ++-
tests/f90only.test | 25 +++---------
tests/flibs.test | 9 +++-
tests/fnoc.test | 9 +++-
tests/fo.test | 9 +++-
tests/fonly.test | 25 +++---------
tests/instexec.test | 8 ++-
tests/link_c_cxx.test | 14 +++----
tests/link_dist.test | 14 +++----
tests/link_f90_only.test | 14 +++---
tests/link_f_only.test | 14 +++---
tests/link_fc.test | 15 +++----
tests/link_fccxx.test | 16 +++----
tests/link_fcxx.test | 15 +++----
tests/ltdeps.test | 8 ++-
tests/nodep.test | 8 ++-
tests/nodepcomp.test | 6 ++-
63 files changed, 440 insertions(+), 250 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c52669a..9e1683d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,94 @@
+2010-06-06 Stefano Lattarini <address@hidden>
+
+ Improve tests link*.test (enable `errexit' shell flag).
+ * tests/link_c_cxx.test: Enable `errexit shell flag, and related
+ changes. Also, do not create useless source files.
+ * tests/link_dist.test: Likewise.
+ * tests/link_f90_only.test: Likewise.
+ * tests/link_f_only.test: Likewise.
+ * tests/link_fc.test: Likewise.
+ * tests/link_fccxx.test: Likewise.
+ * tests/link_fcxx.test: Likewise.
+
+2010-06-06 Ralf Wildenhues <address@hidden>
+
+ Improve ext.test semantics, avoid OpenBSD sh errexit issue.
+ * tests/ext.test: Inside shell compound command, use
+ `if $cmd; then Exit 1; fi' rather than `$cmd && Exit 1', to
+ fix failure with OpenBSD sh introduced with last patch.
+ Actually ensure that a rule for .EXT.o is created for each
+ known extension EXT.
+
+2010-06-06 Stefano Lattarini <address@hidden>
+
+ Enable `errexit' shell flag in some test scripts.
+ * tests/dash.test: Enable `errexit' shell flag, and related
+ changes.
+ * tests/defun.test: Likewise.
+ * tests/defun2.test: Likewise.
+ * tests/dejagnu.test: Likewise.
+ * tests/double.test: Likewise.
+ * tests/distcom2.test: Likewise.
+ * tests/empty2.test: Likewise.
+ * tests/empty3.test: Likewise.
+ * tests/empty4.test: Likewise.
+ * tests/exdir.test: Likewise.
+ * tests/ext.test: Likewise.
+ * tests/extra.test: Likewise.
+ * tests/extra2.test: Likewise.
+ * tests/extra3.test: Likewise.
+ * tests/extra4.test: Likewise.
+ * tests/flibs.test: Likewise.
+ * tests/fnoc.test: Likewise.
+ * tests/fo.test: Likewise.
+ * tests/instexec.test: Likewise.
+ * tests/ltdeps.test: Likewise.
+ * tests/nodep.test: Likewise.
+ * tests/nodepcomp.test: Likewise.
+ * tests/f90only.test: Likewise, and remove botched/obsoleted
+ comments and unecessary commands.
+ * tests/fonly.test: Likewise, and removed botched/obsolted
+ comments and unecessary commands.
+ * tests/discover.test: Likewise, and made stricter.
+
+ Enable `errexit' shell flag in all tests cxx*.test.
+ * tests/cxx.test: Enabled `errexit' shell flag, and related
+ minor changes.
+ * tests/cxxansi.test: Likewise.
+ * tests/cxxcpp.test: Likewise.
+ * tests/cxxlibobj.test: Likewise.
+ * tests/cxxlink.test: Likewise.
+ * tests/cxxo.test: Likewise.
+
+ Enable `errexit' shell flag in various tests.
+ * tests/acoutnoq.test: Enabled `errexit' shell flag, and related
+ minor changes.
+ * tests/acoutpt.test: Likewise.
+ * tests/acoutqnl.test: Likewise.
+ * tests/amassign.test: Likewise.
+ * tests/ansi2.test: Likewise.
+ * tests/ansi4.test: Likewise.
+ * tests/badprog.test: Likewise.
+ * tests/checkall.test: Likewise.
+ * tests/clean.test: Likewise.
+ * tests/colneq2.test: Likewise.
+ * tests/colon.test: Likewise.
+ * tests/colon5.test: Likewise.
+ * tests/colon6.test: Likewise.
+ * tests/comment.test: Likewise.
+ * tests/compile_f90_c_cxx.test: Likewise.
+ * tests/compile_f_c_cxx.test: Likewise.
+ * tests/cond3.test: Likewise.
+ * tests/cond6.test: Likewise.
+ * tests/cond13.test: Likewise.
+ * tests/conf2.test: Likewise.
+ * tests/confvar.test: Likewise.
+ * tests/confvar2.test: Likewise.
+ * tests/cond8.test: Likewise, plus a cosmetic change.
+ * tests/confh4.test: Likewise. Also, add in the heading comments
+ an excerpt from the original bug report which motivated the
+ creation of this test, to make its purpose clearer.
+
2010-06-06 Ralf Wildenhues <address@hidden>
Rewrite manual to be gender-neutral.
diff --git a/tests/acoutnoq.test b/tests/acoutnoq.test
index b7bb616..344905f 100755
--- a/tests/acoutnoq.test
+++ b/tests/acoutnoq.test
@@ -1,5 +1,6 @@
#!/bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1996, 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
@@ -22,6 +23,8 @@
. ./defs || Exit 1
+set -e
+
cat > configure.in << 'END'
AC_INIT
AM_INIT_AUTOMAKE(nonesuch, nonesuch)
@@ -30,5 +33,5 @@ END
: > Makefile.am
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/acoutpt.test b/tests/acoutpt.test
index b0e44ee..e18e4e4 100755
--- a/tests/acoutpt.test
+++ b/tests/acoutpt.test
@@ -1,5 +1,6 @@
#!/bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1996, 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,6 +20,8 @@
. ./defs || Exit 1
+set -e
+
cat > configure.in << 'END'
AC_INIT
AM_INIT_AUTOMAKE(nonesuch, nonesuch)
@@ -27,5 +30,5 @@ END
: > Makefile.am
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/acoutqnl.test b/tests/acoutqnl.test
index 70c5cbc..75736f2 100755
--- a/tests/acoutqnl.test
+++ b/tests/acoutqnl.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1996, 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 +19,8 @@
. ./defs || Exit 1
+set -e
+
cat > configure.in << 'END'
AC_INIT
AM_INIT_AUTOMAKE(nonesuch, nonesuch)
@@ -27,6 +30,5 @@ END
: > Makefile.am
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
-
diff --git a/tests/amassign.test b/tests/amassign.test
index 3e411c8..af098d2 100755
--- a/tests/amassign.test
+++ b/tests/amassign.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,6 +19,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AM_CFLAGS=foo
AC_SUBST(AM_BAR)
diff --git a/tests/ansi2.test b/tests/ansi2.test
index c0409a3..77ca2c6 100755
--- a/tests/ansi2.test
+++ b/tests/ansi2.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 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,6 +19,8 @@
. ./defs || Exit 1
+set -e
+
cat > Makefile.am << 'END'
AUTOMAKE_OPTIONS = ansi2knr
bin_PROGRAMS = joe
@@ -31,7 +34,7 @@ END
: > ansi2knr.c
: > ansi2knr.1
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^all[-a-z]*:.*ANSI2KNR' Makefile.in
diff --git a/tests/ansi4.test b/tests/ansi4.test
index baff19a..63250a9 100755
--- a/tests/ansi4.test
+++ b/tests/ansi4.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2008 Free Software Foundation, Inc.
+# Copyright (C) 1999, 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_CC
AM_C_PROTOTYPES
@@ -33,7 +36,7 @@ END
: > ansi2knr.c
: > hello.c
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
-$FGREP 'ansi2knr.$(' Makefile.in || Exit 1
+$FGREP 'ansi2knr.$(' Makefile.in
diff --git a/tests/badprog.test b/tests/badprog.test
index b8d45e9..7a31b3f 100755
--- a/tests/badprog.test
+++ b/tests/badprog.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
@@ -28,5 +30,5 @@ bin_PROGRAMS = a,b
a_b_SOURCES = ab.c
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/checkall.test b/tests/checkall.test
index 4e7388b..7dff8fc 100755
--- a/tests/checkall.test
+++ b/tests/checkall.test
@@ -1,5 +1,6 @@
#!/bin/sh
-# Copyright (C) 1996, 1997, 1998, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 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 +19,16 @@
. ./defs || Exit 1
+set -e
+
cat > Makefile.am << 'END'
bin_SCRIPTS = derived
check-local:
true
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
-grep '^check-am:.*all-am' Makefile.in || Exit 1
+grep '^check-am:.*all-am' Makefile.in
grep 'MAKE.*check-local' Makefile.in
diff --git a/tests/clean.test b/tests/clean.test
index df1c168..23ab2ac 100755
--- a/tests/clean.test
+++ b/tests/clean.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,9 +18,11 @@
. ./defs || Exit 1
+set -e
+
: > Makefile.am
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^clean-am:.*mostlyclean-am' Makefile.in
diff --git a/tests/colneq2.test b/tests/colneq2.test
index bca83ce..e454c46 100755
--- a/tests/colneq2.test
+++ b/tests/colneq2.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 > Makefile.am << 'END'
t = a b c
EXTRA_DIST = $(t:=.test)
@@ -27,5 +29,5 @@ END
: > b.test
: > c.test
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/colon.test b/tests/colon.test
index 2fd0538..da7a9da 100755
--- a/tests/colon.test
+++ b/tests/colon.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1996, 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,6 +20,8 @@
. ./defs || Exit 1
+set -e
+
cat > configure.in << 'END'
AC_INIT
AM_INIT_AUTOMAKE(nonesuch, nonesuch)
@@ -29,5 +32,5 @@ END
: > foo.hin
: > stamp-h.in
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/colon5.test b/tests/colon5.test
index 7813d94..fe97f99 100755
--- a/tests/colon5.test
+++ b/tests/colon5.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998, 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 +19,8 @@
. ./defs || Exit 1
+set -e
+
cat > configure.in << 'END'
AC_INIT
AM_INIT_AUTOMAKE(nonesuch, nonesuch)
@@ -27,7 +30,7 @@ END
: > Makefile.am
: > Makefile.dep
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'Makefile:Makefile.in' Makefile.in
diff --git a/tests/colon6.test b/tests/colon6.test
index 5bd9964..99877c5 100755
--- a/tests/colon6.test
+++ b/tests/colon6.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998, 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 +19,8 @@
. ./defs || Exit 1
+set -e
+
cat > configure.in << 'END'
AC_INIT
AM_INIT_AUTOMAKE(nonesuch, nonesuch)
@@ -29,5 +32,5 @@ mkdir demo
: > demo/Makefile.am
: > demo/version.gin
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/comment.test b/tests/comment.test
index 0051cd0..761dbf5 100755
--- a/tests/comment.test
+++ b/tests/comment.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,9 +19,11 @@
. ./defs || Exit 1
+set -e
+
cat > Makefile.am << 'END'
AUTOMAKE_OPTIONS = #no such option
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/compile_f90_c_cxx.test b/tests/compile_f90_c_cxx.test
index a685a29..21ed65d 100755
--- a/tests/compile_f90_c_cxx.test
+++ b/tests/compile_f90_c_cxx.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998, 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
@@ -20,6 +21,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_CXX
@@ -37,14 +40,13 @@ END
: > bar.c
: > baz.cc
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
+$ACLOCAL
+$AUTOMAKE
# Look for the macros at the beginning of rules. Be careful, as there
# are literal tabs at the beginning of the search strings.
-grep ' \$(COMPILE)' Makefile.in || Exit 1
-grep ' \$(CXXCOMPILE)' Makefile.in || Exit 1
-grep ' \$(FCCOMPILE)' Makefile.in || Exit 1
+$FGREP ' $(COMPILE)' Makefile.in
+$FGREP ' $(CXXCOMPILE)' Makefile.in
+$FGREP ' $(FCCOMPILE)' Makefile.in
Exit 0
diff --git a/tests/compile_f_c_cxx.test b/tests/compile_f_c_cxx.test
index 941c7db..a995527 100755
--- a/tests/compile_f_c_cxx.test
+++ b/tests/compile_f_c_cxx.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998, 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
@@ -20,6 +21,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_CXX
@@ -37,14 +40,13 @@ END
: > bar.c
: > baz.cc
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
+$ACLOCAL
+$AUTOMAKE
# Look for the macros at the beginning of rules. Be careful, as there
# are literal tabs at the beginning of the search strings.
-grep ' \$(COMPILE)' Makefile.in || Exit 1
-grep ' \$(CXXCOMPILE)' Makefile.in || Exit 1
-grep ' \$(F77COMPILE)' Makefile.in || Exit 1
+$FGREP ' $(COMPILE)' Makefile.in
+$FGREP ' $(CXXCOMPILE)' Makefile.in
+$FGREP ' $(F77COMPILE)' Makefile.in
Exit 0
diff --git a/tests/cond13.test b/tests/cond13.test
index 3cf5462..d8c4361 100755
--- a/tests/cond13.test
+++ b/tests/cond13.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,6 +19,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_CXX
@@ -47,7 +49,7 @@ endif
libtest_a_SOURCES = $(TESTSOURCES)
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'am_libtest_a_OBJECTS = .*$' Makefile.in
diff --git a/tests/cond3.test b/tests/cond3.test
index 6728721..e2dbdaf 100755
--- a/tests/cond3.test
+++ b/tests/cond3.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003 Free Software Foundation,
Inc.
+# Copyright (C) 1997, 1998, 1999, 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,6 +20,8 @@
. ./defs || Exit 1
+set -e
+
cat > configure.in << 'END'
AC_INIT
AM_INIT_AUTOMAKE(nonesuch, nonesuch)
@@ -53,8 +56,8 @@ endif
targ_SOURCES = $(SONE) $(STWO) $(STHREE)
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
# `b top' so that
sed -n '
@@ -76,4 +79,4 @@ am_targ_OBJECTS = $(am__objects_1) $(am__objects_2)
$(am__objects_3)
targ_OBJECTS = $(am_targ_OBJECTS)
EOF
-diff expected produced || Exit 1
+diff expected produced
diff --git a/tests/cond6.test b/tests/cond6.test
index 1f442f9..ec40032 100755
--- a/tests/cond6.test
+++ b/tests/cond6.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,6 +18,8 @@
. ./defs || Exit 1
+set -e
+
echo 'AM_CONDITIONAL(FOO, true)' >> configure.in
cat > Makefile.am << 'END'
@@ -37,5 +39,5 @@ help_DATA = foo
endif
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/cond8.test b/tests/cond8.test
index 195a912..0a45ad3 100755
--- a/tests/cond8.test
+++ b/tests/cond8.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,8 +19,12 @@
. ./defs || Exit 1
-echo 'AC_PROG_CC' >> configure.in
-echo 'AM_CONDITIONAL(X, false)' >> configure.in
+set -e
+
+cat >> configure.in << 'END'
+AC_PROG_CC
+AM_CONDITIONAL(X, false)
+END
cat > Makefile.am << 'END'
if X
@@ -30,5 +34,5 @@ noinst_PROGRAMS = x y
endif
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/conf2.test b/tests/conf2.test
index 23a8a5b..8e53733 100755
--- a/tests/conf2.test
+++ b/tests/conf2.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1997, 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1998, 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 +19,8 @@
. ./defs || Exit 1
+set -e
+
cat > configure.in << 'END'
AC_INIT
AM_INIT_AUTOMAKE(nonesuch, nonesuch)
@@ -31,5 +34,5 @@ END
: > config.h.in
: > two.h.in
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/confh4.test b/tests/confh4.test
index a93e38d..6fd4a07 100755
--- a/tests/confh4.test
+++ b/tests/confh4.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1999, 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,9 +16,17 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test for PR 34.
+# > Description:
+# Automake fails to add -I option to include configuration
+# header indicated like AM_CONFIG_HEADER(magick/config.h)
+# > How-To-Repeat:
+# Use AM_CONFIG_HEADER(subdir/config.h) to place configuration
+# header in subdirectory and observe that it is not included.
. ./defs || Exit 1
+set -e
+
cat > configure.in << 'END'
AC_INIT
AM_INIT_AUTOMAKE(nonesuch, nonesuch)
@@ -38,7 +47,7 @@ mkdir include
: > include/Makefile.am
: > include/config.h.in
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
$EGREP '^DEFAULT_INCLUDES =.* -I(\.|\$\(top_builddir\))/include' Makefile.in
diff --git a/tests/confvar.test b/tests/confvar.test
index f098baf..99811b0 100755
--- a/tests/confvar.test
+++ b/tests/confvar.test
@@ -18,13 +18,15 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_SUBST(QBERT)
END
: > Makefile.am
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^QBERT' Makefile.in
diff --git a/tests/confvar2.test b/tests/confvar2.test
index ea9c81e..75c02dc 100755
--- a/tests/confvar2.test
+++ b/tests/confvar2.test
@@ -18,6 +18,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_SUBST(OTHER_SCRIPTS)
END
@@ -26,5 +28,5 @@ cat > Makefile.am << 'END'
bin_SCRIPTS = foo
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/cxx.test b/tests/cxx.test
index 2105c00..aa2f225 100755
--- a/tests/cxx.test
+++ b/tests/cxx.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,6 +19,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CXX
END
@@ -28,7 +30,7 @@ bin_PROGRAMS = hello
hello_SOURCES = hello.c++
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^\.SUFFIXES:.*c[+][+]' Makefile.in
diff --git a/tests/cxxansi.test b/tests/cxxansi.test
index da8bd6b..8bbe9b2 100755
--- a/tests/cxxansi.test
+++ b/tests/cxxansi.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,6 +19,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CXX
AM_C_PROTOTYPES
@@ -36,10 +38,10 @@ END
: > doe.C
: > jane.C
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
$FGREP 'jane$U' Makefile.in && Exit 1
-$FGREP 'doe$U' Makefile.in || Exit 1
+$FGREP 'doe$U' Makefile.in
Exit 0
diff --git a/tests/cxxcpp.test b/tests/cxxcpp.test
index 257505f..09bb4eb 100755
--- a/tests/cxxcpp.test
+++ b/tests/cxxcpp.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,15 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CXXCPP
END
-
: > Makefile.am
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^CXXCPP' Makefile.in
diff --git a/tests/cxxlibobj.test b/tests/cxxlibobj.test
index 82f9e85..5f5ee30 100755
--- a/tests/cxxlibobj.test
+++ b/tests/cxxlibobj.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1997, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -18,6 +18,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CXX
AC_PROG_CC
@@ -34,7 +36,7 @@ END
: > doe.C
: > jane.C
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep CC Makefile.in
diff --git a/tests/cxxlink.test b/tests/cxxlink.test
index b7a86f0..66b3d29 100755
--- a/tests/cxxlink.test
+++ b/tests/cxxlink.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
AC_PROG_CXX
@@ -31,8 +33,8 @@ END
: > lava.c
: > lamp.cxx
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
# Look for this macro not at the beginning of any line; that will have
# to be good enough for now.
diff --git a/tests/cxxo.test b/tests/cxxo.test
index 116df06..a69fb2a 100755
--- a/tests/cxxo.test
+++ b/tests/cxxo.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
@@ -17,6 +17,8 @@
# Make sure C++ files are rewritten to ".o" and not just "o".
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CXX
END
@@ -28,7 +30,7 @@ END
: > doe.C
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
$FGREP 'doe.$(OBJEXT)' Makefile.in
diff --git a/tests/dash.test b/tests/dash.test
index 03876dd..335b891 100755
--- a/tests/dash.test
+++ b/tests/dash.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,11 +19,13 @@
. ./defs || Exit 1
+set -e
+
cat > Makefile.am << 'END'
include Make-lang
END
: > Make-lang
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/defun.test b/tests/defun.test
index 2b3ad2b..5ffb9a1 100755
--- a/tests/defun.test
+++ b/tests/defun.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1996, 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
@@ -18,6 +18,8 @@
. ./defs || Exit 1
+set -e
+
cat > acinclude.m4 << 'END'
AC_DEFUN([AM_FUNC_TWO])
AC_DEFUN([AM_FUNC_ONE], [AC_REQUIRE([AM_FUNC_TWO])])
diff --git a/tests/defun2.test b/tests/defun2.test
index a0bf273..6c10a8f 100755
--- a/tests/defun2.test
+++ b/tests/defun2.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'
dnl if buggy this will require getloadavg.c
AC_PROG_CC
@@ -34,5 +36,5 @@ END
: > memcmp.c
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/dejagnu.test b/tests/dejagnu.test
index 3308977..a273770 100755
--- a/tests/dejagnu.test
+++ b/tests/dejagnu.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 > Makefile.am << 'END'
AUTOMAKE_OPTIONS = dejagnu
TESTS = frob.test
@@ -25,8 +27,8 @@ END
: > frob.test
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^check-TESTS' Makefile.in
grep '^check-DEJAGNU' Makefile.in
diff --git a/tests/discover.test b/tests/discover.test
index 36293f7..0e4faa3 100755
--- a/tests/discover.test
+++ b/tests/discover.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1996, 1997, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 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
@@ -33,6 +34,9 @@ END
: > fsusage.c
-$ACLOCAL || Exit 1
-$AUTOMAKE 2>&1 | $FGREP fsusage.c || Exit 1
+$ACLOCAL
+AUTOMAKE_fails
+
+grep 'automatically discovered.*fsusage\.c.*explicitly mentioned' stderr
+
Exit 0
diff --git a/tests/distcom2.test b/tests/distcom2.test
index 9ed4675..19d3377 100755
--- a/tests/distcom2.test
+++ b/tests/distcom2.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2004, 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,6 +20,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CC
AM_PROG_CC_C_O
@@ -41,11 +44,11 @@ END
rm -f compile depcomp
-$ACLOCAL || Exit 1
-$AUTOMAKE --add-missing || Exit 1
+$ACLOCAL
+$AUTOMAKE --add-missing
-test -f compile || Exit 1
-test -f depcomp || Exit 1
+test -f compile
+test -f depcomp
sed -n -e '/^DIST_COMMON =.*\\$/ {
:loop
@@ -57,7 +60,7 @@ sed -n -e '/^DIST_COMMON =.*\\$/ {
t loop
p
n
- }' -e '/^DIST_COMMON =/ p' Makefile.in | grep compile || Exit 1
+ }' -e '/^DIST_COMMON =/ p' Makefile.in | grep compile
sed -n -e '/^DIST_COMMON =.*\\$/ {
:loop
@@ -69,4 +72,4 @@ sed -n -e '/^DIST_COMMON =.*\\$/ {
t loop
p
n
- }' -e '/^DIST_COMMON =/ p' Makefile.in | grep depcomp || Exit 1
+ }' -e '/^DIST_COMMON =/ p' Makefile.in | grep depcomp
diff --git a/tests/double.test b/tests/double.test
index d8dfcf1..b4e9c50 100755
--- a/tests/double.test
+++ b/tests/double.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,11 +19,13 @@
. ./defs || Exit 1
+set -e
+
echo AC_PROG_CC >> configure.in
cat > Makefile.am << 'END'
bin_PROGRAMS = spice nutmeg help sconvert multidec nutmeg
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/empty2.test b/tests/empty2.test
index 28a2d27..efebb70 100755
--- a/tests/empty2.test
+++ b/tests/empty2.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,6 +19,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CC
END
@@ -28,8 +30,8 @@ bin_PROGRAMS = pavel
pavel_SOURCES =
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'pavel\.[co]' Makefile.in && Exit 1
Exit 0
diff --git a/tests/empty3.test b/tests/empty3.test
index 0f9a4a8..e88152f 100755
--- a/tests/empty3.test
+++ b/tests/empty3.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,6 +18,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CC
END
@@ -26,7 +28,7 @@ cat > Makefile.am << 'END'
bin_PROGRAMS = pavel
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'pavel\.[co]' Makefile.in
diff --git a/tests/empty4.test b/tests/empty4.test
index 7769fd3..71c7552 100755
--- a/tests/empty4.test
+++ b/tests/empty4.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,6 +19,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CC
AC_SUBST(ZOO_OBJ)
@@ -32,7 +34,7 @@ zoo_DEPENDENCIES = $(ZOO_OBJ)
zoo_LDADD = $(zoo_DEPENDENCIES)
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
$FGREP zoo. Makefile.in && Exit 1
Exit 0
diff --git a/tests/exdir.test b/tests/exdir.test
index 0dd0566..013b80a 100755
--- a/tests/exdir.test
+++ b/tests/exdir.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,13 +18,15 @@
. ./defs || Exit 1
+set -e
+
cat > Makefile.am << 'EOF'
htmldir = $(prefix)/html
html_DATA = zot.html
pkgdata_DATA = qbert
EOF
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^DATA' Makefile.in | grep html
diff --git a/tests/ext.test b/tests/ext.test
index 929afd5..9340673 100755
--- a/tests/ext.test
+++ b/tests/ext.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2006 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 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
@@ -18,6 +19,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_F77
AC_PROG_FC
@@ -30,11 +33,12 @@ bin_PROGRAMS = foo
foo_SOURCES = 1.f 2.for 3.f90 4.f95 5.F 6.F90 7.F95 8.r 9.m 10.upc
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
for ext in f for f90 f95 F F90 F95 r m upc
do
- grep "^$ext\.o:" Makefile.in && Exit 1
+ if grep "^$ext\.o:" Makefile.in; then Exit 1; else :; fi
+ grep "^\.$ext\.o:" Makefile.in
done
Exit 0
diff --git a/tests/extra.test b/tests/extra.test
index 70e1f1f..134e875 100755
--- a/tests/extra.test
+++ b/tests/extra.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
@@ -21,6 +21,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CC
END
@@ -30,10 +32,10 @@ bin_PROGRAMS = @foo@
EXTRA_PROGRAMS = zardoz
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
-grep "^zardoz" Makefile.in || Exit 1
+grep "^zardoz" Makefile.in
# Can't have EXTRA clean rules.
grep 'clean.*EXTRA' Makefile.in && Exit 1
diff --git a/tests/extra2.test b/tests/extra2.test
index a2a64d7..e6c85a0 100755
--- a/tests/extra2.test
+++ b/tests/extra2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1996, 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
@@ -26,8 +28,8 @@ cat > Makefile.am << 'END'
bin_PROGRAMS = foo
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep EXTRA_foo_SOURCES Makefile.in && Exit 1
Exit 0
diff --git a/tests/extra3.test b/tests/extra3.test
index ad74acc..aea67bc 100755
--- a/tests/extra3.test
+++ b/tests/extra3.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,11 +18,13 @@
. ./defs || Exit 1
+set -e
+
echo 'AC_SUBST(CODICIL)' >> configure.in
cat > Makefile.am << 'END'
sysconf_DATA = @CODICIL@
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/extra4.test b/tests/extra4.test
index f559720..cf5e4a6 100755
--- a/tests/extra4.test
+++ b/tests/extra4.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998, 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,6 +19,8 @@
. ./defs || Exit 1
+set -e
+
echo 'AC_SUBST(CODICIL)' >> configure.in
cat > Makefile.am << 'END'
@@ -25,5 +28,5 @@ sysconf_DATA = @CODICIL@
EXTRA_DATA = codicil.txt
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/f90only.test b/tests/f90only.test
index 6fbfd2d..83b9767 100755
--- a/tests/f90only.test
+++ b/tests/f90only.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998, 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,32 +20,18 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_FC
END
-# Tue Aug 11 09:50:48 1998 Matthew D. Langston <address@hidden>
-#
-# This test currently fails with automake v. 1.3 since automake assumes
-# that elements of `bin_PROGRAMS' (e.g. zardoz) without a corresponding
-# `_SOURCES' (e.g. zardoz_SOURCES) should be compiled from `zardoz.c'
-# whether or not `zardoz.c' actually exists. For example, even if the
-# file `zardoz.c' doesn't exist but the file `zardoz.f' does exist, this
-# tests would still fail.
-#
-# Therefore, for now I have put in the line `zardoz_SOURCES = zardoz.f'
-# (see below) so that automake's top-level `make check' won't fail, but
-# this line should be removed once automake handles this situation
-# correctly.
-
cat > Makefile.am <<'END'
bin_PROGRAMS = zardoz
zardoz_SOURCES = zardoz.f90
END
-: > zardoz.f90
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'zardoz.f90' Makefile.in
diff --git a/tests/flibs.test b/tests/flibs.test
index 8dc66db..b9fe541 100755
--- a/tests/flibs.test
+++ b/tests/flibs.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998, 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,6 +20,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_F77
AC_F77_LIBRARY_LDFLAGS
@@ -46,7 +49,7 @@ END
: > zardoz.f
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '@FLIBS@' Makefile.in
diff --git a/tests/fnoc.test b/tests/fnoc.test
index 13d9add..d2d521c 100755
--- a/tests/fnoc.test
+++ b/tests/fnoc.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998, 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
@@ -20,6 +21,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_F77
END
@@ -32,8 +35,8 @@ END
: > doe.f
: > jane.f
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '[^F]CC' Makefile.in | grep -v MKDEP && Exit 1
Exit 0
diff --git a/tests/fo.test b/tests/fo.test
index 1d7809c..93d7d3f 100755
--- a/tests/fo.test
+++ b/tests/fo.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998, 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,6 +20,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_F77
END
@@ -30,7 +33,7 @@ END
: > doe.f
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
$FGREP 'doe.$(OBJEXT)' Makefile.in
diff --git a/tests/fonly.test b/tests/fonly.test
index 6af719c..b93b602 100755
--- a/tests/fonly.test
+++ b/tests/fonly.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998, 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,32 +20,18 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_F77
END
-# Tue Aug 11 09:50:48 1998 Matthew D. Langston <address@hidden>
-#
-# This test currently fails with automake v. 1.3 since automake assumes
-# that elements of `bin_PROGRAMS' (e.g. zardoz) without a corresponding
-# `_SOURCES' (e.g. zardoz_SOURCES) should be compiled from `zardoz.c'
-# whether or not `zardoz.c' actually exists. For example, even if the
-# file `zardoz.c' doesn't exist but the file `zardoz.f' does exist, this
-# tests would still fail.
-#
-# Therefore, for now I have put in the line `zardoz_SOURCES = zardoz.f'
-# (see below) so that automake's top-level `make check' won't fail, but
-# this line should be removed once automake handles this situation
-# correctly.
-
cat > Makefile.am <<'END'
bin_PROGRAMS = zardoz
zardoz_SOURCES = zardoz.f
END
-: > zardoz.f
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'zardoz.f' Makefile.in
diff --git a/tests/instexec.test b/tests/instexec.test
index 1312f8e..411f867 100755
--- a/tests/instexec.test
+++ b/tests/instexec.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,9 +19,11 @@
. ./defs || Exit 1
+set -e
+
: > Makefile.am
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^install-exec:' Makefile.in
diff --git a/tests/link_c_cxx.test b/tests/link_c_cxx.test
index 37b27d7..d1a093c 100755
--- a/tests/link_c_cxx.test
+++ b/tests/link_c_cxx.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,6 +19,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_CXX
@@ -29,18 +31,14 @@ bin_PROGRAMS = lavalamp
lavalamp_SOURCES = lava.c lamp.cxx
END
-: > lava.c
-: > lamp.cxx
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
+$ACLOCAL
+$AUTOMAKE
# We should only see the C++ linker in the rules of `Makefile.in'.
# Look for this macro not at the beginning of any line; that will have
# to be good enough for now.
-grep '.\$(CXXLINK)' Makefile.in || Exit 1
+grep '.\$(CXXLINK)' Makefile.in
# We should not see these patterns:
grep '.\$(FLINK)' Makefile.in && Exit 1
diff --git a/tests/link_dist.test b/tests/link_dist.test
index 7e73cc3..661d683 100755
--- a/tests/link_dist.test
+++ b/tests/link_dist.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,6 +20,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_CXX
@@ -31,18 +33,14 @@ lavalamp_SOURCES = lava.c
dist_lavalamp_SOURCES = lamp.cxx
END
-: > lava.c
-: > lamp.cxx
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
+$ACLOCAL
+$AUTOMAKE
# We should only see the C++ linker in the rules of `Makefile.in'.
# Look for this macro not at the beginning of any line; that will have
# to be good enough for now.
-grep '.\$(CXXLINK)' Makefile.in || Exit 1
+grep '.\$(CXXLINK)' Makefile.in
# We should not see these patterns:
grep '.\$(FLINK)' Makefile.in && Exit 1
diff --git a/tests/link_f90_only.test b/tests/link_f90_only.test
index eeec3a6..979eb67 100755
--- a/tests/link_f90_only.test
+++ b/tests/link_f90_only.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998, 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,6 +20,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_FC
END
@@ -28,17 +31,14 @@ bin_PROGRAMS = lavalamp
lavalamp_SOURCES = lamp.f90
END
-: > lamp.f90
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
+$ACLOCAL
+$AUTOMAKE
# We should only see the Fortran linker in the rules of `Makefile.in'.
# Look for this macro not at the beginning of any line; that will have
# to be good enough for now.
-grep '.\$(FCLINK)' Makefile.in || Exit 1
+grep '.\$(FCLINK)' Makefile.in
# We should not see these patterns:
grep '.\$(CXXLINK)' Makefile.in && Exit 1
diff --git a/tests/link_f_only.test b/tests/link_f_only.test
index 4390bd6..c4df8ce 100755
--- a/tests/link_f_only.test
+++ b/tests/link_f_only.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998, 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,6 +20,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_F77
END
@@ -28,17 +31,14 @@ bin_PROGRAMS = lavalamp
lavalamp_SOURCES = lamp.f
END
-: > lamp.f
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
+$ACLOCAL
+$AUTOMAKE
# We should only see the Fortran linker in the rules of `Makefile.in'.
# Look for this macro not at the beginning of any line; that will have
# to be good enough for now.
-grep '.\$(F77LINK)' Makefile.in || Exit 1
+grep '.\$(F77LINK)' Makefile.in
# We should not see these patterns:
grep '.\$(CXXLINK)' Makefile.in && Exit 1
diff --git a/tests/link_fc.test b/tests/link_fc.test
index 5b23bd5..8c80f8c 100755
--- a/tests/link_fc.test
+++ b/tests/link_fc.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998, 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,6 +20,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_F77
@@ -29,19 +32,15 @@ bin_PROGRAMS = lavalamp
lavalamp_SOURCES = lava.c lamp.f
END
-: > lava.c
-: > lamp.f
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
+$ACLOCAL
+$AUTOMAKE
# We should only see the Fortran 77 linker in the rules of
# `Makefile.in'.
# Look for this macro not at the beginning of any line; that will have
# to be good enough for now.
-grep '.\$(F77LINK)' Makefile.in || Exit 1
+grep '.\$(F77LINK)' Makefile.in
# We should not see these patterns:
grep '.\$(LINK)' Makefile.in && Exit 1
diff --git a/tests/link_fccxx.test b/tests/link_fccxx.test
index bd2b21d..30263d0 100755
--- a/tests/link_fccxx.test
+++ b/tests/link_fccxx.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998, 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,6 +20,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CC
AC_PROG_CXX
@@ -30,19 +33,14 @@ bin_PROGRAMS = lavalamp
lavalamp_SOURCES = lava.c lamp.cxx lamp2.f
END
-: > lava.c
-: > lamp.cxx
-: > lamp2.f
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
+$ACLOCAL
+$AUTOMAKE
# We should only see the C++ linker in the rules of `Makefile.in'.
# Look for this macro not at the beginning of any line; that will have
# to be good enough for now.
-grep '.\$(CXXLINK)' Makefile.in || Exit 1
+grep '.\$(CXXLINK)' Makefile.in
# We should not see these patterns:
grep '.\$(F77LINK)' Makefile.in && Exit 1
diff --git a/tests/link_fcxx.test b/tests/link_fcxx.test
index e86f7cd..c75ffc7 100755
--- a/tests/link_fcxx.test
+++ b/tests/link_fcxx.test
@@ -1,5 +1,6 @@
#! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998, 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,6 +20,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_CXX
AC_PROG_F77
@@ -29,18 +32,14 @@ bin_PROGRAMS = lavalamp
lavalamp_SOURCES = lava.cxx lamp.f
END
-: > lava.cxx
-: > lamp.f
-
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
+$ACLOCAL
+$AUTOMAKE
# We should only see the C++ linker in the rules of `Makefile.in'.
# Look for this macro not at the beginning of any line; that will have
# to be good enough for now.
-grep '.\$(CXXLINK)' Makefile.in || Exit 1
+grep '.\$(CXXLINK)' Makefile.in
# We should not see these patterns:
grep '.\$(F77LINK)' Makefile.in && Exit 1
diff --git a/tests/ltdeps.test b/tests/ltdeps.test
index 8285bd1..43d0ae3 100755
--- a/tests/ltdeps.test
+++ b/tests/ltdeps.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,6 +19,8 @@
required=libtool
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_LIBTOOL
AC_PROG_CXX
@@ -52,8 +54,8 @@ END
: > config.guess
: > config.sub
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'OBJECTS =$' Makefile.in && Exit 1
Exit 0
diff --git a/tests/nodep.test b/tests/nodep.test
index 31232f2..650bbd0 100755
--- a/tests/nodep.test
+++ b/tests/nodep.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,6 +19,8 @@
. ./defs || Exit 1
+set -e
+
cat > Makefile.am << 'END'
AUTOMAKE_OPTIONS = no-dependencies
bin_PROGRAMS = zardoz
@@ -33,8 +35,8 @@ mkdir x
: > y.c
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '%' Makefile.in && Exit 1
Exit 0
diff --git a/tests/nodepcomp.test b/tests/nodepcomp.test
index 53b902e..735c363 100755
--- a/tests/nodepcomp.test
+++ b/tests/nodepcomp.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,9 +18,11 @@
. ./defs || Exit 1
+set -e
+
rm -f depcomp
: > Makefile.am
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-97-g5b6cbc0,
Ralf Wildenhues <=