diff options
| author | Mathieu Lirzin <mthl@gnu.org> | 2020-02-04 15:28:00 +0100 |
|---|---|---|
| committer | Mathieu Lirzin <mthl@gnu.org> | 2020-02-10 10:10:34 +0100 |
| commit | f19ecc089b017d0f0cde1e960fb1a6a407005164 (patch) | |
| tree | a8845a59924ebdef2487169c546c5f4e7ef61ba2 | |
| parent | 6207236f9bf29dc84b892e482439591b5cf9603b (diff) | |
| download | automake-f19ecc089b017d0f0cde1e960fb1a6a407005164.tar.gz | |
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.
| -rw-r--r-- | t/local.mk | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/t/local.mk b/t/local.mk index 7e3a61965..bd1615e3c 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 |