Commit 49b9b084 authored by ossy@webkit.org's avatar ossy@webkit.org

master.cfg cleanup

https://bugs.webkit.org/show_bug.cgi?id=113195

Reviewed by Ryosuke Niwa.

* BuildSlaveSupport/build.webkit.org-config/config.json:
* BuildSlaveSupport/build.webkit.org-config/master.cfg:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146990 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 7fcf10b8
......@@ -2,9 +2,9 @@
"slaves": [ { "name": "test-slave", "platform": "*" },
{ "name": "apple-macpro-4", "platform": "mac-lion" },
{ "name": "apple-macpro-5", "platform": "mac-lion" },
{ "name": "apple-macpro-5", "platform": "mac-lion" },
{ "name": "apple-macpro-6", "platform": "mac-lion" },
{ "name": "apple-macpro-8", "platform": "mac-lion" },
{ "name": "apple-macpro-8", "platform": "mac-lion" },
{ "name": "apple-xserve-2", "platform": "mac-lion" },
{ "name": "apple-xserve-3", "platform": "mac-lion" },
{ "name": "apple-xserve-10", "platform": "mac-lion" },
......@@ -20,7 +20,7 @@
{ "name": "apple-mini-208", "platform": "mac-mountainlion"},
{ "name": "apple-mini-209", "platform": "mac-mountainlion"},
{ "name": "apple-mini-210", "platform": "mac-mountainlion"},
{ "name": "apple-windows-1", "platform": "win"},
{ "name": "apple-windows-2", "platform": "win"},
{ "name": "apple-windows-3", "platform": "win"},
......@@ -33,8 +33,8 @@
{ "name": "gtk-linux-slave-3", "platform": "gtk"},
{ "name": "gtk-linux-slave-4", "platform": "gtk"},
{ "name": "szeged-linux-1", "platform": "qt-4.8"},
{ "name": "szeged-linux-2", "platform": "qt-4.8"},
{ "name": "szeged-linux-1", "platform": "qt-5.0-wk1"},
{ "name": "szeged-linux-2", "platform": "qt-5.0-wk1"},
{ "name": "szeged-linux-3", "platform": "qt-5.0-wk1"},
{ "name": "szeged-linux-4", "platform": "qt-arm"},
{ "name": "szeged-linux-5", "platform": "qt-5.0-wk2"},
......@@ -64,7 +64,7 @@
{ "name": "wincairo-1", "platform": "wincairo" },
{ "name": "wince-1", "platform": "wince" },
{ "name": "efl-linux-slave-1", "platform": "efl" },
{ "name": "efl-linux-slave-2", "platform": "efl" },
{ "name": "efl-linux-slave-3", "platform": "efl" },
......@@ -187,14 +187,14 @@
},
{
"name": "Qt Linux Release", "type": "BuildAndTest", "builddir": "qt-linux-release",
"platform": "qt-4.8", "configuration": "release", "architectures": ["i386"],
"platform": "qt-5.0-wk1", "configuration": "release", "architectures": ["i386"],
"SVNMirror": "svn://webkit.inf.u-szeged.hu/webkit/",
"slavenames": ["szeged-linux-1"]
},
{
"name": "Qt Linux Release minimal", "type": "Build", "builddir": "qt-linux-release-minimal",
"SVNMirror": "svn://webkit.inf.u-szeged.hu/webkit/",
"platform": "qt-4.8", "configuration": "release", "architectures": ["i386"],
"platform": "qt-5.0-wk1", "configuration": "release", "architectures": ["i386"],
"slavenames": ["szeged-linux-2"]
},
{
......
......@@ -42,7 +42,7 @@ authz = Authz(
cleanShutdown=False)
c['status'] = []
c['status'].append(html.WebStatus(http_port=8710,
c['status'].append(html.WebStatus(http_port=8710,
revlink="http://trac.webkit.org/changeset/%s",
authz=authz))
......@@ -340,7 +340,6 @@ class RunWebKitTests(shell.Test):
self.setCommand(self.command + ['--no-build'])
if shouldAbortEarly:
self.setCommand(self.command + ["--exit-after-n-crashes-or-timeouts", "20", "--exit-after-n-failures", "500"])
if platform == "win":
rootArgument = ['--root=' + os.path.join("WebKitBuild", self.getProperty('configuration'), "bin")]
self.setCommand(self.command + ['--no-build', '--use-remote-links-to-tests'])
......
2013-03-27 Csaba Osztrogonác <ossy@webkit.org>
master.cfg cleanup
https://bugs.webkit.org/show_bug.cgi?id=113195
Reviewed by Ryosuke Niwa.
* BuildSlaveSupport/build.webkit.org-config/config.json:
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
2013-03-27 Csaba Osztrogonác <ossy@webkit.org>
master.cfg fine-tuning for Qt Mountain Lion Release bot
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment