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

tony at chromium.org tony at chromium.org
Wed Dec 22 13:49:49 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit effb21d98a33088ee42757625c10e4ef367683a4
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 28 00:01:10 2010 +0000

    2010-09-27  Tony Chang  <tony at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            add webkit unit tests to the chromium testers
            https://bugs.webkit.org/show_bug.cgi?id=46669
    
            * BuildSlaveSupport/build.webkit.org-config/master.cfg:
            * Scripts/run-chromium-webkit-unit-tests: Fix a bug where we weren't using the right configuration.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68450 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 aca3c65..d5cd6fb 100644
--- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg
+++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg
@@ -317,6 +317,14 @@ class RunWebKit2Tests(RunWebKitTests):
         return RunWebKitTests.start(self)
 
 
+class RunChromiumWebKitUnitTests(shell.Test):
+    name = "webkit-unit-tests"
+    description = ["webkit-unit-tests running"]
+    descriptionDone = ["webkit-unit-tests"]
+    command = ["perl", "./WebKitTools/Scripts/run-chromium-webkit-unit-tests",
+               WithProperties("--%(configuration)s")]
+
+
 class ArchiveTestResults(shell.ShellCommand):
     command = ["python", "./WebKitTools/BuildSlaveSupport/test-result-archive",
                WithProperties("--platform=%(platform)s"), WithProperties("--%(configuration)s"), "archive"]
@@ -399,6 +407,8 @@ class BuildAndTestFactory(Factory):
         self.addStep(CompileWebKit)
         if not platform.startswith("chromium"):
             self.addStep(RunJavaScriptCoreTests)
+        if platform.startswith("chromium"):
+            self.addStep(RunChromiumWebKitUnitTests)
         self.addStep(self.TestClass)
         # 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.
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 272d161..7360d0d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-27  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        add webkit unit tests to the chromium testers
+        https://bugs.webkit.org/show_bug.cgi?id=46669
+
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+        * Scripts/run-chromium-webkit-unit-tests: Fix a bug where we weren't using the right configuration.
+
 2010-09-27  Kwang Yul Seo  <skyul at company100.net>
 
         Unreviewed.
diff --git a/WebKitTools/Scripts/run-chromium-webkit-unit-tests b/WebKitTools/Scripts/run-chromium-webkit-unit-tests
index 93d0c1d..62646af 100755
--- a/WebKitTools/Scripts/run-chromium-webkit-unit-tests
+++ b/WebKitTools/Scripts/run-chromium-webkit-unit-tests
@@ -37,6 +37,8 @@ use webkitdirs;
 my $sourceRootDir = File::Spec->catfile($FindBin::Bin, "../..");
 chdir($sourceRootDir);
 
+setConfiguration();
+
 my $pathToBinary;
 if (isDarwin()) {
     $pathToBinary = "WebKit/chromium/xcodebuild/" . configuration() . "/webkit_unit_tests";

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list