[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-1018-gb7d99c6

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=b7d99c63a3bc0de3b8a5dfb71c1132cd94d96a26

The branch, testsuite-work has been updated
       via  b7d99c63a3bc0de3b8a5dfb71c1132cd94d96a26 (commit)
       via  7450206489bea8b4150d564a70413c541c08596b (commit)
       via  edee35da30481a0fa26800bd514bb177416f7e83 (commit)
       via  9d1a3a28e52edf568f5edd598446d00c6deebec4 (commit)
       via  b01fc0873d749b73fcd54378772d36c05ce81bf2 (commit)
       via  76cfe59c148e8ba4299fbd2ee9f29ede6198698e (commit)
       via  8285d525bfa39018781f5c49b5caa3a44960b8b1 (commit)
       via  839b1e34dce6a7038573157a10a4000488926f8d (commit)
       via  3320c0a504ae23d22bc4d968e0696dc59d036acb (commit)
       via  24cf7efeaa0e139fd49a0589519a15d4da38ec2c (commit)
       via  7883db2175ed3baefd02d3b2e72fb96c25084ee2 (commit)
      from  2497dcb8669fec10310130de1108bc5a278d2114 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b7d99c63a3bc0de3b8a5dfb71c1132cd94d96a26
Merge: 3320c0a 7450206
Author: Stefano Lattarini <address@hidden>
Date:   Fri Jul 8 11:58:40 2011 +0200

    Merge branch 'master' into testsuite-work
    
    * master:
      fix typo in recent ChangeLog entry
      docs, tests: synchronize examples on silent-rules from config.site
      tests: fix weakness in 'tests-environment-backcompat.test'

commit 3320c0a504ae23d22bc4d968e0696dc59d036acb
Author: Stefano Lattarini <address@hidden>
Date:   Fri Jul 8 10:23:38 2011 +0200

    tests defs: more uses of $top_testsrcdir
    
    * tests/autodist-stamp-vti.test: Use `$top_testsrcdir' instead
    of `$testsrcdir/..'.
    * tests/repeated-options.test: Likewise.
    * tests/suffix5.test: Likewise.
    * tests/vtexi3.test: Likewise.

commit 24cf7efeaa0e139fd49a0589519a15d4da38ec2c
Author: Stefano Lattarini <address@hidden>
Date:   Fri Jul 8 10:17:00 2011 +0200

    self tests: fix typo in comment
    
    * tests/self-check-exit.test: Fix typo in heading comments.

commit 7883db2175ed3baefd02d3b2e72fb96c25084ee2
Author: Stefano Lattarini <address@hidden>
Date:   Fri Jul 8 10:14:38 2011 +0200

    tests: remove redundant settings of `errexit' shell flag
    
    * tests/amhello-binpkg.test: Do not set the `errexit' shell
    flag, as it is already set by `tests/defs'.
    * tests/amhello-cflags.test: Likewise.
    * tests/amhello-cross-compile.test: Likewise.
    * tests/ansi2knr-deprecation.test: Likewise.
    * tests/autodist-no-duplicate.test: Likewise.
    * tests/distcheck-configure-flags-am.test: Likewise.
    * tests/distcheck-configure-flags-subpkg.test: Likewise.
    * tests/distcheck-configure-flags.test: Likewise.
    * tests/distcheck-hook.test: Likewise.
    * tests/distcheck-hook2.test: Likewise.
    * tests/parallel-tests-am_tests_environment.test: Likewise.
    * tests/parallel-tests-harderror.test: Likewise.
    * tests/parallel-tests-log-compiler-example.test: Likewise.
    * tests/parallel-tests-log-override-1.test: Likewise.
    * tests/parallel-tests-log-override-2.test: Likewise.
    * tests/parallel-tests-log-override-recheck.test: Likewise.
    * tests/primary-prefix-couples-documented-valid.test: Likewise.
    * tests/primary-prefix-couples-force-valid.test: Likewise.
    * tests/primary-prefix-invalid-couples.test: Likewise.
    * tests/primary-prefix-valid-couples.test: Likewise.
    * tests/remake-subdir-from-subdir.test: Likewise.
    * tests/remake-subdir-gnu.test: Likewise.
    * tests/remake-subdir-long-time.test: Likewise.
    * tests/remake-subdir.test: Likewise.
    * tests/remake-subdir2.test: Likewise.
    * tests/silent-configsite.test: Likewise.
    * tests/tests-environment-backcompat.test: Likewise.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                          |   62 +++++++++++++++++++-
 doc/automake.texi                                  |    1 +
 tests/amhello-binpkg.test                          |    2 -
 tests/amhello-cflags.test                          |    2 -
 tests/amhello-cross-compile.test                   |    2 -
 tests/ansi2knr-deprecation.test                    |    2 -
 tests/autodist-no-duplicate.test                   |    2 -
 tests/autodist-stamp-vti.test                      |    2 +-
 tests/distcheck-configure-flags-am.test            |    2 -
 tests/distcheck-configure-flags-subpkg.test        |    2 -
 tests/distcheck-configure-flags.test               |    2 -
 tests/distcheck-hook.test                          |    2 -
 tests/distcheck-hook2.test                         |    2 -
 tests/parallel-tests-am_tests_environment.test     |    2 -
 tests/parallel-tests-harderror.test                |    2 -
 tests/parallel-tests-log-compiler-example.test     |    2 -
 tests/parallel-tests-log-override-1.test           |    2 -
 tests/parallel-tests-log-override-2.test           |    2 -
 tests/parallel-tests-log-override-recheck.test     |    2 -
 tests/primary-prefix-couples-documented-valid.test |    2 -
 tests/primary-prefix-couples-force-valid.test      |    2 -
 tests/primary-prefix-invalid-couples.test          |    2 -
 tests/primary-prefix-valid-couples.test            |    2 -
 tests/remake-subdir-from-subdir.test               |    2 -
 tests/remake-subdir-gnu.test                       |    2 -
 tests/remake-subdir-long-time.test                 |    2 -
 tests/remake-subdir.test                           |    2 -
 tests/remake-subdir2.test                          |    2 -
 tests/repeated-options.test                        |    2 +-
 tests/self-check-exit.test                         |    2 +-
 tests/silent-configsite.test                       |    2 -
 tests/suffix5.test                                 |    2 +-
 tests/tests-environment-backcompat.test            |    6 --
 tests/vtexi3.test                                  |    2 +-
 34 files changed, 67 insertions(+), 64 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9b92575..e42c3e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,65 @@
 2011-07-08  Stefano Lattarini  <address@hidden>
 
+       tests: fix weakness in 'tests-environment-backcompat.test'
+       * tests/tests-environment-backcompat.test: Do not override the
+       content of xfailing test `baz.test' with a "weaker" version that
+       fails unconditionally: the test must fail only when the 'strict'
+       pragma is in use, in order not to reduce coverage.
+
+2011-07-08  Stefano Lattarini  <address@hidden>
+
+       docs, tests: synchronize examples on silent-rules from config.site
+       * doc/automake.texi (Automake silent-rules Option): Reference test
+       'silent-configsite.test' in comments.
+
+2011-07-08  Stefano Lattarini  <address@hidden>
+
+       tests defs: more uses of $top_testsrcdir
+       * tests/autodist-stamp-vti.test: Use `$top_testsrcdir' instead
+       of `$testsrcdir/..'.
+       * tests/repeated-options.test: Likewise.
+       * tests/suffix5.test: Likewise.
+       * tests/vtexi3.test: Likewise.
+
+2011-07-08  Stefano Lattarini  <address@hidden>
+
+       self tests: fix typo in comment
+       * tests/self-check-exit.test: Fix typo in heading comments.
+
+2011-07-08  Stefano Lattarini  <address@hidden>
+
+       tests: remove redundant settings of `errexit' shell flag
+       * tests/amhello-binpkg.test: Do not set the `errexit' shell
+       flag, as it is already set by `tests/defs'.
+       * tests/amhello-cflags.test: Likewise.
+       * tests/amhello-cross-compile.test: Likewise.
+       * tests/ansi2knr-deprecation.test: Likewise.
+       * tests/autodist-no-duplicate.test: Likewise.
+       * tests/distcheck-configure-flags-am.test: Likewise.
+       * tests/distcheck-configure-flags-subpkg.test: Likewise.
+       * tests/distcheck-configure-flags.test: Likewise.
+       * tests/distcheck-hook.test: Likewise.
+       * tests/distcheck-hook2.test: Likewise.
+       * tests/parallel-tests-am_tests_environment.test: Likewise.
+       * tests/parallel-tests-harderror.test: Likewise.
+       * tests/parallel-tests-log-compiler-example.test: Likewise.
+       * tests/parallel-tests-log-override-1.test: Likewise.
+       * tests/parallel-tests-log-override-2.test: Likewise.
+       * tests/parallel-tests-log-override-recheck.test: Likewise.
+       * tests/primary-prefix-couples-documented-valid.test: Likewise.
+       * tests/primary-prefix-couples-force-valid.test: Likewise.
+       * tests/primary-prefix-invalid-couples.test: Likewise.
+       * tests/primary-prefix-valid-couples.test: Likewise.
+       * tests/remake-subdir-from-subdir.test: Likewise.
+       * tests/remake-subdir-gnu.test: Likewise.
+       * tests/remake-subdir-long-time.test: Likewise.
+       * tests/remake-subdir.test: Likewise.
+       * tests/remake-subdir2.test: Likewise.
+       * tests/silent-configsite.test: Likewise.
+       * tests/tests-environment-backcompat.test: Likewise.
+
+2011-07-08  Stefano Lattarini  <address@hidden>
+
        tests: portability fixes in tests on amhello examples
        * tests/amhello-binpkg.test: Don't use "tar xzf too.tag.gz" to
        extract a gzip-compressed tarball, that's unportable to some
@@ -40,7 +100,7 @@
        * tests/amhello-cflags.test: New test.
        * tests/amhello-cross-compile.test: Likewise.
        * tests/amhello-binpkg.test: Likewise.
-       * tests/tests-environment-backcompat: Likewise.
+       * tests/tests-environment-backcompat.test: Likewise.
        * tests/parallel-tests-log-compiler-example.test: Likewise.
        * tests/Makefile.am (TESTS): Update.
 
diff --git a/doc/automake.texi b/doc/automake.texi
index 4d89a43..1f16dd3 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -10128,6 +10128,7 @@ make silent rules enabled by default in his own package 
can do so by
 adding a @samp{yes} argument to the @code{AM_SILENT_RULES} call in
 @file{configure.ac}.  We advise against this approach, though.
 
address@hidden Keep in sync with silent-configsite.test
 Users who prefer to have silent rules enabled by default can edit their
 @file{config.site} file to make the variable @code{enable_silent_rules}
 default to @samp{yes}.  This should still allow disabling silent rules
diff --git a/tests/amhello-binpkg.test b/tests/amhello-binpkg.test
index 34600fe..cb95a06 100755
--- a/tests/amhello-binpkg.test
+++ b/tests/amhello-binpkg.test
@@ -19,8 +19,6 @@
 
 . ./defs || Exit 1
 
-set -e
-
 cp "$testsrcdir"/../doc/amhello-1.0.tar.gz . \
   || fatal_ "cannot get amhello tarball"
 
diff --git a/tests/amhello-cflags.test b/tests/amhello-cflags.test
index 56f7729..efff153 100755
--- a/tests/amhello-cflags.test
+++ b/tests/amhello-cflags.test
@@ -21,8 +21,6 @@
 required=gcc
 . ./defs || Exit 1
 
-set -e
-
 cp "$testsrcdir"/../doc/amhello-1.0.tar.gz . \
   || fatal_ "cannot get amhello tarball"
 
diff --git a/tests/amhello-cross-compile.test b/tests/amhello-cross-compile.test
index 6db91ba..bc31243 100755
--- a/tests/amhello-cross-compile.test
+++ b/tests/amhello-cross-compile.test
@@ -20,8 +20,6 @@
 required=i586-mingw32msvc-gcc
 . ./defs || Exit 1
 
-set -e
-
 cp "$testsrcdir"/../doc/amhello-1.0.tar.gz . \
   || fatal_ "cannot get amhello tarball"
 
diff --git a/tests/ansi2knr-deprecation.test b/tests/ansi2knr-deprecation.test
index 543d9c6..c04c6a8 100755
--- a/tests/ansi2knr-deprecation.test
+++ b/tests/ansi2knr-deprecation.test
@@ -19,8 +19,6 @@
 
 . ./defs || Exit 1
 
-set -e
-
 warn_rx='automatic de-ANSI-fication.*deprecated'
 
 cat >> configure.in <<'END'
diff --git a/tests/autodist-no-duplicate.test b/tests/autodist-no-duplicate.test
index 81464c0..1109129 100755
--- a/tests/autodist-no-duplicate.test
+++ b/tests/autodist-no-duplicate.test
@@ -19,8 +19,6 @@
 
 . ./defs || Exit 1
 
-set -e
-
 re='Files .*automatically distributed.*if found'
 
 # The automake manual states that the list of automatically-distributed
diff --git a/tests/autodist-stamp-vti.test b/tests/autodist-stamp-vti.test
index 2984372..1dc91c7 100755
--- a/tests/autodist-stamp-vti.test
+++ b/tests/autodist-stamp-vti.test
@@ -46,7 +46,7 @@ END
 
 # Required when using Texinfo.
 : > texinfo.tex
-cp "$testsrcdir/../lib/mdate-sh" .
+cp "$top_testsrcdir"/lib/mdate-sh .
 
 $ACLOCAL
 $AUTOCONF
diff --git a/tests/distcheck-configure-flags-am.test 
b/tests/distcheck-configure-flags-am.test
index a5cab6a..40c3a79 100755
--- a/tests/distcheck-configure-flags-am.test
+++ b/tests/distcheck-configure-flags-am.test
@@ -19,8 +19,6 @@
 
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.in << 'END'
 AC_ARG_ENABLE([success], [], [success=$enableval], [success=no])
 AS_IF([test $success = yes && test "$sentence" = 'it works :-)'],
diff --git a/tests/distcheck-configure-flags-subpkg.test 
b/tests/distcheck-configure-flags-subpkg.test
index 695b47c..5c9a320 100755
--- a/tests/distcheck-configure-flags-subpkg.test
+++ b/tests/distcheck-configure-flags-subpkg.test
@@ -22,8 +22,6 @@
 
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.in << 'END'
 AC_CONFIG_SUBDIRS([subpkg])
 if test $dc != ok || test $am_dc != ok; then
diff --git a/tests/distcheck-configure-flags.test 
b/tests/distcheck-configure-flags.test
index 117d83c..9a2eb4c 100755
--- a/tests/distcheck-configure-flags.test
+++ b/tests/distcheck-configure-flags.test
@@ -18,8 +18,6 @@
 
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.in << 'END'
 AC_ARG_ENABLE([success], [], [success=$enableval], [success=no])
 AS_IF([test $success = yes && test "$sentence" = 'it works :-)'],
diff --git a/tests/distcheck-hook.test b/tests/distcheck-hook.test
index 9a2c384..16b151e 100755
--- a/tests/distcheck-hook.test
+++ b/tests/distcheck-hook.test
@@ -18,8 +18,6 @@
 
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.in << 'END'
 AC_OUTPUT
 END
diff --git a/tests/distcheck-hook2.test b/tests/distcheck-hook2.test
index befc1d6..7a20156 100755
--- a/tests/distcheck-hook2.test
+++ b/tests/distcheck-hook2.test
@@ -20,8 +20,6 @@
 
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.in << 'END'
 AC_CONFIG_SUBDIRS([subpkg])
 AC_OUTPUT
diff --git a/tests/parallel-tests-am_tests_environment.test 
b/tests/parallel-tests-am_tests_environment.test
index 072e614..eff02a6 100755
--- a/tests/parallel-tests-am_tests_environment.test
+++ b/tests/parallel-tests-am_tests_environment.test
@@ -20,8 +20,6 @@
 parallel_tests=yes
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.in << 'END'
 AC_PROG_MKDIR_P
 AC_OUTPUT
diff --git a/tests/parallel-tests-harderror.test 
b/tests/parallel-tests-harderror.test
index 8680e29..dedef36 100755
--- a/tests/parallel-tests-harderror.test
+++ b/tests/parallel-tests-harderror.test
@@ -19,8 +19,6 @@
 parallel_tests=yes
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.in << 'END'
 AC_CONFIG_FILES([sub/Makefile])
 AC_OUTPUT
diff --git a/tests/parallel-tests-log-compiler-example.test 
b/tests/parallel-tests-log-compiler-example.test
index 746c128..95013f1 100755
--- a/tests/parallel-tests-log-compiler-example.test
+++ b/tests/parallel-tests-log-compiler-example.test
@@ -21,8 +21,6 @@ parallel_tests=yes
 required=python
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.in <<END
 AC_SUBST([PERL], ['$PERL'])
 AM_PATH_PYTHON
diff --git a/tests/parallel-tests-log-override-1.test 
b/tests/parallel-tests-log-override-1.test
index 6e98380..988e424 100755
--- a/tests/parallel-tests-log-override-1.test
+++ b/tests/parallel-tests-log-override-1.test
@@ -19,8 +19,6 @@
 parallel_tests=yes
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.in <<'END'
 AC_OUTPUT
 END
diff --git a/tests/parallel-tests-log-override-2.test 
b/tests/parallel-tests-log-override-2.test
index 649360c..b790c41 100755
--- a/tests/parallel-tests-log-override-2.test
+++ b/tests/parallel-tests-log-override-2.test
@@ -21,8 +21,6 @@
 parallel_tests=yes
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.in <<'END'
 AC_OUTPUT
 END
diff --git a/tests/parallel-tests-log-override-recheck.test 
b/tests/parallel-tests-log-override-recheck.test
index 8a50d29..0739cbe 100755
--- a/tests/parallel-tests-log-override-recheck.test
+++ b/tests/parallel-tests-log-override-recheck.test
@@ -20,8 +20,6 @@
 parallel_tests=yes
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.in <<'END'
 AC_OUTPUT
 END
diff --git a/tests/primary-prefix-couples-documented-valid.test 
b/tests/primary-prefix-couples-documented-valid.test
index 645f318..134c212 100755
--- a/tests/primary-prefix-couples-documented-valid.test
+++ b/tests/primary-prefix-couples-documented-valid.test
@@ -20,8 +20,6 @@
 
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.in <<'END'
 AC_PROG_CC
 AC_PROG_RANLIB
diff --git a/tests/primary-prefix-couples-force-valid.test 
b/tests/primary-prefix-couples-force-valid.test
index 315ee4e..b462a7d 100755
--- a/tests/primary-prefix-couples-force-valid.test
+++ b/tests/primary-prefix-couples-force-valid.test
@@ -26,8 +26,6 @@
 required=cc
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.in <<'END'
 AC_PROG_CC
 AC_PROG_RANLIB
diff --git a/tests/primary-prefix-invalid-couples.test 
b/tests/primary-prefix-invalid-couples.test
index 88e0817..4791707 100755
--- a/tests/primary-prefix-invalid-couples.test
+++ b/tests/primary-prefix-invalid-couples.test
@@ -22,8 +22,6 @@
 
 . ./defs || Exit 1
 
-set -e
-
 oIFS=$IFS # Saved for later.
 
 : > ltmain.sh
diff --git a/tests/primary-prefix-valid-couples.test 
b/tests/primary-prefix-valid-couples.test
index f326808..0d0a88c 100755
--- a/tests/primary-prefix-valid-couples.test
+++ b/tests/primary-prefix-valid-couples.test
@@ -19,8 +19,6 @@
 
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.in <<'END'
 AC_PROG_CC
 AC_PROG_RANLIB
diff --git a/tests/remake-subdir-from-subdir.test 
b/tests/remake-subdir-from-subdir.test
index f844550..8f4a180 100755
--- a/tests/remake-subdir-from-subdir.test
+++ b/tests/remake-subdir-from-subdir.test
@@ -21,8 +21,6 @@
 
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.in <<'END'
 m4_include([subdirs.m4])
 AC_SUBST([MAGIC], [magic])
diff --git a/tests/remake-subdir-gnu.test b/tests/remake-subdir-gnu.test
index 7865c20..bda1ac7 100755
--- a/tests/remake-subdir-gnu.test
+++ b/tests/remake-subdir-gnu.test
@@ -23,8 +23,6 @@
 required=GNUmake
 . ./defs || Exit 1
 
-set -e
-
 magic1='::MagicString::One::'
 magic2='__MagicString__Two__'
 
diff --git a/tests/remake-subdir-long-time.test 
b/tests/remake-subdir-long-time.test
index 18ba732..40f3e5f 100755
--- a/tests/remake-subdir-long-time.test
+++ b/tests/remake-subdir-long-time.test
@@ -23,8 +23,6 @@
 
 . ./defs || Exit 1
 
-set -e
-
 cat > configure.in <<END
 AC_INIT([$me], [1.0])
 AM_INIT_AUTOMAKE([foreign -Wall -Werror])
diff --git a/tests/remake-subdir.test b/tests/remake-subdir.test
index 3ccfee5..2df1e6f 100755
--- a/tests/remake-subdir.test
+++ b/tests/remake-subdir.test
@@ -21,8 +21,6 @@
 
 . ./defs || Exit 1
 
-set -e
-
 if using_gmake; then
   remake=$MAKE
 else
diff --git a/tests/remake-subdir2.test b/tests/remake-subdir2.test
index dcf306e..a8f7556 100755
--- a/tests/remake-subdir2.test
+++ b/tests/remake-subdir2.test
@@ -21,8 +21,6 @@
 
 . ./defs || Exit 1
 
-set -e
-
 magic1='::MagicString::One::'
 magic2='__MagicString__Two__'
 
diff --git a/tests/repeated-options.test b/tests/repeated-options.test
index 4667d0d..999c9e1 100755
--- a/tests/repeated-options.test
+++ b/tests/repeated-options.test
@@ -58,7 +58,7 @@ int main (void)
 }
 END
 
-cp $testsrcdir/../lib/compile .
+cp "$top_testsrcdir"/lib/compile .
 
 $ACLOCAL
 $AUTOMAKE --foreign --foreign -Wall 2>stderr || { cat stderr >&2; Exit 1; }
diff --git a/tests/self-check-exit.test b/tests/self-check-exit.test
index 04c27fd..69aabcd 100755
--- a/tests/self-check-exit.test
+++ b/tests/self-check-exit.test
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Sanity check for the automake testsuite.
-# Check that. in case of failing commands, the correct exit status is
+# Check that, in case of failing commands, the correct exit status is
 # passed to the exit trap installed by the `./defs' script.
 # Also check that the `errexit' shell flag is active.
 
diff --git a/tests/silent-configsite.test b/tests/silent-configsite.test
index a0255f5..a3348e9 100755
--- a/tests/silent-configsite.test
+++ b/tests/silent-configsite.test
@@ -20,8 +20,6 @@
 
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.in <<'EOF'
 AM_SILENT_RULES
 AC_OUTPUT
diff --git a/tests/suffix5.test b/tests/suffix5.test
index e9d733d..c0566a9 100755
--- a/tests/suffix5.test
+++ b/tests/suffix5.test
@@ -45,7 +45,7 @@ END
 
 : > ltmain.sh
 
-cp "$testsrcdir/../lib/config.guess" "$testsrcdir/../lib/config.sub" .
+cp "$top_testsrcdir"/lib/config.guess "$top_testsrcdir"/lib/config.sub .
 
 $ACLOCAL
 $AUTOMAKE
diff --git a/tests/tests-environment-backcompat.test 
b/tests/tests-environment-backcompat.test
index 6749bc2..9578ca5 100755
--- a/tests/tests-environment-backcompat.test
+++ b/tests/tests-environment-backcompat.test
@@ -22,8 +22,6 @@
 parallel_tests=no
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.in <<END
 AC_SUBST([PERL], ['$PERL'])
 AC_OUTPUT
@@ -47,10 +45,6 @@ $x = 0;
 exit ($x);
 END
 
-cat > baz.pl << 'END'
-exit (1);
-END
-
 chmod a+x *.pl
 
 $ACLOCAL
diff --git a/tests/vtexi3.test b/tests/vtexi3.test
index 04fb7d7..da0278b 100755
--- a/tests/vtexi3.test
+++ b/tests/vtexi3.test
@@ -65,7 +65,7 @@ END
 
 # Required when using Texinfo.
 : > texinfo.tex
-cp "$testsrcdir/../lib/mdate-sh" .
+cp "$top_testsrcdir"/lib/mdate-sh .
 
 $ACLOCAL
 $AUTOCONF


hooks/post-receive
-- 
GNU Automake