[Boost-commit] svn:boost r38732 - in trunk/tools/buildbot: config/master/alpha src/boost/bot

From: grafikrobot_at_[hidden]
Date: 2007-08-16 17:30:23

Author: grafik
Date: 2007-08-16 17:30:21 EDT (Thu, 16 Aug 2007)
New Revision: 38732
URL: http://svn.boost.org/trac/boost/changeset/38732

Log:
Add testing step, which unfortunately doesn't work.
Text files modified: 
   trunk/tools/buildbot/config/master/alpha/master.cfg |    17 +++++++-----                            
   trunk/tools/buildbot/src/boost/bot/factory.py       |    52 ++++++++++++++++++++------------------- 
   2 files changed, 37 insertions(+), 32 deletions(-)

Modified: trunk/tools/buildbot/config/master/alpha/master.cfg
==============================================================================
--- trunk/tools/buildbot/config/master/alpha/master.cfg	(original)
+++ trunk/tools/buildbot/config/master/alpha/master.cfg	2007-08-16 17:30:21 EDT (Thu, 16 Aug 2007)
@@ -39,18 +39,21 @@
 
 from boost.bot.factory import Boost_BuildFactory, action
 
-factoryFull = Boost_BuildFactory(
-    action('svn',root='http://svn.boost.org/svn/boost/'),
-    action('bjam_build'),
-    action('test_tools_build', toolset='gcc')
-    )
-
 c['builders'] = []
 c['builders'].append({
     'name': 'Linux x86 Alpha',
     'slavename': 'linux-x86-rsi-droid',
     'builddir': 'Linux-x86-Alpha',
-    'factory': factoryFull })
+    'factory': Boost_BuildFactory(
+        action('svn',root='http://svn.boost.org/svn/boost/'),
+        action('bjam_build'),
+        action('test_tools_build', toolset='gcc'),
+        action('btest_all',
+            toolset=['gcc-4.1.2~linux~x86','gcc-4.2.0~linux~x86'],
+            options=['-sTEST_BOOST_VERSION=HEAD','-j2']
+            )
+        )
+    })
 
 
 ####### STATUS TARGETS

Modified: trunk/tools/buildbot/src/boost/bot/factory.py
==============================================================================
--- trunk/tools/buildbot/src/boost/bot/factory.py	(original)
+++ trunk/tools/buildbot/src/boost/bot/factory.py	2007-08-16 17:30:21 EDT (Thu, 16 Aug 2007)
@@ -153,27 +153,27 @@
             ,**defaults(**kwargs)
             )
 
-    def action_btest(self,b,*args,**kwargs):
-        return (
-            [ s( boost.bot.step.Boost_Test
-                ,description = kwargs.get('description')
-                ,workdir = b.workdir
-                ,tests = kwargs.get('tests',['.*'])
-                ,bjam = kwargs.get('bjam','tools/jam/src/bin/bjam')
-                ,project = kwargs.get('project','status')
-                ,options = kwargs.get('options',[
-                    '--dump-tests',
-                    '--dump-test-targets',
-                    '-sBUILD=%s' % kwargs.get('build','debug'),
-                    '-sTOOLS=%s' % kwargs['toolset']
-                    ] + kwargs.get('options',[]))
-                ,target = 'nothing'
-                ,locate = kwargs.get('locate','results')
-                ,env = kwargs.get('env',{})
-                ,logfile = kwargs.get('logfile','bjam.log')
-                ,**defaults(**kwargs)
-                ) ],
-            kwargs.get('files',[]) )
+    #~ def action_btest(self,b,*args,**kwargs):
+        #~ return (
+            #~ [ s( boost.bot.step.Boost_Test
+                #~ ,description = kwargs.get('description')
+                #~ ,workdir = b.workdir
+                #~ ,tests = kwargs.get('tests',['.*'])
+                #~ ,bjam = kwargs.get('bjam','tools/jam/src/bin/bjam')
+                #~ ,project = kwargs.get('project','status')
+                #~ ,options = kwargs.get('options',[
+                    #~ '--dump-tests',
+                    #~ '--dump-test-targets',
+                    #~ '-sBUILD=%s' % kwargs.get('build','debug'),
+                    #~ '-sTOOLS=%s' % kwargs['toolset']
+                    #~ ] + kwargs.get('options',[]))
+                #~ ,target = 'nothing'
+                #~ ,locate = kwargs.get('locate','results')
+                #~ ,env = kwargs.get('env',{})
+                #~ ,logfile = kwargs.get('logfile','bjam.log')
+                #~ ,**defaults(**kwargs)
+                #~ ) ],
+            #~ kwargs.get('files',[]) )
 
     def action_btest_all(self,b,*args,**kwargs):
         return self.action_bjam( b
@@ -181,10 +181,12 @@
             ,project = kwargs.get('project','status')
             ,options = [
                 '--dump-tests',
-                '--dump-test-targets',
-                '-sBUILD=%s' % kwargs.get('build','debug'),
-                '-sTOOLS=%s' % kwargs['toolset']
-                ] + kwargs.get('options',[])
+                #~ '-d2',
+                '-n',
+                kwargs.get('build','debug')
+                ]
+                + kwargs['toolset']
+                + kwargs.get('options',[])
             ,target = 'test'
             ,locate = kwargs.get('locate','results')
             ,env = kwargs.get('env',{})