[automake-commit] branch master updated: build: fix 'installcheck' target

[Mathieu Lirzin]

This is an automated email from the git hooks/post-receive script.

mthl pushed a commit to branch master
in repository automake.

View the commit online:
https://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=f19ecc089b017d0f0cde1e960fb1a6a407005164

The following commit(s) were added to refs/heads/master by this push:
     new f19ecc0  build: fix 'installcheck' target
f19ecc0 is described below

commit f19ecc089b017d0f0cde1e960fb1a6a407005164
Author: Mathieu Lirzin <address@hidden>
AuthorDate: Tue Feb 4 15:28:00 2020 +0100

    build: fix 'installcheck' target
    
    * t/local.mk (installcheck-testsuite): Do not use 'pre-inst-env' script.
    (AM_TESTS_ENVIRONMENT): Ensure that installed perl modules are found.
---
 t/local.mk | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/t/local.mk b/t/local.mk
index 7e3a619..bd1615e 100644
--- a/t/local.mk
+++ b/t/local.mk
@@ -244,12 +244,22 @@ check-parallel:
 test_subdirs = %D% %D%/pm contrib/%D%
 include %D%/CheckListOfTests.am
 
-# Run the testsuite with the installed aclocal and automake.
+# Run the testsuite with the installed aclocal and automake without using
+# the 'pre-inst-env' wrapper script.
 installcheck-local: installcheck-testsuite
 installcheck-testsuite:
        $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \
+         LOG_COMPILER=$(AM_TEST_RUNNER_SHELL) \
+         PL_LOG_COMPILER=$(PERL) \
          am_running_installcheck=yes
 
+# Ensure that the installed Automake perl modules are found when running 
'installcheck' target
+AM_TESTS_ENVIRONMENT += \
+  if test "$${am_running_installcheck}" = yes; then \
+    
PERL5LIB="$(DESTDIR)$(pkgvdatadir)/$${PERL5LIB:+$(PATH_SEPARATOR)}$$PERL5LIB"; \
+  fi; \
+  export PERL5LIB;
+
 # Performance tests.
 .PHONY: perf
 perf: all