jhbuild r2173 - in trunk: . jhbuild jhbuild/modtypes

[herzi svn gnome org]

Author: herzi
Date: Fri Jul 18 14:14:08 2008
New Revision: 2173
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2173&view=rev

Log:
2008-07-18  Sven Herzberg  <herzi gnome-de org>

	Bug #310541: patch to make mozilla 'make check' pass

	* jhbuild/config.py: added modules_makecheck option
	* jhbuild/defaults.jhbuildrc: declare modules_makecheck dictionary
	* jhbuild/modtypes/autotools.py: only run "make check" if it's not
	explicitly disabled per module



Modified:
   trunk/ChangeLog
   trunk/jhbuild/config.py
   trunk/jhbuild/defaults.jhbuildrc
   trunk/jhbuild/modtypes/autotools.py

Modified: trunk/jhbuild/config.py
==============================================================================
--- trunk/jhbuild/config.py	(original)
+++ trunk/jhbuild/config.py	Fri Jul 18 14:14:08 2008
@@ -35,7 +35,7 @@
                 'repos', 'branches', 'noxvfb', 'xvfbargs',
                 'builddir_pattern', 'module_autogenargs', 'module_makeargs',
                 'interact', 'buildscript', 'nonetwork',
-                'alwaysautogen', 'nobuild', 'makeclean', 'makecheck',
+                'alwaysautogen', 'nobuild', 'makeclean', 'makecheck', 'module_makecheck',
                 'use_lib64', 'tinderbox_outputdir', 'sticky_date',
                 'tarballdir', 'pretty_print', 'svn_program', 'makedist',
                 'makedistcheck', 'nonotify', 'cvs_program',

Modified: trunk/jhbuild/defaults.jhbuildrc
==============================================================================
--- trunk/jhbuild/defaults.jhbuildrc	(original)
+++ trunk/jhbuild/defaults.jhbuildrc	Fri Jul 18 14:14:08 2008
@@ -54,6 +54,7 @@
 module_autogenargs = {}
 module_makeargs = {}
 module_extra_env = {}
+module_makecheck = {}
 
 # control parts of the build process
 nonetwork     = False  # never touch the network

Modified: trunk/jhbuild/modtypes/autotools.py
==============================================================================
--- trunk/jhbuild/modtypes/autotools.py	(original)
+++ trunk/jhbuild/modtypes/autotools.py	Fri Jul 18 14:14:08 2008
@@ -205,6 +205,8 @@
 
     def skip_check(self, buildscript, last_state):
         return (not buildscript.config.makecheck or
+                (buildscript.config.module_makecheck.has_key(self.name) and
+                 not buildscript.config.module_makecheck[self.name]) or
                 buildscript.config.nobuild)
 
     def do_check(self, buildscript):