From 33aeb3b5c216bca5464d4ab5c1c6e6422b205940 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sat, 3 May 2014 22:39:09 -0400 Subject: [PATCH] Use Automake parallel test harness MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Requires Automake ≥ 1.11. Fixes ‘make check’ on Automake ≥ 1.13, which always enables the parallel test harness, which does not support this usage of TESTS_ENVIRONMENT. Signed-off-by: Anders Kaseorg --- configure.ac | 2 +- src/lib/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 768f64f..bdbff90 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.65]) AC_INIT([hesiod], [3.2.1], [hesiod@mit.edu]) -AM_INIT_AUTOMAKE([-Wall]) +AM_INIT_AUTOMAKE([1.11.0 parallel-tests -Wall]) AM_MAINTAINER_MODE([enable]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index d092565..fbcfaac 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -15,7 +15,7 @@ noinst_PROGRAMS = hestest hestest_SOURCES = hestest.c hestest_LDADD = libhesiod.la -TESTS_ENVIRONMENT = ./hestest +LOG_COMPILER = ./hestest TESTS = hestest.conf EXTRA_DIST = hesiod.conf.sample hestest.conf