]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Tests: consistently use "|| Exit 1" after ". ./defs".
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sun, 21 Nov 2010 15:25:45 +0000 (16:25 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sun, 21 Nov 2010 20:55:10 +0000 (21:55 +0100)
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.

48 files changed:
ChangeLog
tests/autohdr.test
tests/autohdr2.test
tests/autohdr3.test
tests/autohdr4.test
tests/cond23.test
tests/cond24.test
tests/cond25.test
tests/cond26.test
tests/cond27.test
tests/cond28.test
tests/cond29.test
tests/cond30.test
tests/cond31.test
tests/cond32.test
tests/cond33.test
tests/cond34.test
tests/cond35.test
tests/cond36.test
tests/cond37.test
tests/cond38.test
tests/cond39.test
tests/cond40.test
tests/cond41.test
tests/cond42.test
tests/cond43.test
tests/cond44.test
tests/cond45.test
tests/dollarvar.test
tests/dollarvar2.test
tests/hfs.test
tests/libobj14.test
tests/percent.test
tests/percent2.test
tests/phony.test
tests/silent.test
tests/silent2.test
tests/silent3.test
tests/silent4.test
tests/silent5.test
tests/silent6.test
tests/silent7.test
tests/silent9.test
tests/silentcxx.test
tests/silentf77.test
tests/silentf90.test
tests/silentlex.test
tests/silentyacc.test

index e6eb0fcf69e8698d2e7dc7150c0f02c0e3c99fc8..ffbeb692dfd15c591598706a54ddc910327f8b06 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,55 @@
 2010-11-21  Stefano Lattarini  <stefano.lattarini@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".
index 014d2b7b65eba767767842f6a824d635ca3b34c5..9293bd121400b6fd9bf9ae96d11c1875b5cc0e73 100755 (executable)
@@ -16,7 +16,7 @@
 
 # Check that autoheaders works, despite our AC_CONFIG_HEADERS hack.
 
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index 2ddce32edb1d5addda4d28547e7bf0bb44c612b7..e2a71cf56f642f262c1caafba969c485f55975c8 100755 (executable)
@@ -16,7 +16,7 @@
 
 # Check that autoheaders works, despite our AC_CONFIG_HEADERS hack.
 
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index 8e9f079f4212d8749284c2be576a62c95cc57be4..f5592954ce9486c5d834871dbe3a43576ceca08e 100755 (executable)
@@ -17,7 +17,7 @@
 # Check rebuild rules for autoheader.
 
 required=GNUmake
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index 187429fb51f04075f9d9bd8a9aebea6762de24b8..24c57fbe779c22a8660bd22288f0a7128a3270c0 100755 (executable)
@@ -18,7 +18,7 @@
 # (This should also work without GNU Make.)
 
 required=gcc
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index 4ec596d4e43b21d1a3436b982b4d28f8f99e70dc..e2b133c1a8b4fec8cd4c55fe85177afc1a1afd5c 100755 (executable)
@@ -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
 
index 6f76e4d87b4c2aa4d6ff1ae24e94b26d06ae71ca..e5482115bee72b1a9ca8002fde4f89eb626c1492 100755 (executable)
@@ -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
 
index 332fda5571bbb70e48627f6ee9805297b684bc52..02614f92e9a98db96995a62b802a1398cc0c05b0 100755 (executable)
@@ -17,7 +17,7 @@
 # Check that conditional primaries can use non-conditional directories.
 # From Pavel Roskin.
 
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index a9baa5543cd278e7316a42798163fe520498c330..1d93cc02bae13b3ea9a2784fe791abe01470350b 100755 (executable)
@@ -17,7 +17,7 @@
 # Check that non-conditional primaries can use conditional directories.
 # Reported by Juergen Keil.
 
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index 3082902cf2aa2f106630e1826fbd7339101f479d..250b1efe718e6d56053d249483049f1abf5d3080 100755 (executable)
@@ -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
 
index ccdcf9ea940ae5207e1f2b4cbda7d82d88d49541..006ef573c2aaa873538983fb7e21e9d7509a439d 100755 (executable)
@@ -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
 
index 12badcb0136bf143e9dce668c09eec40262768e6..8310eabd7c08717dca13390fb87f46c14817fa69 100755 (executable)
@@ -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
 
index e092c4516f5a1b9b055c647935b8b9347e6e05c8..d1935f7028d64c13d12a167f41d20f3dcdcc66b3 100755 (executable)
@@ -16,7 +16,7 @@
 
 # For PR/352: make sure we support bin_PROGRAMS being defined conditionally.
 
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index 4975ef407f6d0401c151ee541863fe062510d376..224d32ca236b5509f93c31124598a06fe1f6de92 100755 (executable)
@@ -16,7 +16,7 @@
 
 # Make sure we define conditional _DEPENDENCIES correctly.
 
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index ae5c8c67faea9401ff013277bd6d41ab5940dd4a..6ec5a20d7f9250dd785e5fa7420d7106ff83a555 100755 (executable)
@@ -16,7 +16,7 @@
 
 # Make sure the user can override a conditional _DEPENDENCIES.
 
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index 0aff11a5ee3f29042acb5506d5a6d3b2ea617ddf..f327cb78a41575c10e689d9fca0137a77b33833d 100755 (executable)
@@ -17,7 +17,7 @@
 # Check for conditional library with a conditional directory.
 # Report from Ralf Corsepius
 
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index 9e42eea02c39fa9ccf58ee175b2a9bc906038a18..ecb16163ca08df33fc28775c738506a6335a26e6 100755 (executable)
@@ -17,7 +17,7 @@
 # Check for _DEPDENDENCIES definition with conditional _LDADD.
 # Report from Elena A. Vengerova
 
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index 6b3a4d4268a6a54f7e1a2f45ebd7731726b8bd17..0f3b8cf8c2bc2543ceb02a38124aac61b4a454ff 100755 (executable)
@@ -18,7 +18,7 @@
 # Report from Roman Fietze.
 
 required='flex bison gcc'
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index 58eb5297a1983c61a96e694c5080f2fad4560b2d..f6c97dbd663bb6278dfd9f3650a3eccb81025490 100755 (executable)
@@ -17,7 +17,7 @@
 # Check rules output for parser defined conditionally.
 
 required='flex bison gcc'
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index 144c2ac0bab2de8723548499b19fcf0acebdefed..a4ae07875b9dd2774c0f7d84067ee0016af91b7a 100755 (executable)
@@ -17,7 +17,7 @@
 # Check conditional local rules.
 # Report from Simon Josefsson.
 
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index 0051e1fefefefec6a611f40b90080074e740b1c4..b1c303624ac3521cdfb5ae63afdc100e7b9df7f9 100755 (executable)
@@ -17,7 +17,7 @@
 # Check conditional variable ordering.
 # Report from Ed Hartnett.
 
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index 8d96595badfecca1e0cffec19c6089a8c78a34b3..c75c7b5151f86307d1f34e56f02966cdaebdf8f9 100755 (executable)
@@ -20,7 +20,7 @@
 
 # Build either as CONFIG_FILE or as PROGRAM.
 
-. ./defs
+. ./defs || Exit 1
 set -e
 
 mkdir sub
index c0bde5c42c56a596691da9d6ad27e267c54f06cd..8552cefbfc87841996d0a8839bd8b4ac73d27507 100755 (executable)
@@ -20,7 +20,7 @@
 
 # Test AM_COND_IF.
 
-. ./defs
+. ./defs || Exit 1
 set -e
 
 cat >>configure.in <<'END'
index b32bff3b383d8e62c1eaec67f0dd38f2ac80e135..dd9ffda131a009f47a7f385237df7042c5f58640 100755 (executable)
@@ -20,7 +20,7 @@
 
 # AM_COND_IF with an undefined condition should fail.
 
-. ./defs
+. ./defs || Exit 1
 set -e
 
 cat >>configure.in <<'END'
index 00ca114c836d6ba6ae98fe6d9a639a7cedb67159..428c02b4b16ea4beaffe32e2319fcbf1b4a34b2b 100755 (executable)
@@ -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'
index 1b468a7380f44672aaf014bbbd528d7ce1a08912..1fa413d8a18c92cc9d43374db10e9c24730846f1 100755 (executable)
@@ -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'
index ac907f171e4f1a0d1f2121474df56f8c3b2c508a..4b5adc240d7f4a894aef8d325b321eaee4813959 100755 (executable)
@@ -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
 
index 57dd3397bc2042a0d37a898980ce525d8d3e6d2f..c70fecb47bb29876d17a4b602012067e2738e6d5 100755 (executable)
@@ -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
 
index bdc73abbad075d57a15a7e061f69561cf299f63c..7105cb09281550797632fd9ea7843ffa32c0c724 100755 (executable)
@@ -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
 
index 0d12afd77b9719d85a4e9c26a372994df9884111..6fc27379ba60b3dc8dbfe4adb5101d578d512cce 100755 (executable)
@@ -17,7 +17,7 @@
 # Test to make sure that -Wportability turns on portability-recursive,
 # likewise for -Wno-...
 
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index 802272942e3c8b4d303f7a9abd6fdee7a5561e9b..8f0c5ccd68efb32ca2ed43606e004f6d662816b7 100755 (executable)
@@ -20,7 +20,7 @@
 # Darwin).
 # Report from Peter O'Gorman.
 
-. ./defs
+. ./defs || Exit 1
 set -e
 
 echo AC_OUTPUT >>configure.in
index ed207034864813baf7de231098c7b59765bd82dc..0ee750c83fad18a5cda3e1e0ab5ed99dd0a3f36d 100755 (executable)
@@ -20,7 +20,7 @@
 # Report from Bill Davidson
 
 required=gcc
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index 40f9a4397da099cc8c17b5ade11d1738cc096ef5..dfb48ae98dde57f9f0798b5445530c24a8428236 100755 (executable)
@@ -17,7 +17,7 @@
 # Test to make sure that -Wportability understands %-style pattern
 # rules.
 
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index f7c7f146274c008f2025023be2b023362b7bf001..09e4f8406a25c2d58ec488535c93158ddd6a3a9f 100755 (executable)
@@ -19,7 +19,7 @@
 # `${ARCH}/%.$(OBJEXT):'.
 # Report from Ralf Corsepius.
 
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index 0f57915f7cea599572d9ac229fe0a43f25fc2853..9c9f3d3723d18d907c4606ed1f9027f07b1e7753 100755 (executable)
@@ -17,7 +17,7 @@
 # Make sure .PHONY can be given dependencies several times.
 # From Ralf Corsepius.
 
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index c91115c99e9feea922eded695c41010ea3a88043..97d881e76f7e16979db2cf2aea098d902d8fa33a 100755 (executable)
@@ -18,7 +18,7 @@
 
 # Please keep this file in sync with silent2.test.
 
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index da2271848f4d9404b47b3988f7ff5f2e1cab3341..aed8546c13706409bf84c593a8e608930789477c 100755 (executable)
@@ -20,7 +20,7 @@
 # Please keep this file in sync with silent.test.
 
 required=gcc
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index dce97d14d5700c12e6fa801ea5b5207daa2dcd03..17f19598021d09b2285a132360bae8603791fa60 100755 (executable)
@@ -19,7 +19,7 @@
 # Please keep this file in sync with silent4.test and silent9.test.
 
 required=libtoolize
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index 3f79b0ccf34077edd9ba4d822e858ea92eb8d887..9c343c0d779b9b3a3b010f409f404035d47999f5 100755 (executable)
@@ -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
 
index 79dfca29912d6a36b4018de61ee65bcd3b49e721..49039b8ba3f891a274dcf151357324d8bd0ca653 100755 (executable)
@@ -21,7 +21,7 @@
 
 # FIXME: generic C++/Fortran compilers should suffice here
 required='g++ gfortran flex bison'
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index 2afe6bc798c9d40051840bb34ed23a92036a88fb..acd9ceab0458e9d663216e37bdb7aca57d252864 100755 (executable)
@@ -16,7 +16,7 @@
 
 # Check user extensibility of silent-rules mode.
 
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index cd8e1b5d89287a662499ce0c057c35a3732f1ac7..5ae8ac02247e7c3320382e87e48074a26a5842ec 100755 (executable)
@@ -16,7 +16,7 @@
 
 # Check user extensibility of silent-rules mode.
 
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index 0fdc94b69621930f8d46dba23c39d75c55b7343a..f0abb290295f14f98a939f00cf1387ab2c61bfef 100755 (executable)
@@ -19,7 +19,7 @@
 # Please keep this file in sync with silent3.test and silent4.test.
 
 required="libtoolize"
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index aa64d8f7a15d96d28545a797d39f47d30cca5dde..40fc92e61fbd776a19c7a5ebd560f8d3fb7d0c8d 100755 (executable)
@@ -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
 
index 2defa45dc7eefb6ccb9763cf26ce534cf9644c60..cfdb1866ac50564852afa053285fa82b05c36c27 100755 (executable)
@@ -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
 
index 261b18ebc83c0959db3d9f99c77a04e9e36f6d75..4fe1c3f14846d636af358ac94f70a900a6c4930d 100755 (executable)
@@ -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
 
index 78e0c7d07734433e89454d2a8bf468439c66cd4a..5ad430e3fd49cbf2246b3fa0bbf516a209ee55de 100755 (executable)
@@ -17,7 +17,7 @@
 # Check silent-rules mode for Lex.
 
 required='flex'
-. ./defs
+. ./defs || Exit 1
 
 set -e
 
index ac5f061893524ad6d74480e0cf8c60c6717019f8..d311e3d9ef046ef879223c368c3cf7a93785426f 100755 (executable)
@@ -17,7 +17,7 @@
 # Check silent-rules mode for Yacc.
 
 required='bison'
-. ./defs
+. ./defs || Exit 1
 
 set -e