summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am2
-rw-r--r--tests/check.mk8
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