generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Disabling PTY for mv command on Android bot.

Browse Source 
BUG=None
TEST=Tested on local master with the Android bot slave.

Review URL: https://webrtc-codereview.appspot.com/552004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2158 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2012-05-02 07:45:27 +00:00
parent 719dba7e79
commit 1e1dd170e0
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tools/continuous_build/build_internal/scripts/webrtc_buildbot/utils.py
View File

@ -132,7 +132,7 @@ class WebRTCFactory(factory.BuildFactory):
def AddCommonStep(self, cmd, descriptor='', workdir=WEBRTC_TRUNK_DIR,
halt_build_on_failure=True, warn_on_failure=False,
timeout=1200):
timeout=1200, use_pty=True):
"""Adds a step which will run as a shell command on the slave.
NOTE: you are recommended to use this method to add new shell commands
@ -158,6 +158,12 @@ class WebRTCFactory(factory.BuildFactory):
warn_on_failure: If true, this step isn't that important and will not
cause a failed build on failure.
timeout: The timeout for the command, in seconds.
use_pty: If Pseudo-terminal shall be enabled for the command. This is
needed if stdout and stderr output shall be collected
separately, which is useful to make it possible to color-code
stderr output with red in the web interface. Some shell
commands seem to fail when Pseudo-terminal is enabled on
Linux.
"""
flunk_on_failure = not warn_on_failure
@ -177,7 +183,8 @@ class WebRTCFactory(factory.BuildFactory):
flunkOnFailure=flunk_on_failure,
haltOnFailure=halt_build_on_failure,
name='_'.join(descriptor),
timeout=timeout))
timeout=timeout,
usePTY=use_pty))
def AddSmartCleanStep(self):
"""Adds a smart clean step.
@ -226,16 +233,16 @@ class WebRTCFactory(factory.BuildFactory):
self.AddCommonTestRunStep(test)
def AddGclientSyncStep(self, workdir=WEBRTC_BUILD_DIR,
alwaysUseLatest=False):
always_use_latest=False):
"""Helper method for invoking gclient sync.
Args:
workdir: The name of the directory to checkout the source into.
The default is 'build' which is the base working dir of
most build slaves.
alwaysUseLatest: Set to true to always use the latest build, otherwise
the highest revision in the changeset will be used
for sync.
always_use_latest: Set to true to always use the latest build,
otherwise the highest revision in the changeset will
be used for sync.
"""
gclient_spec = self._ConfigureWhatToBuild()
env = self._GetEnvironmentWithDisabledDepotToolsUpdate()
@ -248,7 +255,7 @@ class WebRTCFactory(factory.BuildFactory):
# Removal can take a long time. Allow 15 minutes.
rm_timeout = 60 * 15
self.addStep(chromium_step.GClient,
alwaysUseLatest=alwaysUseLatest,
alwaysUseLatest=always_use_latest,
gclient_spec=gclient_spec,
workdir=workdir,
mode='update',
@ -480,7 +487,7 @@ class WebRTCAndroidFactory(WebRTCFactory):
# Work around lack of support for checking out into another dir than the
# last dir of the Subversion URL.
self.AddCommonStep(cmd='mv external/webrtc/trunk/* external/webrtc',
descriptor='Prepare WebRTC source')
use_pty=False, descriptor='Prepare WebRTC source')
cmd = ('source build/envsetup.sh && lunch full_%s-eng '
'&& mmm external/webrtc showcommands' % product)
self.AddCommonStep(cmd, descriptor='build')
@ -525,7 +532,7 @@ class WebRTCChromeFactory(WebRTCFactory):
def EnableBuild(self, release=False, enable_profiling=False):
self.AddCommonStep(['rm', '-rf', 'src'], workdir=WEBRTC_BUILD_DIR,
descriptor='Cleanup')
self.AddGclientSyncStep(alwaysUseLatest=True)
self.AddGclientSyncStep(always_use_latest=True)
if enable_profiling:
self.AddCommonStep(['./build/gyp_chromium', '-Dprofiling=1'],
descriptor="gyp_chromium",