[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[ossy at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit c9ef151f631c6aa96ef1cf451f145510b087d9bc
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 8 10:50:48 2010 +0000

    Enable running of Qt API tests on BuildBot
    https://bugs.webkit.org/show_bug.cgi?id=49004
    
    Patch by Gabor Rapcsanyi <rgabor at inf.u-szeged.hu> on 2010-11-08
    Reviewed by Csaba Osztrogonác.
    
    * BuildSlaveSupport/build.webkit.org-config/master.cfg:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71509 268f45cc-cd09-0410-ab3c-d52691b4dbfc

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
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b4f3f31..cf231bb 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-08  Gabor Rapcsanyi  <rgabor at inf.u-szeged.hu>
+
+        Reviewed by Csaba Osztrogonác.
+
+        Enable running of Qt API tests on BuildBot
+        https://bugs.webkit.org/show_bug.cgi?id=49004
+
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+
 2010-11-08  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.

-- 
WebKit Debian packaging