[jhbuild/desktop-testing] [ldtp] Give BuildSlaves an option to run ldtp tests

[John Carr <johncarr src gnome org>]

commit 94905add0dee2dad1bf8c47d28ed48551411024d
Author: John Carr <john carr unrouted co uk>
Date:   Wed May 20 09:29:58 2009 +0100

    [ldtp] Give BuildSlaves an option to run ldtp tests
---
 jhbuild/buildbot/factory.py |    3 +++
 jhbuild/commands/bot.py     |    5 ++++-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/jhbuild/buildbot/factory.py b/jhbuild/buildbot/factory.py
index 2e39e4d..aa60bd3 100644
--- a/jhbuild/buildbot/factory.py
+++ b/jhbuild/buildbot/factory.py
@@ -42,6 +42,9 @@ class JHBuildFactory(factory.BuildFactory):
             self.addStep(JHBuildModulePathCommand, moduleset=self.moduleset,
                     module=self.module, action='module-reports.sh',
                     actionName='Coverage')
+        if self.slave.run_ldtp_tests:
+            self.addStep(JHBuildCommand, stage='test', moduleset=self.moduleset,
+                    module=self.module)
         if self.slave.run_clean_afterwards:
             self.addStep(JHBuildCommand, stage='clean', moduleset=self.moduleset,
                     module=self.module)
diff --git a/jhbuild/commands/bot.py b/jhbuild/commands/bot.py
index 5deefe3..b9990b6 100644
--- a/jhbuild/commands/bot.py
+++ b/jhbuild/commands/bot.py
@@ -152,7 +152,7 @@ class cmd_bot(Command):
             config.interact = False
             config.nonetwork = True
             os.environ['TERM'] = 'dumb'
-            if args[0] in ('update', 'build', 'check', 'clean'):
+            if args[0] in ('update', 'build', 'check', 'test', 'clean'):
                 module_set = jhbuild.moduleset.load(config)
                 buildscript = jhbuild.frontends.get_buildscript(config,
                         [module_set.get_module(x, ignore_case=True) for x in args[1:]])
@@ -165,6 +165,8 @@ class cmd_bot(Command):
                     config.build_targets = ['install']
                 elif args[0] == 'check':
                     phases = ['check']
+                elif args[0] == 'test':
+                    phases = 'ldtp_test'
                 elif args[0] == 'clean':
                     phases = ['clean']
                 rc = buildscript.build(phases=phases)
@@ -279,6 +281,7 @@ class cmd_bot(Command):
 
             run_checks = True
             run_coverage_report = False
+            run_ldtp_tests = False
             run_clean_afterwards = False
 
             def load_extra_configuration(self, slaves_dir):