From afbdd9f0ab00626719dff96021e12761df106ffe Mon Sep 17 00:00:00 2001 From: Thomas D Date: Sat, 14 Feb 2015 14:23:25 +0100 Subject: [PATCH] Make parallel test harness work with automake-1.11 --- configure.ac | 2 +- modules/remotebackend/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index cde58a67d7..7de39f7d24 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([build-aux]) -AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-ustar -Wno-portability subdir-objects 1.11]) +AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-ustar -Wno-portability subdir-objects parallel-tests 1.11]) AM_SILENT_RULES([yes]) AC_CANONICAL_HOST diff --git a/modules/remotebackend/Makefile.am b/modules/remotebackend/Makefile.am index 4aa0a548bb..34f0468471 100644 --- a/modules/remotebackend/Makefile.am +++ b/modules/remotebackend/Makefile.am @@ -53,7 +53,7 @@ libremotebackend_la_LIBADD += $(LIBZMQ_LIBS) endif if UNIT_TESTS -AM_TESTS_ENVIRONMENT = \ +TESTS_ENVIRONMENT = \ BOOST_TEST_LOG_LEVEL=message; \ export BOOST_TEST_LOG_LEVEL; \ REMOTEBACKEND_ZEROMQ=$(REMOTEBACKEND_ZEROMQ); \ -- 2.47.2