I've pushed the attached patch to maint. This change is just
for consistency, since it doesn't fix any known problem.
Regards,
Stefano
-*-*-*-
Tests: consistently use "|| Exit 1" after ". ./defs".
The test scripts below has been modified with this command:
$ sed -i 's/^\. \.\/defs *$/& || Exit 1/' tests/*.test
* tests/autohdr.test: Use `. ./defs || Exit 1', not bare
`. ./defs', for consistency with other tests.
* tests/autohdr2.test: Likewise.
* tests/autohdr3.test: Likewise.
* tests/autohdr4.test: Likewise.
* tests/cond23.test: Likewise.
...
* tests/silentlex.test: Likewise.
* tests/silentyacc.test: Likewise.
From fadd73d775e558ab476bebd59a39a42e97fbdf39 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattar...@gmail.com>
Date: Sun, 21 Nov 2010 16:25:45 +0100
Subject: [PATCH] Tests: consistently use "|| Exit 1" after ". ./defs".
The test scripts below has been modified with this command:
$ sed -i 's/^\. \.\/defs *$/& || Exit 1/' tests/*.test
* tests/autohdr.test: Use `. ./defs || Exit 1', not bare
`. ./defs', for consistency with other tests.
* tests/autohdr2.test: Likewise.
* tests/autohdr3.test: Likewise.
* tests/autohdr4.test: Likewise.
* tests/cond23.test: Likewise.
* tests/cond24.test: Likewise.
* tests/cond25.test: Likewise.
* tests/cond26.test: Likewise.
* tests/cond27.test: Likewise.
* tests/cond28.test: Likewise.
* tests/cond29.test: Likewise.
* tests/cond30.test: Likewise.
* tests/cond31.test: Likewise.
* tests/cond32.test: Likewise.
* tests/cond33.test: Likewise.
* tests/cond34.test: Likewise.
* tests/cond35.test: Likewise.
* tests/cond36.test: Likewise.
* tests/cond37.test: Likewise.
* tests/cond38.test: Likewise.
* tests/cond39.test: Likewise.
* tests/cond40.test: Likewise.
* tests/cond41.test: Likewise.
* tests/cond42.test: Likewise.
* tests/cond43.test: Likewise.
* tests/cond44.test: Likewise.
* tests/cond45.test: Likewise.
* tests/dollarvar.test: Likewise.
* tests/dollarvar2.test: Likewise.
* tests/hfs.test: Likewise.
* tests/libobj14.test: Likewise.
* tests/percent.test: Likewise.
* tests/percent2.test: Likewise.
* tests/phony.test: Likewise.
* tests/silent.test: Likewise.
* tests/silent2.test: Likewise.
* tests/silent3.test: Likewise.
* tests/silent4.test: Likewise.
* tests/silent5.test: Likewise.
* tests/silent6.test: Likewise.
* tests/silent7.test: Likewise.
* tests/silent9.test: Likewise.
* tests/silentcxx.test: Likewise.
* tests/silentf77.test: Likewise.
* tests/silentf90.test: Likewise.
* tests/silentlex.test: Likewise.
* tests/silentyacc.test: Likewise.
---
ChangeLog | 50 +++++++++++++++++++++++++++++++++++++++++++++++++
tests/autohdr.test | 2 +-
tests/autohdr2.test | 2 +-
tests/autohdr3.test | 2 +-
tests/autohdr4.test | 2 +-
tests/cond23.test | 2 +-
tests/cond24.test | 2 +-
tests/cond25.test | 2 +-
tests/cond26.test | 2 +-
tests/cond27.test | 2 +-
tests/cond28.test | 2 +-
tests/cond29.test | 2 +-
tests/cond30.test | 2 +-
tests/cond31.test | 2 +-
tests/cond32.test | 2 +-
tests/cond33.test | 2 +-
tests/cond34.test | 2 +-
tests/cond35.test | 2 +-
tests/cond36.test | 2 +-
tests/cond37.test | 2 +-
tests/cond38.test | 2 +-
tests/cond39.test | 2 +-
tests/cond40.test | 2 +-
tests/cond41.test | 2 +-
tests/cond42.test | 2 +-
tests/cond43.test | 2 +-
tests/cond44.test | 2 +-
tests/cond45.test | 2 +-
tests/dollarvar.test | 2 +-
tests/dollarvar2.test | 2 +-
tests/hfs.test | 2 +-
tests/libobj14.test | 2 +-
tests/percent.test | 2 +-
tests/percent2.test | 2 +-
tests/phony.test | 2 +-
tests/silent.test | 2 +-
tests/silent2.test | 2 +-
tests/silent3.test | 2 +-
tests/silent4.test | 2 +-
tests/silent5.test | 2 +-
tests/silent6.test | 2 +-
tests/silent7.test | 2 +-
tests/silent9.test | 2 +-
tests/silentcxx.test | 2 +-
tests/silentf77.test | 2 +-
tests/silentf90.test | 2 +-
tests/silentlex.test | 2 +-
tests/silentyacc.test | 2 +-
48 files changed, 97 insertions(+), 47 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e6eb0fc..ffbeb69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,55 @@
2010-11-21 Stefano Lattarini <stefano.lattar...@gmail.com>
+ Tests: consistently use "|| Exit 1" after ". ./defs".
+ * tests/autohdr.test: Use `. ./defs || Exit 1', not bare
+ `. ./defs', for consistency with other tests.
+ * tests/autohdr2.test: Likewise.
+ * tests/autohdr3.test: Likewise.
+ * tests/autohdr4.test: Likewise.
+ * tests/cond23.test: Likewise.
+ * tests/cond24.test: Likewise.
+ * tests/cond25.test: Likewise.
+ * tests/cond26.test: Likewise.
+ * tests/cond27.test: Likewise.
+ * tests/cond28.test: Likewise.
+ * tests/cond29.test: Likewise.
+ * tests/cond30.test: Likewise.
+ * tests/cond31.test: Likewise.
+ * tests/cond32.test: Likewise.
+ * tests/cond33.test: Likewise.
+ * tests/cond34.test: Likewise.
+ * tests/cond35.test: Likewise.
+ * tests/cond36.test: Likewise.
+ * tests/cond37.test: Likewise.
+ * tests/cond38.test: Likewise.
+ * tests/cond39.test: Likewise.
+ * tests/cond40.test: Likewise.
+ * tests/cond41.test: Likewise.
+ * tests/cond42.test: Likewise.
+ * tests/cond43.test: Likewise.
+ * tests/cond44.test: Likewise.
+ * tests/cond45.test: Likewise.
+ * tests/dollarvar.test: Likewise.
+ * tests/dollarvar2.test: Likewise.
+ * tests/hfs.test: Likewise.
+ * tests/libobj14.test: Likewise.
+ * tests/percent.test: Likewise.
+ * tests/percent2.test: Likewise.
+ * tests/phony.test: Likewise.
+ * tests/silent.test: Likewise.
+ * tests/silent2.test: Likewise.
+ * tests/silent3.test: Likewise.
+ * tests/silent4.test: Likewise.
+ * tests/silent5.test: Likewise.
+ * tests/silent6.test: Likewise.
+ * tests/silent7.test: Likewise.
+ * tests/silent9.test: Likewise.
+ * tests/silentcxx.test: Likewise.
+ * tests/silentf77.test: Likewise.
+ * tests/silentf90.test: Likewise.
+ * tests/silentlex.test: Likewise.
+ * tests/silentyacc.test: Likewise.
+
Avoid useless cleaning in some `silent*.test' tests.
* tests/silentf77.test: Removed useless calls to "make clean"
and "make maintainer-clean".
diff --git a/tests/autohdr.test b/tests/autohdr.test
index 014d2b7..9293bd1 100755
--- a/tests/autohdr.test
+++ b/tests/autohdr.test
@@ -16,7 +16,7 @@
# Check that autoheaders works, despite our AC_CONFIG_HEADERS hack.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/autohdr2.test b/tests/autohdr2.test
index 2ddce32..e2a71cf 100755
--- a/tests/autohdr2.test
+++ b/tests/autohdr2.test
@@ -16,7 +16,7 @@
# Check that autoheaders works, despite our AC_CONFIG_HEADERS hack.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/autohdr3.test b/tests/autohdr3.test
index 8e9f079..f559295 100755
--- a/tests/autohdr3.test
+++ b/tests/autohdr3.test
@@ -17,7 +17,7 @@
# Check rebuild rules for autoheader.
required=GNUmake
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/autohdr4.test b/tests/autohdr4.test
index 187429f..24c57fb 100755
--- a/tests/autohdr4.test
+++ b/tests/autohdr4.test
@@ -18,7 +18,7 @@
# (This should also work without GNU Make.)
required=gcc
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond23.test b/tests/cond23.test
index 4ec596d..e2b133c 100755
--- a/tests/cond23.test
+++ b/tests/cond23.test
@@ -17,7 +17,7 @@
# Check that conditional redefinitions of AC_SUBST'ed variables are detected.
# Report from Patrik Weiskircher
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond24.test b/tests/cond24.test
index 6f76e4d..e548211 100755
--- a/tests/cond24.test
+++ b/tests/cond24.test
@@ -17,7 +17,7 @@
# Check that conditional redefinitions of AC_SUBST'ed variables are detected.
# Report from Patrik Weiskircher
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond25.test b/tests/cond25.test
index 332fda5..02614f9 100755
--- a/tests/cond25.test
+++ b/tests/cond25.test
@@ -17,7 +17,7 @@
# Check that conditional primaries can use non-conditional directories.
# From Pavel Roskin.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond26.test b/tests/cond26.test
index a9baa55..1d93cc0 100755
--- a/tests/cond26.test
+++ b/tests/cond26.test
@@ -17,7 +17,7 @@
# Check that non-conditional primaries can use conditional directories.
# Reported by Juergen Keil.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond27.test b/tests/cond27.test
index 3082902..250b1ef 100755
--- a/tests/cond27.test
+++ b/tests/cond27.test
@@ -17,7 +17,7 @@
# Check that non-conditional primaries cannot use directories defined
# in some conditions (but not others).
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond28.test b/tests/cond28.test
index ccdcf9e..006ef57 100755
--- a/tests/cond28.test
+++ b/tests/cond28.test
@@ -17,7 +17,7 @@
# Check that conditional primaries can use directories defined
# in the same conditions (but not others).
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond29.test b/tests/cond29.test
index 12badcb..8310eab 100755
--- a/tests/cond29.test
+++ b/tests/cond29.test
@@ -24,7 +24,7 @@
# or cpu time it can found. Although this test won't print `FAIL' if
# it fails, it will take long enough so it can't go unnoticed.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond30.test b/tests/cond30.test
index e092c45..d1935f7 100755
--- a/tests/cond30.test
+++ b/tests/cond30.test
@@ -16,7 +16,7 @@
# For PR/352: make sure we support bin_PROGRAMS being defined conditionally.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond31.test b/tests/cond31.test
index 4975ef4..224d32c 100755
--- a/tests/cond31.test
+++ b/tests/cond31.test
@@ -16,7 +16,7 @@
# Make sure we define conditional _DEPENDENCIES correctly.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond32.test b/tests/cond32.test
index ae5c8c6..6ec5a20 100755
--- a/tests/cond32.test
+++ b/tests/cond32.test
@@ -16,7 +16,7 @@
# Make sure the user can override a conditional _DEPENDENCIES.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond33.test b/tests/cond33.test
index 0aff11a..f327cb7 100755
--- a/tests/cond33.test
+++ b/tests/cond33.test
@@ -17,7 +17,7 @@
# Check for conditional library with a conditional directory.
# Report from Ralf Corsepius
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond34.test b/tests/cond34.test
index 9e42eea..ecb1616 100755
--- a/tests/cond34.test
+++ b/tests/cond34.test
@@ -17,7 +17,7 @@
# Check for _DEPDENDENCIES definition with conditional _LDADD.
# Report from Elena A. Vengerova
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond35.test b/tests/cond35.test
index 6b3a4d4..0f3b8cf 100755
--- a/tests/cond35.test
+++ b/tests/cond35.test
@@ -18,7 +18,7 @@
# Report from Roman Fietze.
required='flex bison gcc'
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond36.test b/tests/cond36.test
index 58eb529..f6c97db 100755
--- a/tests/cond36.test
+++ b/tests/cond36.test
@@ -17,7 +17,7 @@
# Check rules output for parser defined conditionally.
required='flex bison gcc'
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond37.test b/tests/cond37.test
index 144c2ac..a4ae078 100755
--- a/tests/cond37.test
+++ b/tests/cond37.test
@@ -17,7 +17,7 @@
# Check conditional local rules.
# Report from Simon Josefsson.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond38.test b/tests/cond38.test
index 0051e1f..b1c3036 100755
--- a/tests/cond38.test
+++ b/tests/cond38.test
@@ -17,7 +17,7 @@
# Check conditional variable ordering.
# Report from Ed Hartnett.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond39.test b/tests/cond39.test
index 8d96595..c75c7b5 100755
--- a/tests/cond39.test
+++ b/tests/cond39.test
@@ -20,7 +20,7 @@
# Build either as CONFIG_FILE or as PROGRAM.
-. ./defs
+. ./defs || Exit 1
set -e
mkdir sub
diff --git a/tests/cond40.test b/tests/cond40.test
index c0bde5c..8552cef 100755
--- a/tests/cond40.test
+++ b/tests/cond40.test
@@ -20,7 +20,7 @@
# Test AM_COND_IF.
-. ./defs
+. ./defs || Exit 1
set -e
cat >>configure.in <<'END'
diff --git a/tests/cond41.test b/tests/cond41.test
index b32bff3..dd9ffda 100755
--- a/tests/cond41.test
+++ b/tests/cond41.test
@@ -20,7 +20,7 @@
# AM_COND_IF with an undefined condition should fail.
-. ./defs
+. ./defs || Exit 1
set -e
cat >>configure.in <<'END'
diff --git a/tests/cond42.test b/tests/cond42.test
index 00ca114..428c02b 100755
--- a/tests/cond42.test
+++ b/tests/cond42.test
@@ -22,7 +22,7 @@
# This shouldn't happen with user input, as _AM_COND_* are not documented,
# but better to be safe.
-. ./defs
+. ./defs || Exit 1
set -e
cat >>configure.in <<'END'
diff --git a/tests/cond43.test b/tests/cond43.test
index 1b468a7..1fa413d 100755
--- a/tests/cond43.test
+++ b/tests/cond43.test
@@ -20,7 +20,7 @@
# Ensure an error with underquoted usage of AM_COND_IF in configure.ac.
-. ./defs
+. ./defs || Exit 1
set -e
cat >>configure.in <<'END'
diff --git a/tests/cond44.test b/tests/cond44.test
index ac907f1..4b5adc2 100755
--- a/tests/cond44.test
+++ b/tests/cond44.test
@@ -17,7 +17,7 @@
# Check that redefinitions of AC_SUBST'ed AM_SUBST_NOTMAKE'd variables
# are not diagnosed. See cond23.test.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/cond45.test b/tests/cond45.test
index 57dd339..c70fecb 100755
--- a/tests/cond45.test
+++ b/tests/cond45.test
@@ -17,7 +17,7 @@
# Check that redefinitions of AC_SUBST'ed AM_SUBST_NOTMAKE'd variables
# are not diagnosed. See cond24.test.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/dollarvar.test b/tests/dollarvar.test
index bdc73ab..7105cb0 100755
--- a/tests/dollarvar.test
+++ b/tests/dollarvar.test
@@ -22,7 +22,7 @@
# containing a `$' on the left hand side of an assignment are not
# portable in practice, even though POSIX allows them. :-/
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/dollarvar2.test b/tests/dollarvar2.test
index 0d12afd..6fc2737 100755
--- a/tests/dollarvar2.test
+++ b/tests/dollarvar2.test
@@ -17,7 +17,7 @@
# Test to make sure that -Wportability turns on portability-recursive,
# likewise for -Wno-...
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/hfs.test b/tests/hfs.test
index 8022729..8f0c5cc 100755
--- a/tests/hfs.test
+++ b/tests/hfs.test
@@ -20,7 +20,7 @@
# Darwin).
# Report from Peter O'Gorman.
-. ./defs
+. ./defs || Exit 1
set -e
echo AC_OUTPUT >>configure.in
diff --git a/tests/libobj14.test b/tests/libobj14.test
index ed20703..0ee750c 100755
--- a/tests/libobj14.test
+++ b/tests/libobj14.test
@@ -20,7 +20,7 @@
# Report from Bill Davidson
required=gcc
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/percent.test b/tests/percent.test
index 40f9a43..dfb48ae 100755
--- a/tests/percent.test
+++ b/tests/percent.test
@@ -17,7 +17,7 @@
# Test to make sure that -Wportability understands %-style pattern
# rules.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/percent2.test b/tests/percent2.test
index f7c7f14..09e4f84 100755
--- a/tests/percent2.test
+++ b/tests/percent2.test
@@ -19,7 +19,7 @@
# `${ARCH}/%.$(OBJEXT):'.
# Report from Ralf Corsepius.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/phony.test b/tests/phony.test
index 0f57915..9c9f3d3 100755
--- a/tests/phony.test
+++ b/tests/phony.test
@@ -17,7 +17,7 @@
# Make sure .PHONY can be given dependencies several times.
# From Ralf Corsepius.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/silent.test b/tests/silent.test
index c91115c..97d881e 100755
--- a/tests/silent.test
+++ b/tests/silent.test
@@ -18,7 +18,7 @@
# Please keep this file in sync with silent2.test.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/silent2.test b/tests/silent2.test
index da22718..aed8546 100755
--- a/tests/silent2.test
+++ b/tests/silent2.test
@@ -20,7 +20,7 @@
# Please keep this file in sync with silent.test.
required=gcc
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/silent3.test b/tests/silent3.test
index dce97d1..17f1959 100755
--- a/tests/silent3.test
+++ b/tests/silent3.test
@@ -19,7 +19,7 @@
# Please keep this file in sync with silent4.test and silent9.test.
required=libtoolize
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/silent4.test b/tests/silent4.test
index 3f79b0c..9c343c0 100755
--- a/tests/silent4.test
+++ b/tests/silent4.test
@@ -20,7 +20,7 @@
# Please keep this file in sync with silent3.test and silent9.test.
required="libtoolize gcc"
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/silent5.test b/tests/silent5.test
index 79dfca2..49039b8 100755
--- a/tests/silent5.test
+++ b/tests/silent5.test
@@ -21,7 +21,7 @@
# FIXME: generic C++/Fortran compilers should suffice here
required='g++ gfortran flex bison'
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/silent6.test b/tests/silent6.test
index 2afe6bc..acd9cea 100755
--- a/tests/silent6.test
+++ b/tests/silent6.test
@@ -16,7 +16,7 @@
# Check user extensibility of silent-rules mode.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/silent7.test b/tests/silent7.test
index cd8e1b5..5ae8ac0 100755
--- a/tests/silent7.test
+++ b/tests/silent7.test
@@ -16,7 +16,7 @@
# Check user extensibility of silent-rules mode.
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/silent9.test b/tests/silent9.test
index 0fdc94b..f0abb29 100755
--- a/tests/silent9.test
+++ b/tests/silent9.test
@@ -19,7 +19,7 @@
# Please keep this file in sync with silent3.test and silent4.test.
required="libtoolize"
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/silentcxx.test b/tests/silentcxx.test
index aa64d8f..40fc92e 100755
--- a/tests/silentcxx.test
+++ b/tests/silentcxx.test
@@ -17,7 +17,7 @@
# Check silent-rules mode for C++.
required='g++' # FIXME: any decent C++ compiler should be OK
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/silentf77.test b/tests/silentf77.test
index 2defa45..cfdb186 100755
--- a/tests/silentf77.test
+++ b/tests/silentf77.test
@@ -18,7 +18,7 @@
# Keep this ins sync with the sister test silentf90.test.
required='gfortran' # FIXME: any working Fortran compiler should be OK!
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/silentf90.test b/tests/silentf90.test
index 261b18e..4fe1c3f 100755
--- a/tests/silentf90.test
+++ b/tests/silentf90.test
@@ -18,7 +18,7 @@
# Keep this ins sync with the sister test silentf77.test.
required='gfortran' # FIXME: any working Fortran compiler should be OK!
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/silentlex.test b/tests/silentlex.test
index 78e0c7d..5ad430e 100755
--- a/tests/silentlex.test
+++ b/tests/silentlex.test
@@ -17,7 +17,7 @@
# Check silent-rules mode for Lex.
required='flex'
-. ./defs
+. ./defs || Exit 1
set -e
diff --git a/tests/silentyacc.test b/tests/silentyacc.test
index ac5f061..d311e3d 100755
--- a/tests/silentyacc.test
+++ b/tests/silentyacc.test
@@ -17,7 +17,7 @@
# Check silent-rules mode for Yacc.
required='bison'
-. ./defs
+. ./defs || Exit 1
set -e
--
1.7.1
