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

pfeldman at chromium.org pfeldman at chromium.org
Wed Apr 7 23:45:12 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit 911c3fa568ce450cb95e1ca749ae0751afcb8dc8
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 17 13:38:31 2009 +0000

    2009-11-17  Pavel Feldman  <pfeldman at chromium.org>
    
            Not reviewed, build fix. Follow up to r51072: rename skipped entries
            for the tests that were moved. Also skipped console tests on GTK
            while investigating and touched Interfaces.vcproj to clobber win bot.
    
            * platform/gtk/Skipped:
            * platform/qt/Skipped:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51073 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 14de674..9328e4b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,13 @@
 2009-11-17  Pavel Feldman  <pfeldman at chromium.org>
 
+        Not reviewed, build fix. Follow up to r51072: rename skipped entries
+        for the tests that were moved.
+        
+        * platform/gtk/Skipped:
+        * platform/qt/Skipped:
+
+2009-11-17  Pavel Feldman  <pfeldman at chromium.org>
+
         Reviewed by Timothy Hatcher.
 
         Web Inspector: Make DRT show web inspector for tests in inspector/ folder.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 6dc69da..26325ae 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -2540,8 +2540,8 @@ fast/innerHTML/001.html
 fast/innerHTML/002.html
 fast/innerHTML/003.html
 fast/innerHTML/006.html
-fast/inspector/matchedrules.html
-fast/inspector/style.html
+fast/inspector-support/matchedrules.html
+fast/inspector-support/style.html
 fast/invalid/001.html
 fast/invalid/002.html
 fast/invalid/003.html
diff --git a/LayoutTests/platform/mac-tiger/Skipped b/LayoutTests/platform/mac-tiger/Skipped
index 880a4ab..29e9ff6 100644
--- a/LayoutTests/platform/mac-tiger/Skipped
+++ b/LayoutTests/platform/mac-tiger/Skipped
@@ -73,3 +73,11 @@ accessibility/aria-list-and-listitem.html
 # Tests time out on Tiger
 # https://bugs.webkit.org/show_bug.cgi?id=31501
 websocket
+
+# Console tests fail on Linux.
+# https://bugs.webkit.org/show_bug.cgi?id=31582
+inspector/console-dir.html
+inspector/console-dirxml.html
+inspector/console-format-collections.html
+inspector/console-format.html
+inspector/console-tests.html
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 3ec5bf6..6c8eab9 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -3018,8 +3018,8 @@ fast/innerHTML/001.html
 fast/innerHTML/002.html
 fast/innerHTML/003.html
 fast/innerHTML/006.html
-fast/inspector/matchedrules.html
-fast/inspector/style.html
+fast/inspector-support/matchedrules.html
+fast/inspector-support/style.html
 fast/invalid/001.html
 fast/invalid/002.html
 fast/invalid/003.html
diff --git a/WebKit/win/WebKit.vcproj/Interfaces.vcproj b/WebKit/win/WebKit.vcproj/Interfaces.vcproj
index ad82d94..b9509d6 100644
--- a/WebKit/win/WebKit.vcproj/Interfaces.vcproj
+++ b/WebKit/win/WebKit.vcproj/Interfaces.vcproj
@@ -944,7 +944,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Interfaces\IWebInspector.idl"
+			RelativePath="..\Interfaces\IWebInspector.idl" 
 			>
 			<FileConfiguration
 				Name="Debug|Win32"

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list