[jhbuild] autotools: Don't run make check in parallel
- From: Craig Keogh <cskeogh src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] autotools: Don't run make check in parallel
- Date: Sat, 17 Mar 2012 12:07:55 +0000 (UTC)
commit c030e730288a54fd963d9fdd36f83fad437e5694
Author: Colin Walters <walters verbum org>
Date: Wed Feb 22 11:56:20 2012 -0500
autotools: Don't run make check in parallel
A lot of modules probably don't have the right dependencies to make
that work.
https://bugzilla.gnome.org/show_bug.cgi?id=670625
jhbuild/modtypes/autotools.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/jhbuild/modtypes/autotools.py b/jhbuild/modtypes/autotools.py
index cef3153..61e60e8 100644
--- a/jhbuild/modtypes/autotools.py
+++ b/jhbuild/modtypes/autotools.py
@@ -69,10 +69,10 @@ class AutogenModule(Package, DownloadableModule):
self.supports_install_destdir = True
self.supports_static_analyzer = supports_static_analyzer
- def _get_makeargs(self, buildscript):
+ def _get_makeargs(self, buildscript, add_parallel=True):
makeargs = self.makeargs + ' ' + self.config.module_makeargs.get(
self.name, self.config.makeargs)
- if self.supports_parallel_build:
+ if self.supports_parallel_build and add_parallel:
# Propagate job count into makeargs, unless -j is already set
if ' -j' not in makeargs:
arg = '-j %s' % (buildscript.config.jobs, )
@@ -252,7 +252,7 @@ class AutogenModule(Package, DownloadableModule):
def do_check(self, buildscript):
buildscript.set_action(_('Checking'), self)
- makeargs = self._get_makeargs(buildscript)
+ makeargs = self._get_makeargs(buildscript, add_parallel=False)
cmd = '%s%s %s check' % (self.static_analyzer_pre_cmd(buildscript), os.environ.get('MAKE', 'make'), makeargs)
try:
buildscript.execute(cmd, cwd = self.get_builddir(buildscript),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]