Enable the `errexit' shell flag in another bunch of test scripts.
No relevant semantic change should be introduced by the patch, except
for the test `discover.test', which has been made slighty stricter
w.r.t. the exit status of Automake (a non-zero exit status is
expected) and the grepping of the error message produced by Automake.
Also, some botched/obsoleted comments and some unnecessary code have
been removed from scripts `fonly.test' and `f90only.test'.
The involved test scripts and the modifications done to them are simple
enough that no portability problem involving the `errexit' flag should
have been introduced.
Regards,
Stefano
From 66b8cc7b37b38f1c05138ce86b6d7a27f53dc3ad Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattar...@gmail.com>
Date: Thu, 6 May 2010 13:37:43 +0200
Subject: [PATCH] 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/flibs.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/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.
---
ChangeLog | 32 ++++++++++++++++++++++++++++++++
tests/dash.test | 6 ++++--
tests/defun.test | 4 +++-
tests/defun2.test | 6 ++++--
tests/dejagnu.test | 8 +++++---
tests/discover.test | 12 ++++++++----
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 | 9 ++++++---
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/ltdeps.test | 8 +++++---
tests/nodep.test | 8 +++++---
tests/nodepcomp.test | 6 ++++--
26 files changed, 165 insertions(+), 105 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 71b0d9b..6f2bc5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2010-05-06 Stefano Lattarini <stefano.lattar...@gmail.com>
+
+ 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/flibs.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/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.
+
2010-04-25 Ralf Wildenhues <ralf.wildenh...@gmx.de>
Warning and error message formatting cleanups.
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..1a03867 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
@@ -18,6 +19,8 @@
. ./defs || Exit 1
+set -e
+
cat >> configure.in << 'END'
AC_PROG_RANLIB
AC_PROG_CC
@@ -33,6 +36,7 @@ END
: > fsusage.c
-$ACLOCAL || Exit 1
-$AUTOMAKE 2>&1 | $FGREP fsusage.c || Exit 1
-Exit 0
+$ACLOCAL
+AUTOMAKE_fails
+
+grep 'automatically discovered.*fsusage.c.*explicitly mentioned' stderr
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..ef877b0 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,8 +33,8 @@ 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
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 <langs...@slac.stanford.edu>
-#
-# 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 <langs...@slac.stanford.edu>
-#
-# 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/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
--
1.6.5
