coreutils
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: perl tests not using correct $PATH


From: Jim Meyering
Subject: Re: perl tests not using correct $PATH
Date: Fri, 14 Sep 2012 19:40:15 +0200

[Stefano, FYI, I have to revert the change of yours
that made coreutils switch to using AM_TESTS_ENVIRONMENT. ]

Jim Meyering wrote:
...
> That's the error.
> 1.11.3 is inadequate, since we're using AM_TESTS_ENVIRONMENT,
> and 1.11.3 has this code in am/check.am:
>
>   $ grep -C3 'TESTS_ENV.*)$' /usr/share/automake-1.11/am/check.am
>   elif test -f "$$f"; then dir=;                          \
>   else dir="$(srcdir)/"; fi;                              \
>   tst=$$dir$$f; log='$@'; __SAVED_TERM=$$TERM;            \
>   $(TESTS_ENVIRONMENT)
>
>   # To be appended to the command running the test.  Handle the stdout
>   # and stderr redirection, and catch the exit status.
>
> AFAICS, AM_TESTS_ENVIRONMENT is not supported on the 1.11 branch at all,
> so its use would require 1.12 or newer.
>
> Hence, this fix should solve it:
>
> diff --git a/tests/local.mk b/tests/local.mk
> index 41a214f..0b6d576 100644
> --- a/tests/local.mk
> +++ b/tests/local.mk
> @@ -52,7 +52,7 @@ TEST_SUITE_LOG = tests/test-suite.log
>  # variables that can perturb tests are unset or set to expected values.
>  # The rest are envvar settings that propagate build-related Makefile
>  # variables to test scripts.
> -AM_TESTS_ENVIRONMENT =                               \
> +TESTS_ENVIRONMENT =                          \
>    . $(srcdir)/tests/lang-default;            \
>    tmp__=$${TMPDIR-/tmp};                     \
>    test -d "$$tmp__" && test -w "$$tmp__" || tmp__=.; \

I expect to apply this:

>From 5e05dfa1456e023118de2e381d7390e7b4318003 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 14 Sep 2012 19:38:33 +0200
Subject: [PATCH] build: do not rely on automake's AM_TESTS_ENVIRONMENT

* tests/local.mk (TESTS_ENVIRONMENT): Rename from AM_TESTS_ENVIRONMENT,
since it is not honored in automake-1.11.3 after all.
This reverts commit v8.19-38-g34c9c8f.  For now, I'll leave
the following commit that made bootstrap.conf require 1.11.2.
---
 tests/local.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/local.mk b/tests/local.mk
index 2440667..55700b5 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -52,7 +52,7 @@ TEST_SUITE_LOG = tests/test-suite.log
 # variables that can perturb tests are unset or set to expected values.
 # The rest are envvar settings that propagate build-related Makefile
 # variables to test scripts.
-AM_TESTS_ENVIRONMENT =                         \
+TESTS_ENVIRONMENT =                            \
   . $(srcdir)/tests/lang-default;              \
   tmp__=$${TMPDIR-/tmp};                       \
   test -d "$$tmp__" && test -w "$$tmp__" || tmp__=.;   \
--
1.7.12.363.g53284de



reply via email to

[Prev in Thread] Current Thread [Next in Thread]