tests: prefer including 'test-init.sh' rather than './defs'

This is a follow-up to today's same-name commit v1.12.4-181-g5ddf100,
which did the same for the test cases in master.

* All tests: To run the common setup, use the command:

    . test-init.sh

instead of the older, "historical" one:

    . ./defs || exit 1

Note that the "|| exit 1" wasn't really useful, since the 'errexit'
shell flag is in effect in both './defs' and 'test-init.sh', and all
the known shells that are good enough to run the automake testsuite
do automatically exit with error when a sourced file cannot be found
(at least, they do so in non-interactive mode, which is the only
mode that concerns us in the testsuite).

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/t/all-prog-libs.sh b/t/all-prog-libs.sh
index 8332800dd4ea4dc404c5451b55a4192f64dfba4b..90f8840153eb288f30b0c069308752be0a89203b 100755 (executable)
--- a/t/all-prog-libs.sh
+++ b/t/all-prog-libs.sh
@@ -19,7 +19,7 @@
 #  - $(am.all-libs).
 #  - $(am.all-ltlibs).
 
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_SUBST([CC], [who-cares])

diff --git a/t/am-dir.sh b/t/am-dir.sh
index 3a09047254c101420a20281c27d0a9df87c6220b..1f5a276691b68227bcb765a2772989bc71d121d1 100755 (executable)
--- a/t/am-dir.sh
+++ b/t/am-dir.sh
@@ -26,7 +26,7 @@
 #  * cleaning rules and "make distcheck" interaction.
 #
 
-. ./defs || exit 1
+. test-init.sh
 
 d=.am
 

diff --git a/t/am-xargs-map.sh b/t/am-xargs-map.sh
index 93c4ef4a7f35b7b001c2cf5ee148dcf70a5b5cb4..03aff088708725740d32be4d367fc7e7c89dfcdc 100755 (executable)
--- a/t/am-xargs-map.sh
+++ b/t/am-xargs-map.sh
@@ -18,7 +18,7 @@
 # scenarios.
 
 am_create_testdir=empty
-. ./defs || exit 1
+. test-init.sh
 
 # Filter out Automake comments.
 grep -v '^##' "$am_amdir"/header-vars.mk > defn.mk \

diff --git a/t/ax/depcomp-shuffle.sh b/t/ax/depcomp-shuffle.sh
index d64f963967d0b9143eb6af10c25d5daa0bfa3f94..79480f896d7c1a1e494d8dc6377f61d171531962 100644 (file)
--- a/t/ax/depcomp-shuffle.sh
+++ b/t/ax/depcomp-shuffle.sh
@@ -19,7 +19,7 @@
 # set the variables '$xdir' and '$vpath' appropriately.
 
 required=cc
-. ./defs || exit 1
+. test-init.sh
 
 test x${xdir+"set"} = x"set" || fatal_ "\$xdir is unset"
 test x${vpath+"set"} = x"set" || fatal_ "\$vpath is unset"

diff --git a/t/backslash-tricks.sh b/t/backslash-tricks.sh
index d0057657976df69c8f8d86a12f90987e5a60e681..560d9a8c16a2c5e2a91942fe34898eb29364787a 100755 (executable)
--- a/t/backslash-tricks.sh
+++ b/t/backslash-tricks.sh
@@ -30,7 +30,7 @@
 #   and newline sequence, because GNU make handles that gracefully.
 #
 
-. ./defs || exit 1
+. test-init.sh
 
 echo AC_OUTPUT >> configure.ac
 

diff --git a/t/clean-many.sh b/t/clean-many.sh
index 81bf83715d8e1f87775ec186a1152c1ead549595..8afeec8d697581ccb3ca568fc98c721873b6be82 100755 (executable)
--- a/t/clean-many.sh
+++ b/t/clean-many.sh
@@ -19,7 +19,7 @@
 # test 'clean-many2.sh', which fakes an artificially low command line
 # length limit for 'rm'.
 
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_SUBST([safe_include], [include])

diff --git a/t/clean-many2.sh b/t/clean-many2.sh
index aab82635561be1905ae94c12f1729b68b91d56dd..2dee6436cb4e0ba6aa923afb917ba2fa4e040c53 100755 (executable)
--- a/t/clean-many2.sh
+++ b/t/clean-many2.sh
@@ -20,7 +20,7 @@
 # The sister test 'clean-many.sh' try to hit the real command line length
 # limit of the system, by declaring a huge number of files to be cleaned.
 
-. ./defs || exit 1
+. test-init.sh
 
 echo AC_OUTPUT >> configure.ac
 

diff --git a/t/cleanvars.sh b/t/cleanvars.sh
index a5d0506214612983d1a48b756d04b425ffb6df66..7333540bdacc2a4d7021f6ed6ea6d9681371755c 100755 (executable)
--- a/t/cleanvars.sh
+++ b/t/cleanvars.sh
@@ -22,7 +22,7 @@
 # Especially checks that it is possible to extend them also from a
 # "wrapper" makefile never processed nor seen by Automake.
 
-. ./defs || exit 1
+. test-init.sh
 
 echo AC_OUTPUT >> configure.ac
 

diff --git a/t/confh-internals.sh b/t/confh-internals.sh
index eca43b7b1823a1e8a9afda4f6da872177a8fe94b..309f3a76bb14a8ec40225ad8e4450cc3d054db15 100755 (executable)
--- a/t/confh-internals.sh
+++ b/t/confh-internals.sh
@@ -16,7 +16,7 @@
 
 # Check internal make variable populated from AC_CONFIG_HEADERS calls.
 
-. ./defs || exit 1
+. test-init.sh
 
 cat >>configure.ac <<'EOF'
 AC_SUBST([BOT], [bot])

diff --git a/t/ctags.sh b/t/ctags.sh
index 77c59ccfbb28cfd564c6bfefdebc0152f5b60950..82905c2139120bd1b6d0776e4e7fd4a68a0e831e 100755 (executable)
--- a/t/ctags.sh
+++ b/t/ctags.sh
@@ -17,7 +17,7 @@
 # Test vi-style tags.
 
 required=${CTAGS:=ctags}
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_SUBST([CC], [false])

diff --git a/t/cxx-fortran.sh b/t/cxx-fortran.sh
index 7b7e9cb1ff976cd60160e76ab083d338d61f0347..ca6b9b1b705a5213d6af2d5aa1cd30955f943900 100755 (executable)
--- a/t/cxx-fortran.sh
+++ b/t/cxx-fortran.sh
@@ -18,7 +18,7 @@
 
 # For now, require the GNU compilers, to avoid possible spurious failure.
 required='gfortran g++'
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_PROG_CXX

diff --git a/t/depcomp-recover.sh b/t/depcomp-recover.sh
index 77775f6e65378c03ed4a37542e51a18ff8a7ea33..441e76d151e3687119f6b0da89056ff3e882e8fc 100755 (executable)
--- a/t/depcomp-recover.sh
+++ b/t/depcomp-recover.sh
@@ -20,7 +20,7 @@
 #    removed.
 
 required=cc
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac <<'END'
 AC_PROG_CC

diff --git a/t/dist-many.sh b/t/dist-many.sh
index 580d79ab2dc4e18328685a3ba91aaf292edcbfe1..a01925061887a4bf5a4f887c1c15b41ada80a05e 100755 (executable)
--- a/t/dist-many.sh
+++ b/t/dist-many.sh
@@ -19,7 +19,7 @@
 # sister test 'dist-many2.sh', which fakes an artificially low
 # command line length limit for 'mkdir' and the shell.
 
-. ./defs || exit 1
+. test-init.sh
 
 expensive_
 

diff --git a/t/dist-many2.sh b/t/dist-many2.sh
index 90c527b40150839803f8fa4834b6cb4fefb561a4..8ff839c39db775164f967bcc8caa6ea2319af2d9 100755 (executable)
--- a/t/dist-many2.sh
+++ b/t/dist-many2.sh
@@ -21,7 +21,7 @@
 # The sister test 'dist-many.sh' try to hit the real command line length
 # limit of the system, by declaring a huge number of files to be cleaned.
 
-. ./defs || exit 1
+. test-init.sh
 
 mkdir bin
 

diff --git a/t/dist-srcdir.sh b/t/dist-srcdir.sh
index 64cdcd8c1a03b7a0d4ad19b13c9f6f5505197c4d..28e55b6a9e96db22097564b1addb9273b1854f21 100755 (executable)
--- a/t/dist-srcdir.sh
+++ b/t/dist-srcdir.sh
@@ -17,7 +17,7 @@
 # We use EXTRA_DIST to distribute stuff *explicitly* from the srcdir.
 
 am_create_testdir=empty
-. ./defs || exit 1
+. test-init.sh
 
 ocwd=$(pwd) || fatal_ "cannot get current working directory"
 

diff --git a/t/dist-srcdir2.sh b/t/dist-srcdir2.sh
index 52146cdc7956c395707e6014af00b0e28c3b940f..7dfd984bda0824338579fe0f27fe208a34e86ea8 100755 (executable)
--- a/t/dist-srcdir2.sh
+++ b/t/dist-srcdir2.sh
@@ -21,7 +21,7 @@
 # limitation should be explained in depth in comments in file
 # 'lib/am/distdir.am').
 
-. ./defs || exit 1
+. test-init.sh
 
 echo AC_OUTPUT >> configure.ac
 

diff --git a/t/double-colon-rules.sh b/t/double-colon-rules.sh
index b6803cc556eff6fe3bc215331271de28f128a8b2..cb31bc5f8639a325a7d451f121dd155b702812c6 100755 (executable)
--- a/t/double-colon-rules.sh
+++ b/t/double-colon-rules.sh
@@ -19,7 +19,7 @@
 # seen in input Makefile.am, but also that GNU make support of double-colon
 # rules is as reliable and well-working as we expect and need.
 
-. ./defs || exit 1
+. test-init.sh
 
 echo AC_OUTPUT >> configure.ac
 

diff --git a/t/ensure-dir-exists.sh b/t/ensure-dir-exists.sh
index 9d35470b3020e8bc5ece9a711e35c75f26fc8ea2..4c2731a72522e8d79eafd406796627d7ea0733c0 100755 (executable)
--- a/t/ensure-dir-exists.sh
+++ b/t/ensure-dir-exists.sh
@@ -17,7 +17,7 @@
 # Test Automake-provided internal macro 'am.cmd.ensure-dir-exists'.
 
 am_create_testdir=empty
-. ./defs || exit 1
+. test-init.sh
 
 # Filter out Automake comments.
 grep -v '^##' "$am_amdir"/header-vars.mk > defn.mk \

diff --git a/t/etags.sh b/t/etags.sh
index aa2f0e0cfc8b148979c1e07e1816e0f12f266b2c..6a3aee12f23b466d865741ab468c8873a41cc90c 100755 (executable)
--- a/t/etags.sh
+++ b/t/etags.sh
@@ -18,7 +18,7 @@
 # François Pinard, and later by Akim Demaille.
 
 required=${ETAGS:=etags}
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_SUBST([CC], [false])

diff --git a/t/gmake-vars.sh b/t/gmake-vars.sh
index 0691ae07e87baea6b0829c5d9c4c9914046849e1..73b7ad3552225bfe32844fb8a0056b6428257c87 100755 (executable)
--- a/t/gmake-vars.sh
+++ b/t/gmake-vars.sh
@@ -17,7 +17,7 @@
 # Check that Automake does not warns about nested variables expansion,
 # variables with non-POSIX names, or GNU make function calls.
 
-. ./defs || exit 1
+. test-init.sh
 
 cat > Makefile.am <<'END'
 define get-libname

diff --git a/t/internals.tap b/t/internals.tap
index f4c8a18f6012bbcb96fced5450879b78c957243f..9f679a8e168baea81c91b04a76a9022f38eb8426 100755 (executable)
--- a/t/internals.tap
+++ b/t/internals.tap
@@ -17,7 +17,7 @@
 # Test some generic Automake-provided internal macros and make functions.
 
 am_create_testdir=empty
-. ./defs || exit 1
+. test-init.sh
 
 plan_ 13
 

diff --git a/t/local-targets.sh b/t/local-targets.sh
index d7db7d4935fddd4048ff98182a1803e1b2d5329d..253c73066e859746f3f17036975c279cdd253b9c 100755 (executable)
--- a/t/local-targets.sh
+++ b/t/local-targets.sh
@@ -19,7 +19,7 @@
 # sees, as well as through GNU make constructs that Automake does not
 # parse.
 
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_SUBST([SafeInclude], [include])

diff --git a/t/memoize.tap b/t/memoize.tap
index 36f98a293016df389d7549320e932af77bedaff5..2bbfa3b99e2f413fcaec1d53a0d8baf10017f727 100755 (executable)
--- a/t/memoize.tap
+++ b/t/memoize.tap
@@ -17,7 +17,7 @@
 # Test Automake-provided memoization for make variables.
 
 am_create_testdir=empty
-. ./defs || exit 1
+. test-init.sh
 
 plan_ 17
 

diff --git a/t/no-c.tap b/t/no-c.tap
index 90a767ed709ed83ec4f3fc86240f92ab22e407e2..632b8de3b017c2936e1bbf43c1b860af1b16ad2f 100755 (executable)
--- a/t/no-c.tap
+++ b/t/no-c.tap
@@ -17,7 +17,7 @@
 # Projects using only Fortran or C++ shouldn't need C-related stuff.
 
 am_create_testdir=empty
-. ./defs || exit 1
+. test-init.sh
 
 plan_ 6
 

diff --git a/t/parallel-tests-concatenated-suffix.sh b/t/parallel-tests-concatenated-suffix.sh
index 0c87cfa10b7bd6fb826322d18ecdb91b22275491..4e787d5b79b504275dea5f90b35237e23dccee74 100755 (executable)
--- a/t/parallel-tests-concatenated-suffix.sh
+++ b/t/parallel-tests-concatenated-suffix.sh
@@ -17,7 +17,7 @@
 # The parallel-tests driver should be able to cope with test scripts
 # whose names end with several concatenated suffixes.
 
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_OUTPUT

diff --git a/t/parallel-tests-dynamic.sh b/t/parallel-tests-dynamic.sh
index 9d561a3c30b976872b2d56005aa2e9605522ef5b..71a6b27d2084eac8ad389af0eaaa40d10b7b6948 100755 (executable)
--- a/t/parallel-tests-dynamic.sh
+++ b/t/parallel-tests-dynamic.sh
@@ -17,7 +17,7 @@
 # Check that dynamic content for $(TESTS) is supported, both when set from
 # inside the Makefile.am and when overridden from the command line.
 
-. ./defs || exit 1
+. test-init.sh
 
 echo AC_OUTPUT >> configure.ac
 

diff --git a/t/parallel-tests-longest-stem.sh b/t/parallel-tests-longest-stem.sh
index 181014b0909848a7127ee12e05a9d658bdc615a5..f54cb38e98747a3da7c3b5091b92d80fe6c69164 100755 (executable)
--- a/t/parallel-tests-longest-stem.sh
+++ b/t/parallel-tests-longest-stem.sh
@@ -18,7 +18,7 @@
 # extension-less tests.  This is required to allow the user to have
 # a, say, 'all.test' test case even in the face of the 'all' target.
 
-. ./defs || exit 1
+. test-init.sh
 
 echo AC_OUTPUT >> configure.ac
 

diff --git a/t/parallel-tests-many.sh b/t/parallel-tests-many.sh
index 70d9d2316882edfbe2cfe25795725ddd93499374..ce31f46b1070b5dc1e873f82b86bf672c64422d2 100755 (executable)
--- a/t/parallel-tests-many.sh
+++ b/t/parallel-tests-many.sh
@@ -18,7 +18,7 @@
 # to an exceeded command line length when there are many tests.
 # For automake bug#7868.
 
-. ./defs || exit 1
+. test-init.sh
 
 expensive_
 

diff --git a/t/parallel-tests-per-suffix-deps.sh b/t/parallel-tests-per-suffix-deps.sh
index 7bf0017357c8b2dcc8c58015b1673d863d3f0ae6..65b2385326c3536cd2aae0b41d5bb12281683185 100755 (executable)
--- a/t/parallel-tests-per-suffix-deps.sh
+++ b/t/parallel-tests-per-suffix-deps.sh
@@ -19,7 +19,7 @@
 # We do so with the help of "${prefix}LOG_DEPENDENCIES" variables.
 # See the last wishlist in automake bug#11287.
 
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac <<'END'
 AC_SUBST([EXEEXT], [.bin])

diff --git a/t/silent-texi.sh b/t/silent-texi.sh
index 1640e0e6b57d9c18db185e9aa40695a8cfcec068..dec417aa91864d4419a4edf009cb2444bd8368d1 100755 (executable)
--- a/t/silent-texi.sh
+++ b/t/silent-texi.sh
@@ -17,7 +17,7 @@
 # Check texinfo rules in silent-rules mode.
 
 required='makeinfo tex texi2dvi dvips'
-. ./defs || exit 1
+. test-init.sh
 
 echo AC_OUTPUT >> configure.ac
 

diff --git a/t/spy-autovars.sh b/t/spy-autovars.sh
index 99f506e34b5a778862da6ca8651df4f58885d29c..16d731580ac156dc2b49eeb0f5434f6ccc3f7ccc 100755 (executable)
--- a/t/spy-autovars.sh
+++ b/t/spy-autovars.sh
@@ -21,7 +21,7 @@
 # automatic variables of GNU make.
 
 am_create_testdir=empty
-. ./defs || exit 1
+. test-init.sh
 
 cat > Makefile <<'END'
 foo:

diff --git a/t/spy-pattern-rules.sh b/t/spy-pattern-rules.sh
index f95d8f5e84d19f23abee22607c6cb6516c240172..2aa83329a45bba268573a2a592967386668235e7 100755 (executable)
--- a/t/spy-pattern-rules.sh
+++ b/t/spy-pattern-rules.sh
@@ -26,7 +26,7 @@
 # support.
 
 am_create_testdir=empty
-. ./defs || exit 1
+. test-init.sh
 
 cat > Makefile <<'END'
 default:

diff --git a/t/spy-trailing-backlash.sh b/t/spy-trailing-backlash.sh
index 07e67677a519dcec1a757c38d38953f83785b2c3..f5894eeeaa41b42558bf921ed689ff73c2054d69 100755 (executable)
--- a/t/spy-trailing-backlash.sh
+++ b/t/spy-trailing-backlash.sh
@@ -18,7 +18,7 @@
 # semantic we expect.
 
 am_create_testdir=empty
-. ./defs || exit 1
+. test-init.sh
 
 cat > Makefile << 'END'
 default:

diff --git a/t/spy-var-append.sh b/t/spy-var-append.sh
index ac8cc52564e8aeea9600dd1d4e63e7b331d14c45..9da0ea9ea7a727eeb337e287e686d57d066c3c41 100755 (executable)
--- a/t/spy-var-append.sh
+++ b/t/spy-var-append.sh
@@ -19,7 +19,7 @@
 # any '+=' appending to it gets overridden as well.
 
 am_create_testdir=empty
-. ./defs || exit 1
+. test-init.sh
 
 cat > Makefile << 'END'
 var0 += foo

diff --git a/t/spy-vpath-rewrite.sh b/t/spy-vpath-rewrite.sh
index df345c4641817891e78d054b04490e5af1ba4716..24492bbb0fa631120901dfb7de953f7df3eddd99 100755 (executable)
--- a/t/spy-vpath-rewrite.sh
+++ b/t/spy-vpath-rewrite.sh
@@ -18,7 +18,7 @@
 # We use that assumption in some of our rules, so it better explicitly
 # check that it truly holds.
 
-. ./defs || exit 1
+. test-init.sh
 
 ocwd=$(pwd) || fatal_ "couldn't get current working directory"
 

diff --git a/t/subobj-c.sh b/t/subobj-c.sh
index eafecaf75ef62c2424423f83299e77f7191af726..03964a3ce35522045ac606f551b45964bfba3781 100755 (executable)
--- a/t/subobj-c.sh
+++ b/t/subobj-c.sh
@@ -18,7 +18,7 @@
 # Keep in sync with sister test 'subobj-cxx.sh'.
 
 required=cc
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_PROG_CC

diff --git a/t/subobj-cxx.sh b/t/subobj-cxx.sh
index e72a4e7964dc8f6de8fabb7195807b09810c0bbc..2cfea7ec0a492c0f25c62fceae772a5527db0996 100755 (executable)
--- a/t/subobj-cxx.sh
+++ b/t/subobj-cxx.sh
@@ -18,7 +18,7 @@
 # Keep in sync with sister test 'subobj-c.sh'.
 
 required=c++
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_PROG_CXX

diff --git a/t/subobj-libtool.sh b/t/subobj-libtool.sh
index 940e872a9aa228c06239aa2511b6362a9f9c72db..b088626240366bfdaeaa02211697ac15f6aa9006 100755 (executable)
--- a/t/subobj-libtool.sh
+++ b/t/subobj-libtool.sh
@@ -17,7 +17,7 @@
 # Test of subdir objects with libtool.
 
 required='cc libtoolize'
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_PROG_CC

diff --git a/t/suffix-custom-default-ext.sh b/t/suffix-custom-default-ext.sh
index 1736921d0be0b2a7dd932a3a98c18cb108adb5b3..bada8d7c2afd15241f3dd5b7d6b6d879968b0f2e 100755 (executable)
--- a/t/suffix-custom-default-ext.sh
+++ b/t/suffix-custom-default-ext.sh
@@ -18,7 +18,7 @@
 # and the use of AM_DEFAULT_SOURCE_EXT.
 
 required=c++
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac <<'END'
 AC_PROG_CXX

diff --git a/t/suffix-custom-link.sh b/t/suffix-custom-link.sh
index 8b1e505118b2f08acdf709ad967258931ac909b0..eadc5df981c9a0c3e1935d53475431d0a86ef315 100755 (executable)
--- a/t/suffix-custom-link.sh
+++ b/t/suffix-custom-link.sh
@@ -19,7 +19,7 @@
 # the Automake default (C linker) would be inappropriate.
 
 required=c++
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac <<'END'
 AC_PROG_CXX

diff --git a/t/suffix-custom.sh b/t/suffix-custom.sh
index 010e55fbb0639c017f55af7ec4f0d3eb94cb6080..a57d649d06e95639d094b500c5a55a6594230bd6 100755 (executable)
--- a/t/suffix-custom.sh
+++ b/t/suffix-custom.sh
@@ -19,7 +19,7 @@
 # extension in object files.
 
 required=cc
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac <<'END'
 AC_CONFIG_HEADERS([config.h])

diff --git a/t/suffix-hdr.sh b/t/suffix-hdr.sh
index c3bc522706f7d0f57325448841902096e63fbe90..12d92e4273e68cef881221733a070caae373309c 100755 (executable)
--- a/t/suffix-hdr.sh
+++ b/t/suffix-hdr.sh
@@ -17,7 +17,7 @@
 # Use of "custom" headers (with custom suffix).
 
 required='cc native'
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_PROG_CC

diff --git a/t/suffix3.sh b/t/suffix3.sh
index 4688e53579aa853478304471ebabb9d052c3820a..e8b41245363dc495d9d7f16e141eebcf1b9bb4e0 100755 (executable)
--- a/t/suffix3.sh
+++ b/t/suffix3.sh
@@ -17,7 +17,7 @@
 # Test to make sure that suffix rules chain.
 
 required=c++
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_PROG_CXX

diff --git a/t/test-extensions-dynamic.sh b/t/test-extensions-dynamic.sh
index 091ca0303836cef70e278af04c6f73af210a923e..315de8424c3584ef3a08d1f37db370f0b6b01ce6 100755 (executable)
--- a/t/test-extensions-dynamic.sh
+++ b/t/test-extensions-dynamic.sh
@@ -16,7 +16,7 @@
 
 # TEST_EXTENSIONS with contents dynamically determined at make time
 
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_SUBST([suf], [.tap])

diff --git a/t/test-extensions-funny-chars.sh b/t/test-extensions-funny-chars.sh
index 5abc31d077e0c79f0d44ad8c87518e9968b15baf..60bac3e86e88c8ea14de8855bc890a4f4b692125 100755 (executable)
--- a/t/test-extensions-funny-chars.sh
+++ b/t/test-extensions-funny-chars.sh
@@ -17,7 +17,7 @@
 # Make sure that Automake can handle "funny chars" in TEST_EXTENSIONS,
 # as long as they can be used in GNU make variable names.
 
-. ./defs || exit 1
+. test-init.sh
 
 fetch_tap_driver
 

diff --git a/t/triplet.sh b/t/triplet.sh
index f2796c331ad6ca0cdce98d4e97f60223ec1c9380..83f9fd50c5f8fa3a1fd9640ec524e64e09a07247 100755 (executable)
--- a/t/triplet.sh
+++ b/t/triplet.sh
@@ -17,7 +17,7 @@
 # The $(host), $(build), $(target) variables, and their '*_alias'
 # and 'am.conf.*-triplet' counterparts.
 
-. ./defs || exit 1
+. test-init.sh
 
 : > config.guess
 : > config.sub

diff --git a/t/txinfo-include.sh b/t/txinfo-include.sh
index 9b609bd9bc4264a5b36e72769bc9c29f7a4ed2c2..7539d7db374adea1b7497e979109d5cc782d39dd 100755 (executable)
--- a/t/txinfo-include.sh
+++ b/t/txinfo-include.sh
@@ -18,7 +18,7 @@
 # and VPATH builds, and both top-level and subdir input.
 
 required='makeinfo tex texi2dvi'
-. ./defs || exit 1
+. test-init.sh
 
 echo AC_OUTPUT >> configure.ac
 

diff --git a/t/txinfo21b.sh b/t/txinfo21b.sh
index 8f6d3f5843768349f01a786b838593e67d7fdc33..b187af95e5fc594339c71a0432c907253a451002 100755 (executable)
--- a/t/txinfo21b.sh
+++ b/t/txinfo21b.sh
@@ -22,7 +22,7 @@
 # FIXME: TAP, and merge them.
 
 required='makeinfo tex texi2dvi'
-. ./defs || exit 1
+. test-init.sh
 
 cat >>configure.ac <<\EOF
 AC_CONFIG_FILES([rec/Makefile])

diff --git a/t/var-undef-append.sh b/t/var-undef-append.sh
index 28ca29999576a877ecb006bf8f575f08d42271f0..d4827df1a07f3ee8ddc19dabb22624d8466782aa 100755 (executable)
--- a/t/var-undef-append.sh
+++ b/t/var-undef-append.sh
@@ -20,7 +20,7 @@
 # to it should get overridden as well.
 # See also "spy" test 'spy-var-append.sh'.
 
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AM_CONDITIONAL([COND_NO], [false])

diff --git a/t/vartypos-deps.sh b/t/vartypos-deps.sh
index 8ba3792258d35ce72e22627fd88db5fb53136e2d..7ef49d3dfcd5096cd275c8a5b02f5b6d2a318885 100755 (executable)
--- a/t/vartypos-deps.sh
+++ b/t/vartypos-deps.sh
@@ -18,7 +18,7 @@
 # *_DEPENDENCIES when we should, and do not warn about them
 # when we should not.
 
-. ./defs || exit 1
+. test-init.sh
 
 subdirs='ok1 ok2 ko1 ko2'
 mkdir $subdirs

diff --git a/t/vartypos-whitelist.sh b/t/vartypos-whitelist.sh
index dba624c90b5237c6f42631da3b9804b0e8388dcf..569affe967eda3539d502ec47ecf895f2087326b 100755 (executable)
--- a/t/vartypos-whitelist.sh
+++ b/t/vartypos-whitelist.sh
@@ -19,7 +19,7 @@
 # build system.
 
 required=cc
-. ./defs || exit 1
+. test-init.sh
 
 edit ()
 {

diff --git a/t/verbatim.sh b/t/verbatim.sh
index 761b301b4910958dd289a4f7a654020ca4e18072..675fb669b0e1994e23bc3e45be91085002f188a3 100755 (executable)
--- a/t/verbatim.sh
+++ b/t/verbatim.sh
@@ -19,7 +19,7 @@
 # too.  Yes, this test is hacky ... as is the behaviour it tests
 # after all ;-)
 
-. ./defs || exit 1
+. test-init.sh
 
 echo AC_OUTPUT >> configure.ac
 

diff --git a/t/vpath-built-sources.sh b/t/vpath-built-sources.sh
index ae58511f07c94bdc2d5e69de951f9ecead23f60c..90557205a8c1713910ff85bc9c08dec2e801c734 100755 (executable)
--- a/t/vpath-built-sources.sh
+++ b/t/vpath-built-sources.sh
@@ -18,7 +18,7 @@
 # build a source with the same name but without the $(srcdir).
 
 required=cc
-. ./defs || exit 1
+. test-init.sh
 
 ocwd=$(pwd) || fatal_ "couldn't get current working directory"
 

diff --git a/t/vpath-rewrite.sh b/t/vpath-rewrite.sh
index e856d4b081753ab6dfef25eb55e7639049bdbe25..d3f6597d7453f8241a10b541146793deec2c8f97 100755 (executable)
--- a/t/vpath-rewrite.sh
+++ b/t/vpath-rewrite.sh
@@ -16,7 +16,7 @@
 
 # Test Automake-provided internal make macros to deal with VPATH rewrites.
 
-. ./defs || exit 1
+. test-init.sh
 
 echo AC_OUTPUT >> configure.ac
 

diff --git a/t/yacc-lex-cxx-alone.sh b/t/yacc-lex-cxx-alone.sh
index 46e81add06ed02d55bd25edfdde3e2aa808d898b..1ce515863126531181115a57b45de201a16e9dba 100755 (executable)
--- a/t/yacc-lex-cxx-alone.sh
+++ b/t/yacc-lex-cxx-alone.sh
@@ -18,7 +18,7 @@
 # Lex + C++ support for a program built only from lex sources.
 
 required='c++ yacc'
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_PROG_CXX

diff --git a/t/yacc-subobj-nodep.sh b/t/yacc-subobj-nodep.sh
index 81c11aa63a06d96661ba976b34986ec4c0f03710..bc16865715c94832a50a13861110ebdcda0d3ec8 100755 (executable)
--- a/t/yacc-subobj-nodep.sh
+++ b/t/yacc-subobj-nodep.sh
@@ -18,7 +18,7 @@
 # are used, even when dependency tracking is disabled.
 
 required='cc yacc'
-. ./defs || exit 1
+. test-init.sh
 
 cat >configure.ac <<END
 AC_INIT([$me], [1.0])