Parallelize configure steps for multiple ABIs, and run tests in parallel.

Package-Manager: portage-2.2.0_alpha112/cvs/Linux x86_64

3 files changed, 63 insertions, 33 deletions

diff --git a/sys-apps/sandbox/ChangeLog b/sys-apps/sandbox/ChangeLog
index b7b6121854a4..dd429f50c7fa 100644
--- a/sys-apps/sandbox/ChangeLog
+++ b/sys-apps/sandbox/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/sandbox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.162 2012/03/30 15:58:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.163 2012/06/24 05:35:02 vapier Exp $
+
+  24 Jun 2012; Mike Frysinger <vapier@gentoo.org> sandbox-2.5.ebuild:
+  Parallelize configure steps for multiple ABIs, and run tests in parallel.
 
   30 Mar 2012; Alexis Ballier <aballier@gentoo.org> sandbox-1.6-r2.ebuild:
   keyword -x86-fbsd for bug #374425, sandbox is broken of fbsd and this leaves
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index b549539e1cbe..27372e4181dc 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -12,13 +12,23 @@ DIST sandbox-2.5.tar.xz 355680 RMD160 f6eb0d681d5280c6ced5cd6bfd4da74e25ce129f S
 EBUILD sandbox-1.6-r2.ebuild 2676 RMD160 f67be130abbc60828aa47c76f14dca14c4a54445 SHA1 cbfcb74a299ccd2c1256f145dbf8764e176f3378 SHA256 23c2bae032fe62b4c2cc4beb906c75bd927f3b2c4cc10551ef2f7fb66b424601
 EBUILD sandbox-2.3-r1.ebuild 2713 RMD160 178286b857e23c52777207404b097efacec98c53 SHA1 4a5aae8a23d3c0ec2452c8248576e59f4e3d92de SHA256 58eb10e050f4321b703d71cfdd8d83de61ab76e748046dde724e64ca21dc253f
 EBUILD sandbox-2.4.ebuild 2639 RMD160 061703c6a84348cbe51c1e2ad3037e93151c2296 SHA1 e93d4767e9c50c4737527ae26c1b0529e743d8ce SHA256 d5b852481f07dbbf5b1f5f4761a4c16137aea8f4d8f047c27edd898cc713272e
-EBUILD sandbox-2.5.ebuild 2638 RMD160 4c643ddd8af466bb39dffd1622bd89738865080b SHA1 08851ae0c0bd68cf295d8886d90face7907e6852 SHA256 0d52c9fe4a81706e99694433c3edf5b54ed71168062261bb66ef26add6aacb7e
-MISC ChangeLog 22512 RMD160 dc07f892e683bef205758030169d461f47a94ef9 SHA1 8abb64dacb7ea6e9f9af60f12fc3623d3c480b45 SHA256 d4a72c0ae391d8b22c626b309871781a9468577301378ee058e6dbf2515ce137
+EBUILD sandbox-2.5.ebuild 2691 RMD160 f40b7c73e0d852220b240226813f3c9b2c1dd27a SHA1 cf3eb7a964a8f8fa724335f56daa52a3bda583c4 SHA256 3f0f988570641f22ad2072b66f68f7af15365de28d322c95d248d4cb74624938
+MISC ChangeLog 22657 RMD160 5da0253de6ed03f171e8ce2b42e1ac0c4959f4b3 SHA1 e949831f4169daa71329c799d610facd4bbb79e7 SHA256 3bdaabce1c63102f7fae12ed53b4b3287c3388a87479cc9000e096a0344cd498
 MISC metadata.xml 316 RMD160 7a59e0a8ebd42e830f5ec1b52f58855a78fddd3f SHA1 b86a1426d32e1a47371f1c21545aab672987bef1 SHA256 488f8a1ba1e1d07a159d22ac198aefee5dfa9ded04de2969019f177161abef1b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk912EIACgkQvFcC4BYPU0rjzgCfaXFhYXV1GA6Z59CX841+3Iwl
-R3cAnisvXSa67H79kP13G/jg4509PJUa
-=2Go1
+iQIcBAEBAgAGBQJP5qcwAAoJELEHsLL7fEFWTGkP/1aNeHpXUk0oujlhg+EBo18I
+5+CaRM7CPznbbJfgva6kVubRK/HS8EXBljQ7UrQFSHDrlccv8osxnyVQdWTqm/N6
+D3fMparyB3c+ViRYNqseT29K6mrdgmen3JlNJdqCElw+pMxcqHjGUqYRserSb8kM
+1YXMgTJd6LaWlVktoMwaxfhPxxkUQXl7ChLnrJfi+ccNQwld8KTpQm9L7PXVLkV+
+3jv2NNkUz3NeiCpOb/eNCglkiJSFTn+ivbvUNgJTcYn5M03axeBvGXNridyyYm1G
+b57OxWgM3IDlwW9PoBwZ4D0CpO7rb/2LCF2+hSJfiv8vu/XTWV0+vDhOaRdmrcEW
++vqVMX7wCS5SfNSk7CQkR5NSCcreeYeDsGK57Ml8mb4L0zWkbLG70hnqjXbklPop
+pJoMujLgkD08eaC7NXG3rU4Wbu22PUxIksNj3b5/8MiKaORV9vU+HesxcPSr7l/4
+2+yXMH1iIYxqS8wl3vZm3fA8Q6k3YpXd6j4uJnDsQSNWRCxnXo6EZ4w7pKXX/fSH
+D2k3Xf0R+i5ep56l73U09rPHvhp8SoRd6zezG0hVtE+a9TiJTUIqUL1J8MZvDHzp
+QmGh9RFdxm4w3Q3RzjiOkrfr6Uxsr7C+6W4JuZhzJslYTfwQsJY53G+jm6uJsr2T
+7bGOCYW4NNWzLx8F8rwS
+=22kn
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/sandbox/sandbox-2.5.ebuild b/sys-apps/sandbox/sandbox-2.5.ebuild
index be4fe93547f4..88f8d379cf56 100644
--- a/sys-apps/sandbox/sandbox-2.5.ebuild
+++ b/sys-apps/sandbox/sandbox-2.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.5.ebuild,v 1.9 2012/02/05 04:50:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.5.ebuild,v 1.10 2012/06/24 05:35:02 vapier Exp $
 
 #
 # don't monkey with this ebuild unless contacting portage devs.
 # period.
 #
 
-inherit eutils flag-o-matic toolchain-funcs multilib unpacker
+inherit eutils flag-o-matic toolchain-funcs multilib unpacker multiprocessing
 
 DESCRIPTION="sandbox'd LD_PRELOAD hack"
 HOMEPAGE="http://www.gentoo.org/"
@@ -33,45 +33,62 @@ sandbox_death_notice() {
 
 sb_get_install_abis() { use multilib && get_install_abis || echo ${ABI:-default} ; }
 
-src_compile() {
-	filter-lfs-flags #90228
-
+sb_foreach_abi() {
 	local OABI=${ABI}
 	for ABI in $(sb_get_install_abis) ; do
-		mkdir "${WORKDIR}/build-${ABI}"
 		cd "${WORKDIR}/build-${ABI}"
-
-		use multilib && multilib_toolchain_setup ${ABI}
-
-		einfo "Configuring sandbox for ABI=${ABI}..."
-		ECONF_SOURCE="../${P}/" \
-		econf ${myconf} || die
-		einfo "Building sandbox for ABI=${ABI}..."
-		emake || die
+		einfo "Running $1 for ABI=${ABI}..."
+		"$@"
 	done
 	ABI=${OABI}
 }
 
-src_test() {
+sb_configure() {
+	mkdir "${WORKDIR}/build-${ABI}"
+	cd "${WORKDIR}/build-${ABI}"
+
+	use multilib && multilib_toolchain_setup ${ABI}
+
+	einfo "Configuring sandbox for ABI=${ABI}..."
+	ECONF_SOURCE="../${P}/" \
+	econf ${myconf} || die
+}
+
+sb_compile() {
+	emake || die
+}
+
+src_compile() {
+	filter-lfs-flags #90228
+
+	# Run configures in parallel!
+	multijob_init
 	local OABI=${ABI}
 	for ABI in $(sb_get_install_abis) ; do
-		cd "${WORKDIR}/build-${ABI}"
-		einfo "Checking sandbox for ABI=${ABI}..."
-		emake check || die "make check failed for ${ABI}"
+		multijob_child_init sb_configure
 	done
 	ABI=${OABI}
+	multijob_finish
+
+	sb_foreach_abi sb_compile
+}
+
+sb_test() {
+	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" || die
+}
+
+src_test() {
+	sb_foreach_abi sb_test
+}
+
+sb_install() {
+	emake DESTDIR="${D}" install || die
+	insinto /etc/sandbox.d #333131
+	doins etc/sandbox.d/00default || die
 }
 
 src_install() {
-	local OABI=${ABI}
-	for ABI in $(sb_get_install_abis) ; do
-		cd "${WORKDIR}/build-${ABI}"
-		einfo "Installing sandbox for ABI=${ABI}..."
-		emake DESTDIR="${D}" install || die "make install failed for ${ABI}"
-		insinto /etc/sandbox.d #333131
-		doins etc/sandbox.d/00default || die
-	done
-	ABI=${OABI}
+	sb_foreach_abi sb_install
 
 	doenvd "${FILESDIR}"/09sandbox