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

Making Mac bots only run tests for xcode built tests when both is configured.

Browse Source 
So now it will do like this, depending on build type:
* xcode: build all with xcode projects and run the xcode built tests.
* make: build all with makefile projects and run the makefile built tests
* both: build all with xcode projects, then build all with makefile projects, then run the xcode built tests only (not the makefile built ones)

BUG=None
TEST=Run on local master.

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1758 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2012-02-24 09:03:02 +00:00
parent bfa7f96d1e
commit 5545f38e41
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tools/continuous_build/webrtc_buildbot/utils.py
View File

@ -651,17 +651,18 @@ class WebRTCMacFactory(WebRTCFactory):
workdir='build/trunk'):
descriptor = [test, extra_text] if extra_text else [test]
if cmd is None:
out_path = 'xcodebuild' if self.build_type == 'xcode' else 'out'
test_folder = 'Release' if self.release else 'Debug'
if self.build_type == 'xcode' or self.build_type == 'both':
cmd = ['xcodebuild/%s/%s' % (test_folder, test)]
self.AddCommonStep(cmd, descriptor=descriptor + ['(xcode)'],
halt_build_on_failure=False,
workdir=workdir)
if self.build_type == 'make' or self.build_type == 'both':
cmd = ['out/%s/%s' % (test_folder, test)]
self.AddCommonStep(cmd, descriptor=descriptor + ['(make)'],
halt_build_on_failure=False,
workdir=workdir)
cmd = ['%s/%s/%s' % (out_path, test_folder, test)]
if self.build_type == 'xcode' or self.build_type == 'both':
self.AddCommonStep(cmd, descriptor=descriptor + ['(xcode)'],
halt_build_on_failure=False, workdir=workdir)
# Execute test only for 'make' build type.
# If 'both' is enabled we'll only execute the 'xcode' built ones.
if self.build_type == 'make':
self.AddCommonStep(cmd, descriptor=descriptor + ['(make)'],
halt_build_on_failure=False, workdir=workdir)
def AddCommonMakeStep(self, target, extra_text=None, make_extra=None):
descriptor = [target, extra_text] if extra_text else [target]
@ -734,17 +735,16 @@ class WebRTCWinFactory(WebRTCFactory):
def AddCommonTestRunStep(self, test, cmd=None, workdir='build/trunk'):
descriptor = [test]
if cmd is None:
if self.configuration == 'Debug' or self.configuration == 'both':
if self.configuration == 'Debug' or self.configuration == 'both':
if cmd is None:
cmd = ['build\Debug\%s.exe' % test]
self.AddCommonStep(cmd, descriptor=descriptor,
halt_build_on_failure=False,
workdir=workdir)
if self.configuration == 'Release' or self.configuration == 'both':
self.AddCommonStep(cmd, descriptor=descriptor,
halt_build_on_failure=False, workdir=workdir)
if self.configuration == 'Release' or self.configuration == 'both':
if cmd is None:
cmd = ['build\Release\%s.exe' % test]
self.AddCommonStep(cmd, descriptor=descriptor,
halt_build_on_failure=False,
workdir=workdir)
self.AddCommonStep(cmd, descriptor=descriptor,
halt_build_on_failure=False, workdir=workdir)
# Utility functions