Просмотр исходного кода

Fix changed remote shell command argument names. Disable the svn poller as it taxes the server too much. Bjam build, bjam run, and test tools build working now.

[SVN r38724]
Rene Rivera 18 лет назад
Родитель
Сommit
d1b601ae49
2 измененных файлов с 5 добавлено и 4 удалено
  1. 3 3
      tools/buildbot/config/master/alpha/master.cfg
  2. 2 1
      tools/buildbot/src/boost/bot/remote.py

+ 3 - 3
tools/buildbot/config/master/alpha/master.cfg

@@ -14,9 +14,9 @@ from buildbot.changes.svnpoller import SVNPoller
 from buildbot.changes.pb import PBChangeSource
 from buildbot.changes.pb import PBChangeSource
 
 
 c['sources'] = []
 c['sources'] = []
-c['sources'].append(SVNPoller(
-    'http://svn.boost.org/svn/boost/trunk'
-    ))
+#~ c['sources'].append(SVNPoller(
+    #~ 'http://svn.boost.org/svn/boost/trunk'
+    #~ ))
 c['sources'].append(PBChangeSource())
 c['sources'].append(PBChangeSource())
 
 
 
 

+ 2 - 1
tools/buildbot/src/boost/bot/remote.py

@@ -36,7 +36,8 @@ class LoggedShellCommand(ShellCommand):
             ,sendStderr = kwargs.get('sendStderr',True)
             ,sendStderr = kwargs.get('sendStderr',True)
             ,sendRC = kwargs.get('sendRC',True)
             ,sendRC = kwargs.get('sendRC',True)
             ,timeout = kwargs.get('timeout',None)
             ,timeout = kwargs.get('timeout',None)
-            ,stdin = kwargs.get('stdin',None)
+            ,initialStdin = kwargs.get('stdin',kwargs.get('initialStdin',None))
+            ,keepStdinOpen = kwargs.get('keepStdinOpen',False)
             ,keepStdout = kwargs.get('keepStdout',False)
             ,keepStdout = kwargs.get('keepStdout',False)
             )
             )
         self.logfile = None
         self.logfile = None

粤ICP备19079148号