[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[kov at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 81d87c7e1164070a4679fe15ec44c23608b08f4e
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 18 13:32:19 2010 +0000

    2009-12-05  Gustavo Noronha Silva  <gns at gnome.org>
    
            Reviewed by Eric Seidel.
    
            Enable running of GTK+ API tests.
    
            * BuildSlaveSupport/build.webkit.org-config/master.cfg:
            * Scripts/run-gtk-tests: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54956 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 cd81108..1823277 100644
--- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg
+++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg
@@ -230,6 +230,42 @@ class RunWebKitTests(shell.Test):
         return [self.name]
 
 
+class RunGtkAPITests(shell.Test):
+    name = "API tests"
+    description = ["API tests running"]
+    descriptionDone = ["API tests"]
+    command = ["perl", "./WebKitTools/Scripts/run-gtk-tests", WithProperties("--%(configuration)s")]
+
+    def commandComplete(self, cmd):
+        shell.Test.commandComplete(self, cmd)
+
+        logText = cmd.logs['stdio'].getText()
+        incorrectLines = []
+        for line in logText.splitlines():
+            if line.startswith('ERROR'):
+                incorrectLines.append(line)
+
+        self.incorrectLines = incorrectLines
+
+    def evaluateCommand(self, cmd):
+        if self.incorrectLines:
+            return FAILURE
+
+        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.incorrectLines:
+            return ["%d API tests failed" % self.incorrectLines]
+
+        return [self.name]
+
+
 class RunWebKitLeakTests(RunWebKitTests):
     def start(self):
         self.setCommand(self.command + ["--leaks"])
@@ -312,6 +348,8 @@ class BuildAndTestFactory(Factory):
         self.addStep(ArchiveTestResults)
         self.addStep(UploadTestResults)
         self.addStep(ExtractTestResults)
+        if platform == "gtk":
+            self.addStep(RunGtkAPITests)
 
 class BuildAndTestLeaksFactory(BuildAndTestFactory):
     TestClass = RunWebKitLeakTests
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 97206c7..37de737 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-05  Gustavo Noronha Silva  <gns at gnome.org>
+
+        Reviewed by Eric Seidel.
+
+        Enable running of GTK+ API tests.
+
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+        * Scripts/run-gtk-tests: Added.
+
 2010-02-18  Shinichiro Hamaji  <hamaji at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/run-gtk-tests b/WebKitTools/Scripts/run-gtk-tests
new file mode 100644
index 0000000..9a57319
--- /dev/null
+++ b/WebKitTools/Scripts/run-gtk-tests
@@ -0,0 +1,35 @@
+#!/usr/bin/perl
+#
+# Copyright (C) 2009 Gustavo Noronha Silva <gns at gnome.org>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with this library; see the file COPYING.LIB.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+
+use strict;
+use warnings;
+
+use FindBin;
+use lib $FindBin::Bin;
+use webkitdirs;
+
+# This initializes the correct configuration (Release/Debug)
+setConfiguration();
+
+my $productDir = productDir();
+my @unitTests = glob  $productDir . "/Programs/unittests/*";
+if ($#unitTests < 1) {
+    die "ERROR: tests not found in $productDir.\n";
+}
+system "gtester -k @unitTests"

-- 
WebKit Debian packaging