summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2012-11-07 17:59:40 +0100
committerStefano Lattarini <stefano.lattarini@gmail.com>2012-11-07 17:59:40 +0100
commitbd0d41d77f0d8a24bb8e6aac3bf580cbe741f88e (patch)
tree1bfbbb88cf019e6c287deb1e44d7327a8d3827be
parent622358354392072ce81e50ec52377d3bdbf93f22 (diff)
downloadautomake-bd0d41d77f0d8a24bb8e6aac3bf580cbe741f88e.tar.gz
tests: new variable $am_testaux_builddir
And a related fix that solves a spurious testsuite failures in VPATH builds. * t/ax/test-defs.in ($am_testaux_builddir): New, counterpart of $am_testaux_srcdir, but pointing inside the build directory. * t/self-check-shell-no-trail-bslash.sh: Use $am_testaux_builddir, not $am_testaux_srcdir, when fetching the 'shell-no-trail-bslash' script. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
-rw-r--r--t/ax/test-defs.in1
-rwxr-xr-xt/self-check-shell-no-trail-bslash.sh2
2 files changed, 2 insertions, 1 deletions
diff --git a/t/ax/test-defs.in b/t/ax/test-defs.in
index a983183e8..ef3176642 100644
--- a/t/ax/test-defs.in
+++ b/t/ax/test-defs.in
@@ -39,6 +39,7 @@ am_top_builddir='@abs_builddir@'
# Where testsuite-related helper scripts, data files and shell libraries
# are placed.
am_testaux_srcdir=$am_top_srcdir/t/ax
+am_testaux_builddir=$am_top_builddir/t/ax
# Support for the "installcheck" target.
case ${am_running_installcheck:=no} in
diff --git a/t/self-check-shell-no-trail-bslash.sh b/t/self-check-shell-no-trail-bslash.sh
index fed4e6fee..cf9c3a6ff 100755
--- a/t/self-check-shell-no-trail-bslash.sh
+++ b/t/self-check-shell-no-trail-bslash.sh
@@ -33,7 +33,7 @@ bad:
@echo $(am__backslash)
END
-SHELL=$am_testaux_srcdir/shell-no-trail-bslash
+SHELL=$am_testaux_builddir/shell-no-trail-bslash
$SHELL -c 'exit 0'
test "$($SHELL -c 'echo is o\k')" = "is ok"