jhbuild r2547 - in trunk: . jhbuild/buildbot jhbuild/buildbot/status/web

[itoral svn gnome org]

Author: itoral
Date: Thu Nov 27 16:48:23 2008
New Revision: 2547
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2547&view=rev

Log:
        * jhbuild/buildbot/status/web/__init__.py:
        * jhbuild/buildbot/steps.py:
        * jhbuild/buildbot/factory.py: Added clean stage. Also, allow the
        possibility to define commands that can fail without failing
        the build (like clean).



Modified:
   trunk/ChangeLog
   trunk/jhbuild/buildbot/factory.py
   trunk/jhbuild/buildbot/status/web/__init__.py
   trunk/jhbuild/buildbot/steps.py

Modified: trunk/jhbuild/buildbot/factory.py
==============================================================================
--- trunk/jhbuild/buildbot/factory.py	(original)
+++ trunk/jhbuild/buildbot/factory.py	Thu Nov 27 16:48:23 2008
@@ -36,8 +36,10 @@
         self.addStep(JHBuildSource, moduleset=self.moduleset, module=self.module)
         self.addStep(JHBuildCommand, stage='build', moduleset=self.moduleset, module=self.module)
         self.addStep(JHBuildCheckCommand, moduleset=self.moduleset, module=self.module)
-        #self.addStep(JHBuildModulePathTestCommand, moduleset=self.moduleset, module=self.module, action=['make-check.sh'], haltOnFailure = False)
-        #self.addStep(JHBuildModulePathCommand, moduleset=self.moduleset, module=self.module, action=['module-reports.sh'], haltOnFailure = False)
+#	self.addStep(JHBuildModulePathCommand, moduleset=self.moduleset, module=self.module, action='module-reports.sh', 
+#                     haltOnFailure = False, actionName='coverage')
+	self.addStep(JHBuildModulePathCommand, moduleset=self.moduleset, module=self.module, action='make clean', 
+                     haltOnFailure = False, actionName='clean')
 
     def newBuild(self, request):
         return factory.BuildFactory.newBuild(self, request)

Modified: trunk/jhbuild/buildbot/status/web/__init__.py
==============================================================================
--- trunk/jhbuild/buildbot/status/web/__init__.py	(original)
+++ trunk/jhbuild/buildbot/status/web/__init__.py	Thu Nov 27 16:48:23 2008
@@ -122,7 +122,7 @@
                     if last_build:
                         # use a different class/label if make check failed
                         steps = last_build.getSteps()
-                        if steps and steps[-1].results == WARNINGS:
+                        if steps and steps[2].results == WARNINGS:
                             # make check failed
                             class_ = 'failedchecks'
                             lastbuild_label = 'Failed Checks'

Modified: trunk/jhbuild/buildbot/steps.py
==============================================================================
--- trunk/jhbuild/buildbot/steps.py	(original)
+++ trunk/jhbuild/buildbot/steps.py	Thu Nov 27 16:48:23 2008
@@ -135,7 +135,7 @@
         self.addLogObserver('stdio', UnitTestsObserver())
 
     def evaluateCommand(self, cmd):
-        if self.failedTestsCount > 0:
+        if self.failedTestsCount > 0 or cmd.rc != 0:
             return WARNINGS
         else:
             return SUCCESS
@@ -224,13 +224,23 @@
         command = ["jhbuild"]
         if (moduleset is not None):
             command += ['--moduleset='+moduleset]
-        command += ['run', '--in-builddir', module, '--', action]
-        self.name=module+" "+" ".join(action)
-        self.description = [" ".join(action) + '(run)']
-        self.descriptionDone = [" ".join(action)]
+        actionParts = action.split(" ")
+        command += ['run', '--in-builddir', module, '--']
+        command += actionParts
+        self.name=module + " " + kwargs['actionName']
+        self.description = [kwargs['actionName'] + ' (running)']
+        self.descriptionDone = [kwargs['actionName']]
         steps.shell.ShellCommand.__init__(self, description=self.description,
                                    descriptionDone=self.descriptionDone, command=command, **kwargs)
 
+    def evaluateCommand(self, cmd):
+        if self.haltOnFailure and cmd.rc != 0:
+            return FAILURE
+        elif cmd.rc != 0:
+            return WARNINGS
+        else:
+            return SUCCESS	
+
     def createSummary(self, log):
         output = StringIO.StringIO(log.getText())
         warnings = []