Start using parallel-tests

But not in doc/, doesn't seem to work.

Still use our icky wrappers for now.

73 files changed, 144 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index dac4beb11..2d8c179e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@ man-*
 .keep
 *.epicfail
 *.tmp
+*.log
 paludis-*.*.*.tar.bz2
 
 !/paludis/repositories/e/ebuild/utils/dolib.a
diff --git a/Makefile.am b/Makefile.am
index ca518e2d3..dff26179d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ CLEANFILES = *~ done-check gmon.out *.gcov *.gcno  *.gcda *.loT \
 	automake-deps-dist-hack.tmp automake-deps-built-hack.tmp *.epicfail
 MAINTAINERCLEANFILES = Makefile.in configure config/* aclocal.m4 \
 			config.h config.h.in INSTALL
-AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip std-options foreign
+AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip foreign parallel-tests
 EXTRA_DIST = autogen.bash automake-deps-dist-hack.tmp
 SUBDIRS = . misc test paludis python ruby src doc hooks vim bash-completion zsh-completion pkg-config
 
diff --git a/autogen.bash b/autogen.bash
index 6303f1728..ba38e688d 100755
--- a/autogen.bash
+++ b/autogen.bash
@@ -38,8 +38,8 @@ misc/do_m4.bash hooks/Makefile.am || exit $?
 run mkdir -p config
 run $(get libtoolize 1.5 ) --copy --force --automake
 rm -f config.cache
-run $(get aclocal 1.11 1.10 1.9 )
+run $(get aclocal 1.11 )
 run $(get autoheader 2.61 2.60 2.59 )
 run $(get autoconf 2.61 2.60 2.59 )
-run $(get automake 1.11 1.10 1.9 ) -a --copy
+run $(get automake 1.11 ) -a --copy
 
diff --git a/bash-completion/Makefile.am b/bash-completion/Makefile.am
index 2609b9056..fac468a01 100644
--- a/bash-completion/Makefile.am
+++ b/bash-completion/Makefile.am
@@ -5,6 +5,8 @@ noinst_DATA = paludis adjutrix \
 	      importare
 EXTRA_DIST = $(noinst_DATA)
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 built-sources : $(BUILT_SOURCES)
 	for s in $(SUBDIRS) ; do $(MAKE) -C $$s built-sources || exit 1 ; done
 
diff --git a/hooks/Makefile.am.m4 b/hooks/Makefile.am.m4
index 23009a2b9..708241316 100644
--- a/hooks/Makefile.am.m4
+++ b/hooks/Makefile.am.m4
@@ -7,6 +7,8 @@ MAINTAINERCLEANFILES = Makefile.in Makefile.am
 CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT .keep *.epicfail
 SUBDIRS = . demos
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 installvarlibpaludisnewsdir = $(localstatedir)/gentoo/news
 
 installhookcommonprogdir = $(libexecdir)/paludis/hooks/common
diff --git a/hooks/demos/Makefile.am b/hooks/demos/Makefile.am
index 8a12170ff..ead375dac 100644
--- a/hooks/demos/Makefile.am
+++ b/hooks/demos/Makefile.am
@@ -6,6 +6,8 @@ DEMOS = \
 	new_packages.bash \
 	pretend_resume.hook
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 EXTRA_DIST = \
 	report.bash.in \
 	elog.bash.in \
diff --git a/misc/Makefile.am b/misc/Makefile.am
index 1fcf2c2c5..eb9ca9254 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -2,6 +2,8 @@ CLEANFILES = *~ *.epicfail
 MAINTAINERCLEANFILES = Makefile.in
 EXTRA_DIST = generated-file.txt do_m4.bash make_se.bash make_nn.bash
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 built-sources : $(BUILT_SOURCES)
 	for s in $(SUBDIRS) ; do $(MAKE) -C $$s built-sources || exit 1 ; done
 
diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4
index 2095d7852..85c0f7d01 100644
--- a/paludis/Makefile.am.m4
+++ b/paludis/Makefile.am.m4
@@ -83,6 +83,8 @@ EXTRA_DIST = about.hh.in Makefile.am.m4 paludis.hh.m4 files.m4 \
 SUBDIRS = distributions fetchers syncers util selinux repositories environments . args resolver
 BUILT_SOURCES = srcleanlist secleanlist
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 libpaludis_@PALUDIS_PC_SLOT@_la_SOURCES = filelist
 libpaludis_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0 $(PTHREAD_LIBS)
 
diff --git a/paludis/args/Makefile.am b/paludis/args/Makefile.am
index 9a3b00865..19792366a 100644
--- a/paludis/args/Makefile.am
+++ b/paludis/args/Makefile.am
@@ -5,6 +5,8 @@ AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
 EXTRA_DIST = args_handler-se.hh args_handler-se.cc args_handler.se
 BUILT_SOURCES = args_handler-se.hh args_handler-se.cc
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 TESTS = \
 	args_TEST
 
diff --git a/paludis/distributions/Makefile.am b/paludis/distributions/Makefile.am
index 0298a319f..3508d2d3f 100644
--- a/paludis/distributions/Makefile.am
+++ b/paludis/distributions/Makefile.am
@@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT .keep *.epicfail
 SUBDIRS = . exherbo gentoo
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 distributions = \
 	exherbo.conf \
 	gentoo.conf
diff --git a/paludis/distributions/exherbo/Makefile.am b/paludis/distributions/exherbo/Makefile.am
index 7e79e26da..113afe120 100644
--- a/paludis/distributions/exherbo/Makefile.am
+++ b/paludis/distributions/exherbo/Makefile.am
@@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT .keep *.epicfail
 SUBDIRS =
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 distributiondir = $(datadir)/paludis/distributions/exherbo/
 
 distribution_DATA = e.conf gems.conf paludis.conf repository_blacklist.conf
diff --git a/paludis/distributions/gentoo/Makefile.am b/paludis/distributions/gentoo/Makefile.am
index 59bf293b1..4b253f98c 100644
--- a/paludis/distributions/gentoo/Makefile.am
+++ b/paludis/distributions/gentoo/Makefile.am
@@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT .keep *.epicfail
 SUBDIRS =
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 distributiondir = $(datadir)/paludis/distributions/gentoo/
 
 distribution_DATA = e.conf gems.conf paludis.conf repository_blacklist.conf
diff --git a/paludis/environments/Makefile.am b/paludis/environments/Makefile.am
index b75e3807c..98fb71fd9 100644
--- a/paludis/environments/Makefile.am
+++ b/paludis/environments/Makefile.am
@@ -1,6 +1,8 @@
 SUBDIRS = . $(BUILD_ENVIRONMENTS)
 DIST_SUBDIRS = $(ALL_ENVIRONMENTS)
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT *.epicfail
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/paludis/environments/no_config/Makefile.am b/paludis/environments/no_config/Makefile.am
index dea1f637e..3ef54867c 100644
--- a/paludis/environments/no_config/Makefile.am
+++ b/paludis/environments/no_config/Makefile.am
@@ -8,6 +8,8 @@ DEFS= \
 	-DDATADIR=\"$(datadir)\" \
 	-DLIBDIR=\"$(libdir)\"
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 libpaludisnoconfigenvironment_la_SOURCES = \
 	no_config_environment.cc no_config_environment.hh \
 	registration.cc
diff --git a/paludis/environments/paludis/Makefile.am b/paludis/environments/paludis/Makefile.am
index 2d3ae9b18..274bbb365 100644
--- a/paludis/environments/paludis/Makefile.am
+++ b/paludis/environments/paludis/Makefile.am
@@ -10,6 +10,8 @@ DEFS= \
 	-DLIBDIR=\"$(libdir)\" \
 	-DSHAREDIR=\"$(datarootdir)\"
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 libpaludispaludisenvironment_la_SOURCES = \
 	action_to_string.cc    action_to_string.hh \
 	bashable_conf.cc       bashable_conf.hh \
diff --git a/paludis/environments/paludis/output_managers/Makefile.am b/paludis/environments/paludis/output_managers/Makefile.am
index b8f0d4084..fa920bde9 100644
--- a/paludis/environments/paludis/output_managers/Makefile.am
+++ b/paludis/environments/paludis/output_managers/Makefile.am
@@ -9,6 +9,8 @@ DEFS= \
 	-DDATADIR=\"$(datadir)\" \
 	-DLIBDIR=\"$(libdir)\"
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 shareenvpaludisdir = $(datarootdir)/paludis/environments/paludis/output_managers
 
 dist_shareenvpaludis_DATA = \
diff --git a/paludis/environments/portage/Makefile.am b/paludis/environments/portage/Makefile.am
index 368f9976b..b417333df 100644
--- a/paludis/environments/portage/Makefile.am
+++ b/paludis/environments/portage/Makefile.am
@@ -9,6 +9,8 @@ DEFS= \
 	-DDATADIR=\"$(datadir)\" \
 	-DLIBDIR=\"$(libdir)\"
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 libpaludisportageenvironment_la_SOURCES = \
 	registration.cc \
 	portage_environment.cc portage_environment.hh
diff --git a/paludis/environments/test/Makefile.am b/paludis/environments/test/Makefile.am
index f638849af..a72ae49a1 100644
--- a/paludis/environments/test/Makefile.am
+++ b/paludis/environments/test/Makefile.am
@@ -7,6 +7,8 @@ DEFS= \
 	-DDATADIR=\"$(datadir)\" \
 	-DLIBDIR=\"$(libdir)\"
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 libpaludistestenvironment_la_SOURCES = \
 	test_environment.cc test_environment.hh \
 	registration.cc
diff --git a/paludis/fetchers/Makefile.am b/paludis/fetchers/Makefile.am
index 7d27ce254..ac40e83b6 100644
--- a/paludis/fetchers/Makefile.am
+++ b/paludis/fetchers/Makefile.am
@@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES = *~ dohttp dohttps doftp .keep *.epicfail
 SUBDIRS = . demos
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 .keep :
 	touch $@
 
diff --git a/paludis/fetchers/demos/Makefile.am b/paludis/fetchers/demos/Makefile.am
index dc9095499..9415207a9 100644
--- a/paludis/fetchers/demos/Makefile.am
+++ b/paludis/fetchers/demos/Makefile.am
@@ -3,6 +3,8 @@ SUBDIRS = .
 DEMOS = \
 	docurl
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT *.o *.so *.epicfail
 
diff --git a/paludis/repositories/Makefile.am b/paludis/repositories/Makefile.am
index bb2db52bb..6393e4549 100644
--- a/paludis/repositories/Makefile.am
+++ b/paludis/repositories/Makefile.am
@@ -10,6 +10,8 @@ endif
 
 DIST_SUBDIRS = $(ALL_REPOSITORIES)
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT *.epicfail
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/paludis/repositories/accounts/Makefile.am b/paludis/repositories/accounts/Makefile.am
index f690604d2..e8e35832a 100644
--- a/paludis/repositories/accounts/Makefile.am
+++ b/paludis/repositories/accounts/Makefile.am
@@ -4,6 +4,8 @@ DISTCLEANFILES =
 
 MAINTAINERCLEANFILES = Makefile.in
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 AM_CXXFLAGS = -I$(top_srcdir) -I$(top_builddir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
 DEFS= \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
diff --git a/paludis/repositories/cran/Makefile.am b/paludis/repositories/cran/Makefile.am
index e48eab9fb..6ca9eb23d 100644
--- a/paludis/repositories/cran/Makefile.am
+++ b/paludis/repositories/cran/Makefile.am
@@ -2,6 +2,8 @@ SUBDIRS = cran .
 CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT *.epicfail
 MAINTAINERCLEANFILES = Makefile.in
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
 DEFS= \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
diff --git a/paludis/repositories/cran/cran/Makefile.am b/paludis/repositories/cran/cran/Makefile.am
index 735df7b86..442a71bcb 100644
--- a/paludis/repositories/cran/cran/Makefile.am
+++ b/paludis/repositories/cran/cran/Makefile.am
@@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES = *~ *.epicfail
 SUBDIRS = .
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 libexecprogdir = $(libexecdir)/paludis/
 
 libexecprog_SCRIPTS = \
diff --git a/paludis/repositories/e/Makefile.am b/paludis/repositories/e/Makefile.am
index d19ae69f7..0a6cfea5d 100644
--- a/paludis/repositories/e/Makefile.am
+++ b/paludis/repositories/e/Makefile.am
@@ -7,6 +7,8 @@ DISTCLEANFILES = \
 
 MAINTAINERCLEANFILES = Makefile.in
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 AM_CXXFLAGS = -I$(top_srcdir) -I$(top_builddir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
 DEFS= \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
diff --git a/paludis/repositories/e/eapis/Makefile.am b/paludis/repositories/e/eapis/Makefile.am
index 90e9c66fa..9c13b3935 100644
--- a/paludis/repositories/e/eapis/Makefile.am
+++ b/paludis/repositories/e/eapis/Makefile.am
@@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT .keep *.epicfail
 SUBDIRS =
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 eapis = \
 	0.conf \
 	1.conf \
diff --git a/paludis/repositories/e/ebuild/0/Makefile.am b/paludis/repositories/e/ebuild/0/Makefile.am
index 84d783bd6..8eb843d47 100644
--- a/paludis/repositories/e/ebuild/0/Makefile.am
+++ b/paludis/repositories/e/ebuild/0/Makefile.am
@@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES = *~ *.epicfail
 SUBDIRS = .
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 libexecprog0dir = $(libexecdir)/paludis/0/
 
 libexecprog0_SCRIPTS = \
diff --git a/paludis/repositories/e/ebuild/1/Makefile.am b/paludis/repositories/e/ebuild/1/Makefile.am
index 45155fa17..a6a314201 100644
--- a/paludis/repositories/e/ebuild/1/Makefile.am
+++ b/paludis/repositories/e/ebuild/1/Makefile.am
@@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES = *~ *.epicfail
 SUBDIRS = .
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 libexecprog1dir = $(libexecdir)/paludis/1
 
 libexecprog1_SCRIPTS = \
diff --git a/paludis/repositories/e/ebuild/2/Makefile.am b/paludis/repositories/e/ebuild/2/Makefile.am
index 5d6ccb623..e020a1d60 100644
--- a/paludis/repositories/e/ebuild/2/Makefile.am
+++ b/paludis/repositories/e/ebuild/2/Makefile.am
@@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES = *~ *.epicfail
 SUBDIRS = .
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 libexecprog2dir = $(libexecdir)/paludis/2
 
 libexecprog2_SCRIPTS = \
diff --git a/paludis/repositories/e/ebuild/3/Makefile.am b/paludis/repositories/e/ebuild/3/Makefile.am
index 01dce3d95..82e475d0f 100644
--- a/paludis/repositories/e/ebuild/3/Makefile.am
+++ b/paludis/repositories/e/ebuild/3/Makefile.am
@@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES = *~ *.epicfail
 SUBDIRS = .
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 libexecprog3dir = $(libexecdir)/paludis/3
 
 libexecprog3_SCRIPTS = \
diff --git a/paludis/repositories/e/ebuild/Makefile.am b/paludis/repositories/e/ebuild/Makefile.am
index 3ec2610dc..d9291a6a2 100644
--- a/paludis/repositories/e/ebuild/Makefile.am
+++ b/paludis/repositories/e/ebuild/Makefile.am
@@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES = *~ *.epicfail
 SUBDIRS = . 0 1 2 3 exheres-0 kdebuild-1 paludis-1 pbin-1 utils
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
 
 libexecprogdir = $(libexecdir)/paludis/
diff --git a/paludis/repositories/e/ebuild/exheres-0/Makefile.am b/paludis/repositories/e/ebuild/exheres-0/Makefile.am
index 57f90db26..53d48f6f6 100644
--- a/paludis/repositories/e/ebuild/exheres-0/Makefile.am
+++ b/paludis/repositories/e/ebuild/exheres-0/Makefile.am
@@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES = *~ *.epicfail
 SUBDIRS = .
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 libexecprogexheresdir = $(libexecdir)/paludis/exheres-0
 
 libexecprogexheres_SCRIPTS = \
diff --git a/paludis/repositories/e/ebuild/kdebuild-1/Makefile.am b/paludis/repositories/e/ebuild/kdebuild-1/Makefile.am
index 0df828d5d..73d3c2c91 100644
--- a/paludis/repositories/e/ebuild/kdebuild-1/Makefile.am
+++ b/paludis/repositories/e/ebuild/kdebuild-1/Makefile.am
@@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES = *~ *.epicfail
 SUBDIRS = .
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 libexecprogkdebuild1dir = $(libexecdir)/paludis/kdebuild-1
 
 libexecprogkdebuild1_SCRIPTS = \
diff --git a/paludis/repositories/e/ebuild/paludis-1/Makefile.am b/paludis/repositories/e/ebuild/paludis-1/Makefile.am
index 31c166d62..6d5ea0c84 100644
--- a/paludis/repositories/e/ebuild/paludis-1/Makefile.am
+++ b/paludis/repositories/e/ebuild/paludis-1/Makefile.am
@@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES = *~ *.epicfail
 SUBDIRS = .
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 libexecprogpaludis1dir = $(libexecdir)/paludis/paludis-1
 
 libexecprogpaludis1_SCRIPTS = \
diff --git a/paludis/repositories/e/ebuild/pbin-1/Makefile.am b/paludis/repositories/e/ebuild/pbin-1/Makefile.am
index eb0f705fc..56bcd0282 100644
--- a/paludis/repositories/e/ebuild/pbin-1/Makefile.am
+++ b/paludis/repositories/e/ebuild/pbin-1/Makefile.am
@@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES = *~ *.epicfail
 SUBDIRS = .
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 libexecprogpaludisbinary1dir = $(libexecdir)/paludis/pbin-1
 libexecprogpaludisbinary1_SCRIPTS = \
 	builtin_installbin.bash \
diff --git a/paludis/repositories/e/ebuild/utils/3/Makefile.am b/paludis/repositories/e/ebuild/utils/3/Makefile.am
index 8ae10a63f..992e9ca4c 100644
--- a/paludis/repositories/e/ebuild/utils/3/Makefile.am
+++ b/paludis/repositories/e/ebuild/utils/3/Makefile.am
@@ -1,6 +1,8 @@
 MAINTAINERCLEANFILES = Makefile.in
 SUBDIRS = .
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 libexecprog3dir = $(libexecdir)/paludis/utils/3/
 
 libexecprog3_SCRIPTS = \
diff --git a/paludis/repositories/e/ebuild/utils/Makefile.am b/paludis/repositories/e/ebuild/utils/Makefile.am
index 43057007a..4f2043de3 100644
--- a/paludis/repositories/e/ebuild/utils/Makefile.am
+++ b/paludis/repositories/e/ebuild/utils/Makefile.am
@@ -1,6 +1,8 @@
 MAINTAINERCLEANFILES = Makefile.in
 SUBDIRS = . 3 exheres-0 kdebuild-1
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 libexecprogdir = $(libexecdir)/paludis/utils
 
 libexecprog_SCRIPTS = \
diff --git a/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am b/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am
index 0909f2dbc..a545c53c5 100644
--- a/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am
+++ b/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am
@@ -1,6 +1,8 @@
 MAINTAINERCLEANFILES = Makefile.in
 SUBDIRS = .
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 libexecprogdir = $(libexecdir)/paludis/utils/exheres-0
 
 libexecprog_SCRIPTS = \
diff --git a/paludis/repositories/e/ebuild/utils/kdebuild-1/Makefile.am b/paludis/repositories/e/ebuild/utils/kdebuild-1/Makefile.am
index 09f82313c..426bb8377 100644
--- a/paludis/repositories/e/ebuild/utils/kdebuild-1/Makefile.am
+++ b/paludis/repositories/e/ebuild/utils/kdebuild-1/Makefile.am
@@ -1,6 +1,8 @@
 MAINTAINERCLEANFILES = Makefile.in
 SUBDIRS = .
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 libexecprogdir = $(libexecdir)/paludis/utils/kdebuild-1
 
 libexecprog_SCRIPTS = \
diff --git a/paludis/repositories/fake/Makefile.am b/paludis/repositories/fake/Makefile.am
index 5986aabf5..863c2da4c 100644
--- a/paludis/repositories/fake/Makefile.am
+++ b/paludis/repositories/fake/Makefile.am
@@ -1,6 +1,8 @@
 CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT *.epicfail
 MAINTAINERCLEANFILES = Makefile.in
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
 DEFS= \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
diff --git a/paludis/repositories/gems/Makefile.am b/paludis/repositories/gems/Makefile.am
index 2bff123e0..03662f0d5 100644
--- a/paludis/repositories/gems/Makefile.am
+++ b/paludis/repositories/gems/Makefile.am
@@ -2,6 +2,8 @@ SUBDIRS = .
 CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT *.epicfail
 MAINTAINERCLEANFILES = Makefile.in
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 AM_CXXFLAGS = -I$(top_srcdir) -I$(top_builddir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
 DEFS = \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
diff --git a/paludis/repositories/unavailable/Makefile.am b/paludis/repositories/unavailable/Makefile.am
index 5ae6025ce..c8b3ff402 100644
--- a/paludis/repositories/unavailable/Makefile.am
+++ b/paludis/repositories/unavailable/Makefile.am
@@ -2,6 +2,8 @@ SUBDIRS = .
 CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT *.epicfail
 DISTCLEANFILES =
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 MAINTAINERCLEANFILES = Makefile.in
 
 AM_CXXFLAGS = -I$(top_srcdir) -I$(top_builddir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
diff --git a/paludis/repositories/unpackaged/Makefile.am b/paludis/repositories/unpackaged/Makefile.am
index 03845ec55..cfb339df1 100644
--- a/paludis/repositories/unpackaged/Makefile.am
+++ b/paludis/repositories/unpackaged/Makefile.am
@@ -3,6 +3,8 @@ CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT *.epicfail
 
 MAINTAINERCLEANFILES = Makefile.in
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 AM_CXXFLAGS = -I$(top_srcdir) -I$(top_builddir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
 DEFS= \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
diff --git a/paludis/repositories/unwritten/Makefile.am b/paludis/repositories/unwritten/Makefile.am
index 872383296..c40caa5f5 100644
--- a/paludis/repositories/unwritten/Makefile.am
+++ b/paludis/repositories/unwritten/Makefile.am
@@ -2,6 +2,8 @@ SUBDIRS = .
 CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT *.epicfail
 DISTCLEANFILES =
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 MAINTAINERCLEANFILES = Makefile.in
 
 AM_CXXFLAGS = -I$(top_srcdir) -I$(top_builddir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
diff --git a/paludis/repositories/virtuals/Makefile.am b/paludis/repositories/virtuals/Makefile.am
index 73d980872..f9007f27a 100644
--- a/paludis/repositories/virtuals/Makefile.am
+++ b/paludis/repositories/virtuals/Makefile.am
@@ -2,6 +2,8 @@ CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT *.epicfail
 DISTCLEANFILES =
 MAINTAINERCLEANFILES = Makefile.in
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
 DEFS= \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
diff --git a/paludis/resolver/Makefile.am b/paludis/resolver/Makefile.am
index 6213ac525..9626a948a 100644
--- a/paludis/resolver/Makefile.am
+++ b/paludis/resolver/Makefile.am
@@ -12,6 +12,8 @@ BUILT_SOURCES = \
 	destination_types-se.hh destination_types-se.cc \
 	use_existing-se.hh use_existing-se.cc
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 noinst_HEADERS = \
 	arrow.hh arrow-fwd.hh \
 	constraint.hh constraint-fwd.hh \
diff --git a/paludis/selinux/Makefile.am b/paludis/selinux/Makefile.am
index d76df3043..30b42f026 100644
--- a/paludis/selinux/Makefile.am
+++ b/paludis/selinux/Makefile.am
@@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES = *~ *.epicfail
 SUBDIRS = .
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 paludis_selinux_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/selinux/
 
 paludis_selinux_include_HEADERS = \
diff --git a/paludis/syncers/Makefile.am b/paludis/syncers/Makefile.am
index 44a472ec5..0b4d7fb96 100644
--- a/paludis/syncers/Makefile.am
+++ b/paludis/syncers/Makefile.am
@@ -64,6 +64,8 @@ EXTRA_DIST = $(libexecprog_SCRIPTS) dobzr.in docvs.in dodarcs.in dogit.in dohg.i
 check_SCRIPTS =
 check_PROGRAMS = $(TESTS)
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
 
 dobzr dobzr+aftp dobzr+file dobzr+ftp dobzr+http dobzr+https dobzr+sftp dobzr+ssh : dobzr.in
diff --git a/paludis/util/Makefile.am.m4 b/paludis/util/Makefile.am.m4
index 075958889..b9e42ff71 100644
--- a/paludis/util/Makefile.am.m4
+++ b/paludis/util/Makefile.am.m4
@@ -78,6 +78,8 @@ EXTRA_DIST = util.hh.m4 Makefile.am.m4 files.m4 srlist srcleanlist selist seclea
 	echo_functions.bash.in
 SUBDIRS = .
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 libpaludisutil_@PALUDIS_PC_SLOT@_la_SOURCES = filelist
 libpaludisutil_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0 $(PTHREAD_LIBS) $(RT_LIBS)
 libpaludisutil_@PALUDIS_PC_SLOT@_la_LIBADD = $(PTHREAD_LIBS) $(RT_LIBS)
diff --git a/pkg-config/Makefile.am b/pkg-config/Makefile.am
index c99d06093..53d53985b 100644
--- a/pkg-config/Makefile.am
+++ b/pkg-config/Makefile.am
@@ -4,6 +4,8 @@ pkgconfig_DATA = paludis.pc
 EXTRA_DIST = paludis.pc.in
 CLEANFILES = paludis.pc *.epicfail
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 built-sources : $(BUILT_SOURCES)
 	for s in $(SUBDIRS) ; do $(MAKE) -C $$s built-sources || exit 1 ; done
 
diff --git a/python/Makefile.am b/python/Makefile.am
index da35e11ab..ca2741fd6 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -1,5 +1,7 @@
 SUBDIRS = .
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 AM_CXXFLAGS = -I$(top_srcdir) -I$(srcdir)/ \
 	      -I$(top_builddir)/ \
 	      @PALUDIS_CXXFLAGS@ \
diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index 9be1dc9d2..7b6d29e4d 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -1,5 +1,7 @@
 SUBDIRS = . demos
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 AM_CXXFLAGS = -I$(top_srcdir) -I$(srcdir)/ \
 	      -I$(top_builddir)/ \
 	      @PALUDIS_CXXFLAGS_WITHOUT_PEDANTIC@ \
diff --git a/ruby/demos/Makefile.am b/ruby/demos/Makefile.am
index 6f88db7ce..5bc5b06ea 100644
--- a/ruby/demos/Makefile.am
+++ b/ruby/demos/Makefile.am
@@ -1,5 +1,7 @@
 SUBDIRS = .
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 AM_CXXFLAGS = -I$(top_srcdir) -I$(srcdir)/ -I$(top_srcdir)/ruby/ \
 	      @PALUDIS_CXXFLAGS_WITHOUT_PEDANTIC@ \
 	      @PALUDIS_CXXFLAGS_NO_WREDUNDANT_DECLS@ \
diff --git a/src/Makefile.am b/src/Makefile.am
index aac36ecde..440beb46a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,6 +3,8 @@ SUBDIRS = output clients
 CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT *.epicfail
 MAINTAINERCLEANFILES = Makefile.in
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
 
diff --git a/src/clients/Makefile.am b/src/clients/Makefile.am
index 09aa6c1aa..d91386506 100644
--- a/src/clients/Makefile.am
+++ b/src/clients/Makefile.am
@@ -1,6 +1,8 @@
 SUBDIRS = . $(BUILD_CLIENTS)
 DIST_SUBDIRS = . $(ALL_CLIENTS)
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT *.epicfail
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/src/clients/accerso/Makefile.am b/src/clients/accerso/Makefile.am
index f7cc9fcc7..cf32c0472 100644
--- a/src/clients/accerso/Makefile.am
+++ b/src/clients/accerso/Makefile.am
@@ -8,6 +8,8 @@ DEFS= \
 
 SUBDIRS = .
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 bin_PROGRAMS = accerso
 noinst_PROGRAMS = man-accerso
 man_MANS = accerso.1
diff --git a/src/clients/adjutrix/Makefile.am b/src/clients/adjutrix/Makefile.am
index 2e86f4841..5f44a0b6c 100644
--- a/src/clients/adjutrix/Makefile.am
+++ b/src/clients/adjutrix/Makefile.am
@@ -7,6 +7,8 @@ DEFS= \
 
 SUBDIRS = .
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 bin_PROGRAMS = adjutrix
 noinst_PROGRAMS = man-adjutrix
 
diff --git a/src/clients/appareo/Makefile.am b/src/clients/appareo/Makefile.am
index 05bae3171..27f11b4ba 100644
--- a/src/clients/appareo/Makefile.am
+++ b/src/clients/appareo/Makefile.am
@@ -8,6 +8,8 @@ DEFS= \
 
 SUBDIRS = .
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 bin_PROGRAMS = appareo
 noinst_PROGRAMS = man-appareo
 man_MANS = appareo.1
diff --git a/src/clients/cave/Makefile.am b/src/clients/cave/Makefile.am
index 3a3973db0..9c549a245 100644
--- a/src/clients/cave/Makefile.am
+++ b/src/clients/cave/Makefile.am
@@ -11,6 +11,8 @@ DEFS= \
 
 SUBDIRS = .
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 bin_PROGRAMS = cave
 
 noinst_PROGRAMS = man-cave
diff --git a/src/clients/importare/Makefile.am b/src/clients/importare/Makefile.am
index 213a2d05c..79d3ab3b0 100644
--- a/src/clients/importare/Makefile.am
+++ b/src/clients/importare/Makefile.am
@@ -3,6 +3,8 @@ AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src \
 
 SUBDIRS = .
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 bin_PROGRAMS = importare
 noinst_PROGRAMS = man-importare
 man_MANS = importare.1
diff --git a/src/clients/inquisitio/Makefile.am b/src/clients/inquisitio/Makefile.am
index 00cbe76bf..38e4860f5 100644
--- a/src/clients/inquisitio/Makefile.am
+++ b/src/clients/inquisitio/Makefile.am
@@ -7,6 +7,8 @@ DEFS= \
 
 SUBDIRS = .
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 bin_PROGRAMS = inquisitio
 noinst_PROGRAMS = man-inquisitio
 man_MANS = inquisitio.1
diff --git a/src/clients/instruo/Makefile.am b/src/clients/instruo/Makefile.am
index 255750a26..457ccae2b 100644
--- a/src/clients/instruo/Makefile.am
+++ b/src/clients/instruo/Makefile.am
@@ -8,6 +8,8 @@ DEFS= \
 
 SUBDIRS = .
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 bin_PROGRAMS = instruo
 noinst_PROGRAMS = man-instruo
 man_MANS = instruo.1
diff --git a/src/clients/paludis/Makefile.am b/src/clients/paludis/Makefile.am
index 022f08c09..01ce13430 100644
--- a/src/clients/paludis/Makefile.am
+++ b/src/clients/paludis/Makefile.am
@@ -10,6 +10,8 @@ DEFS= \
 
 SUBDIRS = .
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 bin_PROGRAMS = paludis
 noinst_PROGRAMS = man-paludis
 man_MANS = paludis.1
diff --git a/src/clients/reconcilio/Makefile.am b/src/clients/reconcilio/Makefile.am
index e22e09348..712798a1a 100644
--- a/src/clients/reconcilio/Makefile.am
+++ b/src/clients/reconcilio/Makefile.am
@@ -7,6 +7,8 @@ bin_PROGRAMS = reconcilio
 noinst_PROGRAMS = man-reconcilio
 man_MANS = reconcilio.1
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 reconcilio.1 : man-reconcilio
 	./man-reconcilio > $@
 
diff --git a/src/clients/reconcilio/broken_linkage_finder/Makefile.am b/src/clients/reconcilio/broken_linkage_finder/Makefile.am
index a9641f4c9..07417163a 100644
--- a/src/clients/reconcilio/broken_linkage_finder/Makefile.am
+++ b/src/clients/reconcilio/broken_linkage_finder/Makefile.am
@@ -4,6 +4,8 @@ SUBDIRS = .
 
 noinst_LIBRARIES = libbrokenlinkagefinder.a
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 libbrokenlinkagefinder_a_SOURCES = \
 	broken_linkage_finder.cc   broken_linkage_finder.hh   \
 	configuration.cc           configuration.hh           \
diff --git a/src/clients/reconcilio/littlelf/Makefile.am b/src/clients/reconcilio/littlelf/Makefile.am
index cdb7d25e7..4b7a6c7c1 100644
--- a/src/clients/reconcilio/littlelf/Makefile.am
+++ b/src/clients/reconcilio/littlelf/Makefile.am
@@ -2,6 +2,8 @@ AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_NO_WOLD_STYLE
 
 SUBDIRS = .
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 noinst_LIBRARIES = liblittlelf.a
 
 liblittlelf_a_SOURCES = \
diff --git a/src/clients/reconcilio/util/Makefile.am b/src/clients/reconcilio/util/Makefile.am
index 596afca04..9ead7b994 100644
--- a/src/clients/reconcilio/util/Makefile.am
+++ b/src/clients/reconcilio/util/Makefile.am
@@ -4,6 +4,8 @@ SUBDIRS = .
 
 noinst_LIBRARIES = libreconcilioutil.a
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 libreconcilioutil_a_SOURCES = \
 	realpath.cc          realpath.hh \
 	wildcard_expander.cc wildcard_expander.hh
diff --git a/src/output/Makefile.am b/src/output/Makefile.am
index e79b861b5..da9de2b75 100644
--- a/src/output/Makefile.am
+++ b/src/output/Makefile.am
@@ -1,6 +1,8 @@
 CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT *.epicfail
 MAINTAINERCLEANFILES = Makefile.in
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 noinst_LIBRARIES = liboutput.a
 liboutput_a_SOURCES = \
 	colour.cc colour.hh \
diff --git a/test/Makefile.am b/test/Makefile.am
index de61faabc..2b14798db 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -3,6 +3,8 @@ MAINTAINERCLEANFILES = Makefile.in
 AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
 EXTRA_DIST = run_test.sh
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 libtest_a_SOURCES = \
 	test_framework.cc \
 	test_framework.hh \
diff --git a/vim/Makefile.am b/vim/Makefile.am
index 68a56738f..e5b189dd6 100644
--- a/vim/Makefile.am
+++ b/vim/Makefile.am
@@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT .keep *.epicfail
 SUBDIRS = ftdetect syntax
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 built-sources : $(BUILT_SOURCES)
 	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
 
diff --git a/vim/ftdetect/Makefile.am b/vim/ftdetect/Makefile.am
index e9210d535..172bec036 100644
--- a/vim/ftdetect/Makefile.am
+++ b/vim/ftdetect/Makefile.am
@@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT .keep *.epicfail
 SUBDIRS =
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 vimscripts = \
 	paludis.vim
 
diff --git a/vim/syntax/Makefile.am b/vim/syntax/Makefile.am
index 7cbbea1d0..236ca3594 100644
--- a/vim/syntax/Makefile.am
+++ b/vim/syntax/Makefile.am
@@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT .keep *.epicfail
 SUBDIRS =
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 vimscripts = \
 	paludis-environment-conf.vim \
 	paludis-keywords-conf.vim \
diff --git a/zsh-completion/Makefile.am b/zsh-completion/Makefile.am
index 5dbd140c5..ca6b26dac 100644
--- a/zsh-completion/Makefile.am
+++ b/zsh-completion/Makefile.am
@@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 noinst_DATA = _paludis _adjutrix _paludis_packages _inquisitio _importare _reconcilio
 EXTRA_DIST = $(noinst_DATA)
 
+AUTOMAKE_OPTIONS = parallel-tests
+
 built-sources : $(BUILT_SOURCES)
 	for s in $(SUBDIRS) ; do $(MAKE) -C $$s built-sources || exit 1 ; done