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>

56 files changed, 56 insertions, 56 deletions

diff --git a/t/all-prog-libs.sh b/t/all-prog-libs.sh
index 8332800dd..90f884015 100755
--- 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 3a0904725..1f5a27669 100755
--- 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 93c4ef4a7..03aff0887 100755
--- 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 d64f96396..79480f896 100644
--- 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 d00576579..560d9a8c1 100755
--- 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 81bf83715..8afeec8d6 100755
--- 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 aab826355..2dee6436c 100755
--- 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 a5d050621..7333540bd 100755
--- 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 eca43b7b1..309f3a76b 100755
--- 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 77c59ccfb..82905c213 100755
--- 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 7b7e9cb1f..ca6b9b1b7 100755
--- 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 77775f6e6..441e76d15 100755
--- 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 580d79ab2..a01925061 100755
--- 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 90c527b40..8ff839c39 100755
--- 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 64cdcd8c1..28e55b6a9 100755
--- 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 52146cdc7..7dfd984bd 100755
--- 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 b6803cc55..cb31bc5f8 100755
--- 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 9d35470b3..4c2731a72 100755
--- 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 aa2f0e0cf..6a3aee12f 100755
--- 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 0691ae07e..73b7ad355 100755
--- 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 f4c8a18f6..9f679a8e1 100755
--- 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 d7db7d493..253c73066 100755
--- 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 36f98a293..2bbfa3b99 100755
--- 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 90a767ed7..632b8de3b 100755
--- 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 0c87cfa10..4e787d5b7 100755
--- 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 9d561a3c3..71a6b27d2 100755
--- 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 181014b09..f54cb38e9 100755
--- 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 70d9d2316..ce31f46b1 100755
--- 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 7bf001735..65b238532 100755
--- 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 1640e0e6b..dec417aa9 100755
--- 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 99f506e34..16d731580 100755
--- 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 f95d8f5e8..2aa83329a 100755
--- 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 07e67677a..f5894eeea 100755
--- 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 ac8cc5256..9da0ea9ea 100755
--- 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 df345c464..24492bbb0 100755
--- 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 eafecaf75..03964a3ce 100755
--- 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 e72a4e796..2cfea7ec0 100755
--- 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 940e872a9..b08862624 100755
--- 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 1736921d0..bada8d7c2 100755
--- 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 8b1e50511..eadc5df98 100755
--- 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 010e55fbb..a57d649d0 100755
--- 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 c3bc52270..12d92e427 100755
--- 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 4688e5357..e8b412453 100755
--- 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 091ca0303..315de8424 100755
--- 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 5abc31d07..60bac3e86 100755
--- 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 f2796c331..83f9fd50c 100755
--- 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 9b609bd9b..7539d7db3 100755
--- 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 8f6d3f584..b187af95e 100755
--- 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 28ca29999..d4827df1a 100755
--- 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 8ba379225..7ef49d3df 100755
--- 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 dba624c90..569affe96 100755
--- 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 761b301b4..675fb669b 100755
--- 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 ae58511f0..90557205a 100755
--- 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 e856d4b08..d3f6597d7 100755
--- 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 46e81add0..1ce515863 100755
--- 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 81c11aa63..bc1686571 100755
--- 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])