diff options
Diffstat (limited to 'WebKitTools/BuildSlaveSupport/build.webkit.org-config')
| -rw-r--r-- | WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json | 8 | ||||
| -rw-r--r-- | WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg | 47 |
2 files changed, 51 insertions, 4 deletions
diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json index 71c20f0..f39e10c 100644 --- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json +++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json @@ -91,7 +91,7 @@ { "name": "Windows Release (Build)", "type": "Build", "builddir": "win-release", "platform": "win", "configuration": "release", "architectures": ["i386"], - "triggers": ["win-release-tests"], + "triggers": ["win-release-tests", "win-release-tests-wk2"], "slavenames": ["apple-windows-2", "test-slave"] }, { @@ -102,7 +102,7 @@ { "name": "Windows Debug (Build)", "type": "Build", "builddir": "win-debug", "platform": "win", "configuration": "debug", "architectures": ["i386"], - "triggers": ["win-debug-tests", "win-debug-tests-wk2"], + "triggers": ["win-debug-tests"], "slavenames": ["apple-windows-1", "test-slave"] }, { @@ -240,8 +240,8 @@ { "type": "Triggerable", "name": "win-debug-tests", "builderNames": ["Windows Debug (Tests)"] }, - { "type": "Triggerable", "name": "win-debug-tests-wk2", - "builderNames": ["Windows Debug (WebKit2 Tests)"] + { "type": "Triggerable", "name": "win-release-tests-wk2", + "builderNames": ["Windows Release (WebKit2 Tests)"] } ] } diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg index 5c44525..97641bf 100644 --- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg +++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg @@ -305,6 +305,51 @@ class RunGtkAPITests(shell.Test): return [self.name] +class RunQtAPITests(shell.Test): + name = "API tests" + description = ["API tests running"] + descriptionDone = ["API tests"] + command = ["python", "./WebKitTools/Scripts/run-qtwebkit-tests", + "--output-file=qt-unit-tests.html", "--do-not-open-results", + WithProperties("WebKitBuild/%(configuration_pretty)s/WebKit/qt/tests/")] + + def start(self): + self.setProperty("configuration_pretty", self.getProperty("configuration").title()) + return shell.Test.start(self) + + def commandComplete(self, cmd): + shell.Test.commandComplete(self, cmd) + + logText = cmd.logs['stdio'].getText() + foundItems = re.findall("TOTALS: (?P<passed>\d+) passed, (?P<failed>\d+) failed, (?P<skipped>\d+) skipped", logText) + + self.incorrectTests = 0 + self.statusLine = [] + + if foundItems: + self.incorrectTests = int(foundItems[0][1]) + if self.incorrectTests > 0: + self.statusLine = [ + "%s passed, %s failed, %s skipped" % (foundItems[0][0], foundItems[0][1], foundItems[0][2]) + ] + + def evaluateCommand(self, cmd): + if self.incorrectTests: + return WARNINGS + + if cmd.rc != 0: + return FAILURE + + return SUCCESS + + def getText(self, cmd, results): + return self.getText2(cmd, results) + + def getText2(self, cmd, results): + if results != SUCCESS and self.incorrectTests: + return self.statusLine + + return [self.name] class RunWebKitLeakTests(RunWebKitTests): def start(self): @@ -421,6 +466,8 @@ class BuildAndTestFactory(Factory): self.addStep(ExtractTestResults) if platform == "gtk": self.addStep(RunGtkAPITests) + if platform == "qt": + self.addStep(RunQtAPITests) class BuildAndTestLeaksFactory(BuildAndTestFactory): TestClass = RunWebKitLeakTests |