Qt API test buildstep throws exception after buildmaster update

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

This patch based on Peter Gal's work.

Patch by Kristóf Kosztyó <kkristof@inf.u-szeged.hu> on 2012-03-06
Reviewed by Csaba Osztrogonác.

* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(RunQtAPITests):
(BuildAndTestFactory.__init__): Enable API tests on the Qt platform again.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@109901 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
index 1d889bc..ad695ba 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
@@ -553,11 +553,8 @@ class RunQtAPITests(shell.Test):
     descriptionDone = ["API tests"]
     command = ["python", "./Tools/Scripts/run-qtwebkit-tests",
                "--output-file=qt-unit-tests.html", "--do-not-open-results", "--timeout=120",
-               WithProperties("WebKitBuild/%(configuration_pretty)s/Source/WebKit/qt/tests/")]
-
-    def start(self):
-        self.setProperty("configuration_pretty", self.getProperty("configuration").title())
-        return shell.Test.start(self)
+               WithProperties("WebKitBuild/%(configuration_pretty)s/Source/WebKit/qt/tests/", configuration_pretty=lambda build: build.getProperty("configuration").title())
+                ]
 
     def commandComplete(self, cmd):
         shell.Test.commandComplete(self, cmd)
@@ -758,10 +755,8 @@ class BuildAndTestFactory(Factory):
         self.addStep(self.ExtractTestResultsClass)
         if platform == "gtk":
             self.addStep(RunGtkAPITests)
-# Qt API test buildstep throws exception after buildmaster update
-# https://bugs.webkit.org/show_bug.cgi?id=80249
-#        if platform == "qt":
-#            self.addStep(RunQtAPITests)
+        if platform == "qt":
+            self.addStep(RunQtAPITests)
 
 class BuildAndTestLeaksFactory(BuildAndTestFactory):
     TestClass = RunWebKitLeakTests

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index fb10f0e..8dd433d 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2012-03-06  Kristóf Kosztyó  <kkristof@inf.u-szeged.hu>
+
+        Qt API test buildstep throws exception after buildmaster update
+        https://bugs.webkit.org/show_bug.cgi?id=80249
+
+        This patch based on Peter Gal's work.
+
+        Reviewed by Csaba Osztrogonác.
+
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+        (RunQtAPITests):
+        (BuildAndTestFactory.__init__): Enable API tests on the Qt platform again.
+
 2012-03-06  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 
         [Qt] Use correct define names for HAVE(FOO) style optional dependencies