diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2009-03-14 12:15:40 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2009-03-31 20:29:01 +0200 |
| commit | f8268d3baecee552e13efb916693bfa51734862b (patch) | |
| tree | dda3f095374e8affd7ba90e767a2f1c4b09ce5c1 /tests | |
| parent | 7a21310eb3b8135546d0ded83f301f657cd757ae (diff) | |
| download | coreutils-f8268d3baecee552e13efb916693bfa51734862b.tar.xz | |
build: use Automake's new parallel-tests feature
* build-aux/check.mk: Remove, not needed any more.
* tests/Makefile.am (AUTOMAKE_OPTIONS): Add parallel-tests and
color-tests.
* tests/check.mk: Do not include build-aux/check.mk any more.
(SUFFIXES, TEST_LOGS): Remove.
(TESTS_ENVIRONMENT): Use $$f rather than $$tst in $PERL invocation.
* gnulib-tests/Makefile.am: Do not include build-aux/check.mk.
(AUTOMAKE_OPTIONS): New macro, add parallel-test and color-tests.
(TEST_LOGS): Remove.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/check.mk | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 6356eaab6..54b07ba5f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -587,5 +587,5 @@ pr_data = \ pr/ttb3-FF \ pr/w72l24f-ll -AUTOMAKE_OPTIONS = +AUTOMAKE_OPTIONS = parallel-tests color-tests include $(srcdir)/check.mk diff --git a/tests/check.mk b/tests/check.mk index db5f90093..a000eaabd 100644 --- a/tests/check.mk +++ b/tests/check.mk @@ -58,7 +58,7 @@ 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," \ "so skipping this test"; \ @@ -94,10 +94,4 @@ TESTS_ENVIRONMENT = \ PATH='$(abs_top_builddir)/src$(PATH_SEPARATOR)'"$$PATH" \ ; shell_or_perl_ -TEST_LOGS = $(TESTS:=.log) - -# Parallel replacement of Automake's check-TESTS target. -SUFFIXES = -include $(top_srcdir)/build-aux/check.mk - VERBOSE = yes |