[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[dbates at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 557ad8a8c4d111b29f1914c0fb8940e32f125d64
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 27 19:12:49 2009 +0000

    2009-12-27  Daniel Bates  <dbates at webkit.org>
    
            Reviewed by Eric Seidel.
    
            https://bugs.webkit.org/show_bug.cgi?id=32964
    
            [bzt] Updated the unit test based on the change made in bug #32951.
    
            The change made in bug #32951 added the command-line argument:
            --makeargs="-j8" to the build-webkit command. However, the associated
            unit test was not updated.
    
            * Scripts/modules/webkitport_unittest.py:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52582 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 2a21b1c..b388e6f 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2009-12-27  Daniel Bates  <dbates at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32964
+
+        [bzt] Updated the unit test based on the change made in bug #32951.
+
+        The change made in bug #32951 added the command-line argument:
+        --makeargs="-j8" to the build-webkit command. However, the associated
+        unit test was not updated.
+
+        * Scripts/modules/webkitport_unittest.py:
+
 2009-12-27  Yael Aharon  <yael.aharon at nokia.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKitTools/Scripts/modules/webkitport_unittest.py b/WebKitTools/Scripts/modules/webkitport_unittest.py
index e44b9a6..f00edbc 100644
--- a/WebKitTools/Scripts/modules/webkitport_unittest.py
+++ b/WebKitTools/Scripts/modules/webkitport_unittest.py
@@ -48,7 +48,7 @@ class WebKitPortTest(unittest.TestCase):
         self.assertEquals(QtPort.name(), "Qt")
         self.assertEquals(QtPort.flag(), "--port=qt")
         self.assertEquals(QtPort.run_webkit_tests_command(), [WebKitPort.script_path("run-webkit-tests")])
-        self.assertEquals(QtPort.build_webkit_command(), [WebKitPort.script_path("build-webkit"), "--qt"])
+        self.assertEquals(QtPort.build_webkit_command(), [WebKitPort.script_path("build-webkit"), "--qt", '--makeargs="-j8"'])
 
     def test_chromium_port(self):
         self.assertEquals(ChromiumPort.name(), "Chromium")

-- 
WebKit Debian packaging