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

Introduced the new Mac Release bot.

Browse Source 
NOTE: Possibly rename slave folder on master to mac-slave-3 from mac-slave-1 to keep history. Not sure if it is a good idea.

BUG=
TEST=

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1642 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
phoglund@webrtc.org 2012-02-08 14:36:22 +00:00
parent 13ac430bef
commit 0da6c85cfa
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tools/continuous_build/master.cfg
View File

@ -39,7 +39,8 @@ c['slaves'] = [BuildSlave("android", "pass", max_builds=1),
BuildSlave("linux-slave-gcc-4.6", "pass", max_builds=1), BuildSlave("linux-slave-gcc-4.6", "pass", max_builds=1),
BuildSlave("linux-valgrind", "pass", max_builds=1), BuildSlave("linux-valgrind", "pass", max_builds=1),
BuildSlave("linux_video", "pass", max_builds=1), BuildSlave("linux_video", "pass", max_builds=1),
BuildSlave("mac-slave-1", "pass", max_builds=1), BuildSlave("mac-slave-3", "pass", max_builds=1),
BuildSlave("mac-slave-2", "pass", max_builds=1),
BuildSlave("win-slave", "pass", max_builds=1), BuildSlave("win-slave", "pass", max_builds=1),
BuildSlave("win-slave32", "pass", max_builds=1)] BuildSlave("win-slave32", "pass", max_builds=1)]
@ -70,7 +71,8 @@ from buildbot.scheduler import Scheduler
webrtc_scheduler = Scheduler(name="all", branch=None, treeStableTimer=5*60, webrtc_scheduler = Scheduler(name="all", branch=None, treeStableTimer=5*60,
builderNames=["Win32Debug", builderNames=["Win32Debug",
"Win32Release", "Win32Release",
"MacOS", "MacOS32DBG",
"MacOS32Release",
"Linux32DBG", "Linux32DBG",
"Linux32Release", "Linux32Release",
"Linux64DBG", "Linux64DBG",
@ -142,7 +144,7 @@ NORMAL_TESTS = {
"video_engine_core_unittests": (True, True, True), "video_engine_core_unittests": (True, True, True),
"video_processing_unittests": (True, True, True), "video_processing_unittests": (True, True, True),
"voice_engine_unittests": (True, True, True), "voice_engine_unittests": (True, True, True),
"vp8_unittests": (True, True, True), "vp8_unittests": (True, False, True), # Issue 273.
"webrtc_utility_unittests": (True, True, False), "webrtc_utility_unittests": (True, True, False),
} }
@ -210,9 +212,13 @@ valgrind_tests = filter(lambda test: test not in VALGRIND_DISABLED_TESTS,
linux_valgrind.EnableTests(valgrind_tests) linux_valgrind.EnableTests(valgrind_tests)
############## Mac Builders ####################################### ############## Mac Builders #######################################
mac_factory = utils.WebRTCMacFactory() mac_factory_32_dbg = utils.WebRTCMacFactory()
mac_factory.EnableBuild(build_type="both") mac_factory_32_dbg.EnableBuild(build_type="both")
mac_factory.EnableTests(mac_normal_tests) mac_factory_32_dbg.EnableTests(mac_normal_tests)
mac_factory_32_release = utils.WebRTCMacFactory()
mac_factory_32_release.EnableBuild(build_type="both", release=True)
mac_factory_32_release.EnableTests(mac_normal_tests)
############# Windows Builders ####################################### ############# Windows Builders #######################################
win_factory_32_Debug = utils.WebRTCWinFactory() win_factory_32_Debug = utils.WebRTCWinFactory()
@ -251,10 +257,16 @@ linux_builder_32_debug = {
'factory': linux_factory_32_dbg, 'factory': linux_factory_32_dbg,
} }
mac_builder_32_debug = { mac_builder_32_debug = {
'name': "MacOS", 'name': "MacOS32DBG",
'slavename': "mac-slave-1", 'slavename': "mac-slave-3",
'builddir': "mac-slave-1", 'builddir': "mac-slave-3",
'factory': mac_factory, 'factory': mac_factory_32_dbg,
}
mac_builder_32_release = {
'name': "MacOS32Release",
'slavename': "mac-slave-2",
'builddir': "mac-slave-2",
'factory': mac_factory_32_release,
} }
chromeos_builder = { chromeos_builder = {
'name': "ChromeOS", 'name': "ChromeOS",
@ -308,6 +320,7 @@ c['builders'] = [
win_builder_32_debug, win_builder_32_debug,
win_builder_32_release, win_builder_32_release,
mac_builder_32_debug, mac_builder_32_debug,
mac_builder_32_release,
linux_builder_32_debug, linux_builder_32_debug,
linux_builder_32_release, linux_builder_32_release,
linux_builder_64_release, linux_builder_64_release,

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

@ -453,11 +453,14 @@ class WebRTCMacFactory(WebRTCFactory):
cmd = ["make", make, "-j100"] cmd = ["make", make, "-j100"]
if make_extra is not None: if make_extra is not None:
cmd.append(make_extra) cmd.append(make_extra)
if self.release:
cmd.append("BUILDTYPE=Release")
self.AddCommonStep(cmd, descriptor=make_descriptor+["(make)"], self.AddCommonStep(cmd, descriptor=make_descriptor+["(make)"],
workdir="build/trunk") workdir="build/trunk")
if self.build_type == "xcode" or self.build_type == "both": if self.build_type == "xcode" or self.build_type == "both":
configuration = "Release" if self.release else "Debug"
cmd = ["xcodebuild", "-project", "webrtc.xcodeproj", "-configuration", cmd = ["xcodebuild", "-project", "webrtc.xcodeproj", "-configuration",
"Debug", "-target", "All"] configuration, "-target", "All"]
self.AddCommonStep(cmd, descriptor=make_descriptor+["(xcode)"], self.AddCommonStep(cmd, descriptor=make_descriptor+["(xcode)"],
workdir="build/trunk") workdir="build/trunk")