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

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit ee1670f792e137805855485f314cc9b4e8bcbdbc
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 26 20:53:44 2009 +0000

    2009-10-26  Carol Szabo  <carol.szabo at nokia.com>
    
            Reviewed by David Levin.
    
            REGRESSION: 2 failures in run-webkit-unittests
            https://bugs.webkit.org/show_bug.cgi?id=30645
    
            * Scripts/modules/cpp_style_unittest.py:
            Fixed a few test scenarios which apparently lost some spaces from
            text literals.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50091 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b14bb0a..87475a9 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-26  Carol Szabo  <carol.szabo at nokia.com>
+
+        Reviewed by David Levin.
+
+        REGRESSION: 2 failures in run-webkit-unittests
+        https://bugs.webkit.org/show_bug.cgi?id=30645
+
+        * Scripts/modules/cpp_style_unittest.py:
+        Fixed a few test scenarios which apparently lost some spaces from 
+        text literals.
+
 2009-10-26  Kevin Ollivier  <kevino at theolliviers.com>
 
         wx build fix. Make sure isQt() doesn't return true if --wx was passed to build-webkit.
diff --git a/WebKitTools/Scripts/modules/cpp_style_unittest.py b/WebKitTools/Scripts/modules/cpp_style_unittest.py
index 5603d51..d5637f4 100644
--- a/WebKitTools/Scripts/modules/cpp_style_unittest.py
+++ b/WebKitTools/Scripts/modules/cpp_style_unittest.py
@@ -2819,12 +2819,12 @@ class WebKitStyleTest(CppStyleTestBase):
             '    int myVariable;\n'
             '};\n'
             '}',
-            'Code inside a namespace should not be indented.  [whitespace/indent] [4]',
+            '',
             'foo.h')
         self.assert_multi_line_lint(
             'namespace OuterNamespace {\n'
-            'namespace InnerNamespace {\n'
-            'class Document {\n'
+            '    namespace InnerNamespace {\n'
+            '    class Document {\n'
             '};\n'
             '};\n'
             '}',
@@ -2833,7 +2833,7 @@ class WebKitStyleTest(CppStyleTestBase):
         self.assert_multi_line_lint(
             'namespace WebCore {\n'
             '#if 0\n'
-            'class Document {\n'
+            '    class Document {\n'
             '};\n'
             '#endif\n'
             '}',
@@ -3306,7 +3306,7 @@ class WebKitStyleTest(CppStyleTestBase):
             'namespace WebCore {\n'
             'int foo;\n'
             '};\n',
-            'Code inside a namespace should not be indented.  [whitespace/indent] [4]')
+            '')
         self.assert_multi_line_lint(
             'for (int i = 0; i < 10; i++) {\n'
             '    DoSomething();\n'

-- 
WebKit Debian packaging