diff options
| author | Jim Meyering <meyering@redhat.com> | 2009-08-15 12:02:34 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2009-08-15 18:08:26 +0200 |
| commit | b0b3f0e0e971aff3b233fc9a529fbb333b62a01c (patch) | |
| tree | 123bc628a1c56d994dab3dc83a5cb341d476113b /testsuite | |
| parent | 38805ea2e6a4cb1f4334428b90cb2cf22077bec8 (diff) | |
| download | idutils-b0b3f0e0e971aff3b233fc9a529fbb333b62a01c.tar.gz idutils-b0b3f0e0e971aff3b233fc9a529fbb333b62a01c.tar.bz2 idutils-b0b3f0e0e971aff3b233fc9a529fbb333b62a01c.zip | |
build: avoid "make distcheck" failure and distracting diagnostics
* testsuite/check.mk (built_programs): Rewrite so that it works.
(TESTS_ENVIRONMENT): Use $$f, not $$tst. The latter included a
$(srcdir)/ prefix that was fatal in the non-srcdir build case.
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/check.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/testsuite/check.mk b/testsuite/check.mk index baa68b3..a03405e 100644 --- a/testsuite/check.mk +++ b/testsuite/check.mk @@ -14,9 +14,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. - built_programs = \ - (cd $(top_builddir)/src && MAKEFLAGS= $(MAKE) -s built_programs.list) + echo 'spy:;@echo $$(all_programs)' \ + | MAKEFLAGS= $(MAKE) -s -C $(top_builddir)/src -f Makefile -f - spy # Note that the first lines are statements. They ensure that environment # variables that can perturb tests are unset or set to expected values. @@ -31,9 +31,9 @@ TESTS_ENVIRONMENT = \ if $(PERL) -e 'use warnings' > /dev/null 2>&1; then \ grep '^\#!/usr/bin/perl -T' "$$1" > /dev/null && T_=T || T_=; \ $(PERL) -w$$T_ -I$(srcdir) -MCoreutils \ - -M"CuTmpdir qw($$tst)" -- "$$1"; \ + -M"CuTmpdir qw($$f)" -- "$$1"; \ else \ - echo 1>&2 "$$tst: configure did not find a usable version of Perl," \ + echo 1>&2 "$$f: configure did not find a usable version of Perl," \ "so skipping this test"; \ (exit 77); \ fi; \ @@ -53,7 +53,7 @@ TESTS_ENVIRONMENT = \ srcdir='$(srcdir)' \ top_srcdir='$(top_srcdir)' \ CONFIG_HEADER='$(abs_top_builddir)/lib/config.h' \ - CU_TEST_NAME=`basename '$(abs_srcdir)'`,$$tst \ + CU_TEST_NAME=`basename '$(abs_srcdir)'`,$$f \ AWK='$(AWK)' \ EGREP='$(EGREP)' \ EXEEXT='$(EXEEXT)' \ |