On 07/26/2012 02:04 PM, Stefano Lattarini wrote:
> Because the POSIX standards mandate that sourcing a file with ". FILE"
> will cause FILE (assuming it is a relative containing no slashes) to be
> looked for in PATH, such a move will allow us to simplify our sourcing
> of shell testing libraries like (currently) 't/ax/test-init.sh' and
> 'defs', and to modularize and re-organize them better in the feature,
> with minimal churn.
>
> * runtest.in, Makefile.am (AM_TEST_ENVIRONMENT): Prepend $(abs_srcdir)/t/ax
> and $(abs_builddir)/t/ax (in that order) to PATH; do so avoiding repetition
> in the common case of non-VPATH builds.
>
> Signed-off-by: Stefano Lattarini <[email protected]>
> ---
> Makefile.am | 10 ++++++++++
> runtest.in | 12 ++++++++++++
> 2 files changed, 22 insertions(+)
>
> diff --git a/Makefile.am b/Makefile.am
> index 6b6e938..1636623 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -350,6 +350,16 @@ AM_TESTS_ENVIRONMENT = \
> AM_TESTS_FD_REDIRECT = 9>&2
> AM_TESTS_ENVIRONMENT += stderr_fileno_=9; export stderr_fileno_;
>
> +# For sourcing of extra "shell libraries" by our test scripts. As per
> +# POSIX, sourcing a file with '.' will cause it to be looked up in $PATH
> +# in case it is given with a relative name containing no slashes.
> +AM_TESTS_ENVIRONMENT += \
> + if test "$srcdir" != .; then \
>
Oops, typo here. Consider this hunk squashed in:
diff --git a/Makefile.am b/Makefile.am
index 1636623..ecd0baa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -354,7 +354,7 @@ AM_TESTS_ENVIRONMENT += stderr_fileno_=9; export
stderr_fileno_;
# POSIX, sourcing a file with '.' will cause it to be looked up in $PATH
# in case it is given with a relative name containing no slashes.
AM_TESTS_ENVIRONMENT += \
- if test "$srcdir" != .; then \
+ if test $(srcdir) != .; then \
PATH='$(abs_srcdir)/t/ax'$(PATH_SEPARATOR)$$PATH; \
fi; \
PATH='$(abs_builddir)/t/ax'$(PATH_SEPARATOR)$$PATH; \
> + PATH='$(abs_srcdir)/t/ax'$(PATH_SEPARATOR)$$PATH; \
> + fi; \
> + PATH='$(abs_builddir)/t/ax'$(PATH_SEPARATOR)$$PATH; \
> + export PATH;
> +
> # Hand-written tests.
>
Thanks,
Stefano
