[cig-commits] r12710 - cs/buildbot/trunk/buildbot

[leif at geodynamics.org]

Author: leif
Date: 2008-08-25 17:11:54 -0700 (Mon, 25 Aug 2008)
New Revision: 12710

Modified:
   cs/buildbot/trunk/buildbot/bs.py
   cs/buildbot/trunk/buildbot/lines.py
Log:
Minor changes to accommodate the time consuming and expensive SPECFEM
simulations.


Modified: cs/buildbot/trunk/buildbot/bs.py
===================================================================
--- cs/buildbot/trunk/buildbot/bs.py	2008-08-25 23:36:01 UTC (rev 12709)
+++ cs/buildbot/trunk/buildbot/bs.py	2008-08-26 00:11:54 UTC (rev 12710)
@@ -66,6 +66,7 @@
               workdir=workdir,
               env=env,
               haltOnFailure=True,
+              timeout=None, # to accommodate 3D simulations
               ),
             ]
         

Modified: cs/buildbot/trunk/buildbot/lines.py
===================================================================
--- cs/buildbot/trunk/buildbot/lines.py	2008-08-25 23:36:01 UTC (rev 12709)
+++ cs/buildbot/trunk/buildbot/lines.py	2008-08-26 00:11:54 UTC (rev 12710)
@@ -36,6 +36,7 @@
         self.schedulers = []
         self.changeScheduler = None
         self.fileIsImportant = None
+        self.schedulerKwds = {}
 
         self._buildSystem = None
         self.languages = None
@@ -75,6 +76,8 @@
             dep.isDependency = True
 
         # Trigger a build whenever my sources change.
+        schedulerKwds = dict(schedulerKwds)
+        schedulerKwds.update(self.schedulerKwds)
         self.changeScheduler = self.newChangeScheduler(**schedulerKwds)
         if self.changeScheduler:
             self.schedulers.append(self.changeScheduler)