diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-02-17 15:20:03 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-02-17 15:33:48 +0100 |
| commit | a98e58ffff35f13a61359f3c0aa214ebc6d15922 (patch) | |
| tree | b50c776529490f3db71258d0bc598a7742818c6d /configure.ac | |
| parent | 44737ebc42660ec28f8555607ae51d2d355e927a (diff) | |
| download | automake-a98e58ffff35f13a61359f3c0aa214ebc6d15922.tar.gz | |
tests: fix many spurious failures in VPATH builds
The 'is' helper script, used by some test cases since commit
'v1.11-1830-g96401cb' of 08-02-2012, "tests: better way to compare
lists in Makefile rules", is not available in VPATH builds, since
it resides in $(srcdir), nor in $(builddir), and only $(builddir)
is added to $PATH in the test script. This was causing spurious
failures.
Solve this issue by re-organizing a bit the layout and placing of
wrapper and help scripts used by the testsuite. This reorganization
is by no mean complete, but should be enough to solve the VPATH
issues.
* tests/is: Moved ...
* tests/ax/is: ... here
* tests/automake.in: Moved ...
* tests/wrap/automake.in: ... here.
* tests/aclocal.in: Moved ...
* tests/wrap/aclocal.in: ... here.
* tests/defs-static.in ($am_bindir, $PATH): Adjust.
* configure.ac (AC_CONFIG_FILES): Likewise.
* tests/Makefile.am (EXTRA_DIST, check_SCRIPTS): Likewise.
* tests/get-sysconf.test: Likewise.
* .gitignore: Likewise.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 775c36d51..856b80a55 100644 --- a/configure.ac +++ b/configure.ac @@ -342,11 +342,12 @@ AC_CONFIG_FILES([ ]) AC_CONFIG_LINKS([GNUmakefile:GNUmakefile]) AC_CONFIG_LINKS([tests/defs:tests/defs]) -AC_CONFIG_FILES([tests/aclocal-${APIVERSION}:tests/aclocal.in], - [chmod +x tests/aclocal-${APIVERSION}], +AC_CONFIG_FILES([tests/wrap/aclocal-${APIVERSION}:tests/wrap/aclocal.in], + [chmod +x tests/wrap/aclocal-${APIVERSION}], + [APIVERSION=$APIVERSION]) +AC_CONFIG_FILES([tests/wrap/automake-${APIVERSION}:tests/wrap/automake.in], + [chmod +x tests/wrap/automake-${APIVERSION}], [APIVERSION=$APIVERSION]) -AC_CONFIG_FILES([tests/automake-${APIVERSION}:tests/automake.in], - [chmod +x tests/automake-${APIVERSION}]) AC_OUTPUT |