From: grafikrobot_at_[hidden]
Date: 2007-08-17 10:51:50
Author: grafik
Date: 2007-08-17 10:51:49 EDT (Fri, 17 Aug 2007)
New Revision: 38740
URL: http://svn.boost.org/trac/boost/changeset/38740
Log:
Minor fix to get btest step working.
Text files modified:
trunk/tools/buildbot/src/boost/bot/factory.py | 5 ++---
trunk/tools/buildbot/src/boost/bot/remote.py | 13 +++++++------
trunk/tools/buildbot/src/boost/bot/step.py | 4 ++--
3 files changed, 11 insertions(+), 11 deletions(-)
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-17 10:51:49 EDT (Fri, 17 Aug 2007)
@@ -132,7 +132,7 @@
,bjam = kwargs.get('bjam','tools/jam/src/bin/bjam')
,project = kwargs.get('project','.')
,options = kwargs.get('options',[])
- ,target = kwargs.get('target','all')
+ ,target = kwargs.get('target')
,locate = kwargs.get('locate','results')
,env = kwargs.get('env',{})
,logfile = kwargs.get('logfile',False)
@@ -187,7 +187,6 @@
]
+ kwargs['toolset']
+ kwargs.get('options',[])
- ,target = 'test'
,locate = kwargs.get('locate','results')
,env = kwargs.get('env',{})
,logfile = kwargs.get('logfile','bjam.log')
@@ -200,7 +199,7 @@
[ s( boost.bot.step.Boost_Process_Jam_Log
,description = kwargs.get('description',['process log'])
,workdir = b.workdir
- ,projcess_jam_log = kwargs.get('projcess_jam_log','tools/regression/build/run/process_jam_log')
+ ,projcess_jam_log = kwargs.get('projcess_jam_log','dist/bin/process_jam_log')
,locate = kwargs.get('locate','results')
,logfile = kwargs.get('logfile','bjam.log')
,**defaults(**kwargs)
Modified: trunk/tools/buildbot/src/boost/bot/remote.py
==============================================================================
--- trunk/tools/buildbot/src/boost/bot/remote.py (original)
+++ trunk/tools/buildbot/src/boost/bot/remote.py 2007-08-17 10:51:49 EDT (Fri, 17 Aug 2007)
@@ -291,11 +291,12 @@
for item in env.items():
self.stdout(" %s = '%s'" % item)
- command = \
- [ kwargs['bjam'] ] \
- + [ '--build-dir=%s' % (kwargs['builddir']) ] \
- + kwargs['options'] \
- + [ kwargs['target'] ]
+ command = []
+ command += [ kwargs['bjam'] ]
+ command += [ '--build-dir=%s' % (kwargs['builddir']) ]
+ command += kwargs['options']
+ if kwargs.get('target'):
+ command += [ kwargs['target'] ]
self.command = LoggedShellCommand(self.builder
,command
,kwargs['project']
@@ -316,7 +317,7 @@
,c( self.doProcessJamLog
,process_jam_log = os.path.normpath(os.path.join(
self.builder.basedir,self.args.get('locate','build'),
- self.args.get('process_jam_log','tools/regression/build/run/process_jam_log')))
+ self.args.get('process_jam_log','dist/bin/process_jam_log')))
,boostroot = os.path.normpath(os.path.join(
self.builder.basedir,self.args.get('boostroot',self.args.get('workdir','.'))))
,logfile = os.path.normpath(os.path.join(
Modified: trunk/tools/buildbot/src/boost/bot/step.py
==============================================================================
--- trunk/tools/buildbot/src/boost/bot/step.py (original)
+++ trunk/tools/buildbot/src/boost/bot/step.py 2007-08-17 10:51:49 EDT (Fri, 17 Aug 2007)
@@ -16,7 +16,7 @@
if kwargs.get('name'): _name = kwargs.get('name')
if not kwargs.get('description'): kwargs['description'] = _description
ShellCommand.__init__(self,**kwargs)
- self.name = _name
+ self._name = _name
def start(self):
#~ command = self._interpolateProperties(self.command)
@@ -25,7 +25,7 @@
#~ kwargs['command'] = command
if kwargs.get('env'): kwargs['env'] = kwargs['env'].copy()
kwargs['logfiles'] = self.logfiles
- cmd = LoggedRemoteCommand(self.name,kwargs)
+ cmd = LoggedRemoteCommand(self._name,kwargs)
self.setupEnvironment(cmd)
self.checkForOldSlaveAndLogfiles()
self.startCommand(cmd)