diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg')
| -rw-r--r-- | Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg index 1ce5b88..4ee277c 100644 --- a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg +++ b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg @@ -318,8 +318,8 @@ class RunQtAPITests(shell.Test): description = ["API tests running"] descriptionDone = ["API tests"] command = ["python", "./Tools/Scripts/run-qtwebkit-tests", - "--output-file=qt-unit-tests.html", "--do-not-open-results", "--timeout=30", - WithProperties("WebKitBuild/%(configuration_pretty)s/Source/WebKit/qt/tests/")] + "--output-file=qt-unit-tests.html", "--do-not-open-results", "--timeout=120", + WithProperties("WebKitBuild/%(configuration_pretty)s/WebKit/qt/tests/")] def start(self): self.setProperty("configuration_pretty", self.getProperty("configuration").title()) @@ -445,9 +445,10 @@ class TestFactory(Factory): self.addStep(self.TestClass, skipBuild=(platform == 'win')) # Tiger's Python 2.3 is too old. WebKit Python requires 2.5+. # Sadly we have no way to detect the version on the slave from here. - if platform != "mac-tiger": + if platform != "mac-tiger" and platform != "chromium-win": self.addStep(RunPythonTests) - self.addStep(RunPerlTests) + if platform != "chromium-win": + self.addStep(RunPerlTests) self.addStep(ArchiveTestResults) self.addStep(UploadTestResults) self.addStep(ExtractTestResults) |