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

pfeldman at chromium.org pfeldman at chromium.org
Wed Dec 22 12:03:47 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 75e4542500debcfe61161479308b1e8592e8d904
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 13 09:55:16 2010 +0000

    2010-08-13  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Chromium DevTools: brush up test expectations.
            https://bugs.webkit.org/show_bug.cgi?id=43959
    
            * platform/chromium/inspector/console-dir-expected.txt: Added.
            * platform/chromium/inspector/console-format-expected.txt: Added.
            * platform/chromium/inspector/timeline-event-dispatch-expected.txt: Renamed from LayoutTests/platform/chromium-win/inspector/timeline-event-dispatch-expected.txt.
            * platform/chromium/inspector/timeline-mark-timeline-expected.txt: Renamed from LayoutTests/platform/chromium-win/inspector/timeline-mark-timeline-expected.txt.
            * platform/chromium/inspector/timeline-network-resource-expected.txt: Renamed from LayoutTests/platform/chromium-win/inspector/timeline-network-resource-expected.txt.
            * platform/chromium/inspector/timeline-paint-expected.txt: Renamed from LayoutTests/platform/chromium-win/inspector/timeline-paint-expected.txt.
            * platform/chromium/inspector/timeline-parse-html-expected.txt: Renamed from LayoutTests/platform/chromium-win/inspector/timeline-parse-html-expected.txt.
            * platform/chromium/test_expectations.txt:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65309 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index fec6036..cfda857 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-08-13  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Chromium DevTools: brush up test expectations.
+        https://bugs.webkit.org/show_bug.cgi?id=43959
+
+        * platform/chromium/inspector/console-dir-expected.txt: Added.
+        * platform/chromium/inspector/console-format-expected.txt: Added.
+        * platform/chromium/inspector/timeline-event-dispatch-expected.txt: Renamed from LayoutTests/platform/chromium-win/inspector/timeline-event-dispatch-expected.txt.
+        * platform/chromium/inspector/timeline-mark-timeline-expected.txt: Renamed from LayoutTests/platform/chromium-win/inspector/timeline-mark-timeline-expected.txt.
+        * platform/chromium/inspector/timeline-network-resource-expected.txt: Renamed from LayoutTests/platform/chromium-win/inspector/timeline-network-resource-expected.txt.
+        * platform/chromium/inspector/timeline-paint-expected.txt: Renamed from LayoutTests/platform/chromium-win/inspector/timeline-paint-expected.txt.
+        * platform/chromium/inspector/timeline-parse-html-expected.txt: Renamed from LayoutTests/platform/chromium-win/inspector/timeline-parse-html-expected.txt.
+        * platform/chromium/test_expectations.txt:
+
 2010-08-12  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Gavin Barraclough.
diff --git a/LayoutTests/platform/chromium/inspector/console-dir-expected.txt b/LayoutTests/platform/chromium/inspector/console-dir-expected.txt
new file mode 100644
index 0000000..c9f6e38
--- /dev/null
+++ b/LayoutTests/platform/chromium/inspector/console-dir-expected.txt
@@ -0,0 +1,24 @@
+CONSOLE MESSAGE: line 9: test1,test2
+CONSOLE MESSAGE: line 10: [object NodeList]
+CONSOLE MESSAGE: line 11: [object XPathResult]
+Tests that console logging dumps proper messages.
+
+Array[2]
+    0 = "test1"
+    1 = "test2"
+    length = 2
+    __proto__ = Array[0]
+NodeList[1]
+    0 = HTMLHtmlElement
+    length = 1
+    __proto__ = NodeList
+XPathResult
+    booleanValue = Error: TYPE_ERR: DOM XPath Exception 52
+    invalidIteratorState = false
+    numberValue = Error: TYPE_ERR: DOM XPath Exception 52
+    resultType = 4
+    singleNodeValue = Error: TYPE_ERR: DOM XPath Exception 52
+    snapshotLength = Error: TYPE_ERR: DOM XPath Exception 52
+    stringValue = Error: TYPE_ERR: DOM XPath Exception 52
+    __proto__ = XPathResult
+
diff --git a/LayoutTests/platform/chromium/inspector/console-format-collections-expected.txt b/LayoutTests/platform/chromium/inspector/console-format-collections-expected.txt
new file mode 100644
index 0000000..85cb38b
--- /dev/null
+++ b/LayoutTests/platform/chromium/inspector/console-format-collections-expected.txt
@@ -0,0 +1,19 @@
+CONSOLE MESSAGE: line 15: [object NodeList]
+CONSOLE MESSAGE: line 19: [object HTMLCollection]
+CONSOLE MESSAGE: line 23: [object HTMLOptionsCollection]
+CONSOLE MESSAGE: line 27: undefined
+CONSOLE MESSAGE: line 31: [object HTMLCollection]
+CONSOLE MESSAGE: line 35: [object NodeList]
+CONSOLE MESSAGE: line 41: 1,2,
+Tests that console nicely formats HTML Collections and NodeLists.
+
+console-format-collections.html:15[<select id="sel" name="sel">…</select>]
+console-format-collections.html:19[<script src="../http/tests/inspector/inspector-test.js"></script>, <script src="../http/tests/inspector/console-tests.js"></script>, <script>…</script>]
+console-format-collections.html:23[]
+console-format-collections.html:27[<html>…</html>, <head>…</head>, <script src="../http/tests/inspector/inspector-test.js"></script>, <script src="../http/tests/inspector/console-tests.js"></script>, <script>…</script>, <body onload="onload()">…</body>, <p>
+Tests that console nicely formats HTML Collections and NodeLists.
+</p>, <div style="display:none">…</div>, <form id="f">…</form>, <select id="sel" name="sel">…</select>, <option value="1">one</option>, <option value="2">two</option>, <input type="radio" name="x" value="x1">, <input type="radio" name="x" value="x2">, <div id="output" style="white-space: pre; "></div>]
+console-format-collections.html:31[<select id="sel" name="sel">…</select>, <input type="radio" name="x" value="x1">, <input type="radio" name="x" value="x2">]
+console-format-collections.html:35[<input type="radio" name="x" value="x1">, <input type="radio" name="x" value="x2">]
+console-format-collections.html:41[1, Array[2]]
+
diff --git a/LayoutTests/platform/chromium/inspector/console-format-expected.txt b/LayoutTests/platform/chromium/inspector/console-format-expected.txt
new file mode 100644
index 0000000..326265b
--- /dev/null
+++ b/LayoutTests/platform/chromium/inspector/console-format-expected.txt
@@ -0,0 +1,85 @@
+CONSOLE MESSAGE: line 12: Message format number %i, %d and %f
+CONSOLE MESSAGE: line 13: Message %s for %s
+CONSOLE MESSAGE: line 14: Object %o
+CONSOLE MESSAGE: line 20: test,test2,,,test4
+CONSOLE MESSAGE: line 21: %o
+CONSOLE MESSAGE: line 22: %O
+CONSOLE MESSAGE: line 52: /^url\(\s*(?:(?:"(?:[^\\\"]|(?:\\[\da-f]{1,6}\s?|\.))*"|'(?:[^\\\']|(?:\\[\da-f]{1,6}\s?|\.))*')|(?:[!#$%&*-~\w]|(?:\\[\da-f]{1,6}\s?|\.))*)\s*\)/i
+CONSOLE MESSAGE: line 53: /^url\(\s*(?:(?:"(?:[^\\\"]|(?:\\[\da-f]{1,6}\s?|\.))*"|'(?:[^\\\']|(?:\\[\da-f]{1,6}\s?|\.))*')|(?:[!#$%&*-~\w]|(?:\\[\da-f]{1,6}\s?|\.))*)\s*\)/i
+CONSOLE MESSAGE: line 52: /foo\\bar\sbaz/i
+CONSOLE MESSAGE: line 53: /foo\\bar\sbaz/i
+CONSOLE MESSAGE: line 52: test
+CONSOLE MESSAGE: line 53: test
+CONSOLE MESSAGE: line 52: test named "test"
+CONSOLE MESSAGE: line 53: test named "test"
+CONSOLE MESSAGE: line 52: Error
+CONSOLE MESSAGE: line 53: Error
+CONSOLE MESSAGE: line 52: [object HTMLBodyElement]
+CONSOLE MESSAGE: line 53: [object HTMLBodyElement]
+CONSOLE MESSAGE: line 52: function () { return 1; }
+CONSOLE MESSAGE: line 53: function () { return 1; }
+CONSOLE MESSAGE: line 52: function () {
+        return 2;
+    }
+CONSOLE MESSAGE: line 53: function () {
+        return 2;
+    }
+CONSOLE MESSAGE: line 52: 0.12
+CONSOLE MESSAGE: line 53: 0.12
+CONSOLE MESSAGE: line 52: http://webkit.org/
+CONSOLE MESSAGE: line 53: http://webkit.org/
+CONSOLE MESSAGE: line 52: null
+CONSOLE MESSAGE: line 53: 
+CONSOLE MESSAGE: line 52: undefined
+CONSOLE MESSAGE: line 53: 
+Tests that console logging dumps proper messages.
+
+console-format.html:12Message format number 1, 2 and 3.5
+console-format.html:13Message format for string
+console-format.html:14Object Object
+console-format.html:20["test", "test2", undefined, undefined, "test4"]
+console-format.html:21["test", "test2", undefined, undefined, "test4"]
+console-format.html:22Array[5]
+console-format.html:52/^url\(\s*(?:(?:"(?:[^\\\"]|(?:\\[\da-f]{1,6}\s?|\.))*"|'(?:[^\\\']|(?:\\[\da-f]{1,6}\s?|\.))*')|(?:[!#$%&*-~\w]|(?:\\[\da-f]{1,6}\s?|\.))*)\s*\)/i
+console-format.html:53[/^url\(\s*(?:(?:"(?:[^\\\"]|(?:\\[\da-f]{1,6}\s?|\.))*"|'(?:[^\\\']|(?:\\[\da-f]{1,6}\s?|\.))*')|(?:[!#$%&*-~\w]|(?:\\[\da-f]{1,6}\s?|\.))*)\s*\)/i]
+/^url\(\s*(?:(?:"(?:[^\\\"]|(?:\\[\da-f]{1,6}\s?|\.))*"|'(?:[^\\\']|(?:\\[\da-f]{1,6}\s?|\.))*')|(?:[!#$%&*-~\w]|(?:\\[\da-f]{1,6}\s?|\.))*)\s*\)/i
+console-format.html:52/foo\\bar\sbaz/i
+console-format.html:53[/foo\\bar\sbaz/i]
+/foo\\bar\sbaz/i
+console-format.html:52test
+console-format.html:53["test"]
+"test"
+console-format.html:52test named "test"
+console-format.html:53["test named "test""]
+"test named "test""
+console-format.html:52Error
+console-format.html:53[Error]
+Error
+console-format.html:52<body onload="onload()">…</body>
+console-format.html:53[<body onload="onload()">…</body>]
+<body onload="onload()">…</body>
+console-format.html:52function () { return 1; }
+console-format.html:53[function () { return 1; }]
+function () { return 1; }
+console-format.html:52function () {
+        return 2;
+    }
+console-format.html:53[function () {
+        return 2;
+    }]
+function () {
+        return 2;
+    }
+console-format.html:520.12
+console-format.html:53[0.12]
+0.12
+console-format.html:52http://webkit.org/
+console-format.html:53["http://webkit.org/"]
+"http://webkit.org/"
+console-format.html:52null
+console-format.html:53[null]
+null
+console-format.html:52undefined
+console-format.html:53[undefined]
+undefined
+
diff --git a/LayoutTests/platform/chromium-win/inspector/timeline-event-dispatch-expected.txt b/LayoutTests/platform/chromium/inspector/timeline-event-dispatch-expected.txt
similarity index 100%
rename from LayoutTests/platform/chromium-win/inspector/timeline-event-dispatch-expected.txt
rename to LayoutTests/platform/chromium/inspector/timeline-event-dispatch-expected.txt
diff --git a/LayoutTests/platform/chromium-win/inspector/timeline-mark-timeline-expected.txt b/LayoutTests/platform/chromium/inspector/timeline-mark-timeline-expected.txt
similarity index 100%
rename from LayoutTests/platform/chromium-win/inspector/timeline-mark-timeline-expected.txt
rename to LayoutTests/platform/chromium/inspector/timeline-mark-timeline-expected.txt
diff --git a/LayoutTests/platform/chromium-win/inspector/timeline-network-resource-expected.txt b/LayoutTests/platform/chromium/inspector/timeline-network-resource-expected.txt
similarity index 100%
rename from LayoutTests/platform/chromium-win/inspector/timeline-network-resource-expected.txt
rename to LayoutTests/platform/chromium/inspector/timeline-network-resource-expected.txt
diff --git a/LayoutTests/platform/chromium-win/inspector/timeline-paint-expected.txt b/LayoutTests/platform/chromium/inspector/timeline-paint-expected.txt
similarity index 100%
rename from LayoutTests/platform/chromium-win/inspector/timeline-paint-expected.txt
rename to LayoutTests/platform/chromium/inspector/timeline-paint-expected.txt
diff --git a/LayoutTests/platform/chromium-win/inspector/timeline-parse-html-expected.txt b/LayoutTests/platform/chromium/inspector/timeline-parse-html-expected.txt
similarity index 100%
rename from LayoutTests/platform/chromium-win/inspector/timeline-parse-html-expected.txt
rename to LayoutTests/platform/chromium/inspector/timeline-parse-html-expected.txt
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index cd97db9..96ef8d3 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -201,8 +201,6 @@ WONTFIX SKIP : http/tests/security/MessagePort/event-listener-context.html = FAI
 WONTFIX SKIP : inspector/extensions.html = FAIL
 WONTFIX SKIP : inspector/extensions-api.html = FAIL
 
-BUG43574 SKIP : inspector/debugger-breakpoints-not-activated-on-reload.html = CRASH
-
 // Implement java testing harness.
 BUG36681 DEFER SKIP : java = TEXT
 // Chrome does not support Java LiveConnect.
@@ -730,8 +728,6 @@ BUGWK40520 DEFER : fast/forms/interactive-validation-prevented.html = TEXT
 BUG26734 LINUX MAC SKIP : inspector = PASS
 BUG26734 LINUX MAC SKIP : http/tests/inspector = PASS
 BUG26734 LINUX MAC SKIP : http/tests/inspector-enabled = PASS
-BUG26734 SKIP : inspector/console-format-collections.html = TEXT
-BUG26734 SKIP : inspector/console-format.html = TEXT
 
 // These tests need to be changed to be platform independent.
 BUG13907 : http/tests/media/remove-while-loading.html = TIMEOUT
@@ -2482,11 +2478,9 @@ BUG32675 LINUX : fast/repaint/trailing-floats-root-line-box-overflow.html = IMAG
 // Flaky tests found during the roll.
 BUG32679 LINUX DEBUG : http/tests/navigation/lockedhistory-iframe.html = TEXT PASS
 BUG32684 WIN : inspector/timeline-layout.html = TEXT PASS
-BUG35519 WIN SKIP : http/tests/inspector/inspect-iframe-from-different-domain.html = PASS
 BUG32688 MAC DEBUG : fast/lists/inlineBoxWrapperNullCheck.html = TEXT PASS
 BUG32689 MAC LINUX DEBUG : http/tests/security/mixedContent/about-blank-iframe-in-main-frame.html = TEXT PASS
 BUG32693 MAC DEBUG : svg/dom/SVGRectElement/rect-modify-rx.svg = TEXT PASS
-BUG35773 WIN LINUX : inspector/console-dir.html = CRASH TEXT PASS
 
 BUG33293 SKIP : fast/media/lifetime.html = TIMEOUT
 
@@ -2553,9 +2547,6 @@ BUG36966 : fast/loader/about-blank-hash-kept.html = FAIL
 
 BUG37463 MAC DEBUG : svg/custom/transform-ignore-after-invalid.svg = PASS CRASH
 
-// WebKit roll 55512:55584
-BUG37540 MAC SKIP : inspector/console-dir.html = CRASH TEXT PASS
-
 // Bugs that went unreported when we upstreamed run_webkit_tests
 // New test, added http://trac.webkit.org/changeset/55737
 BUG37896 : fast/events/remove-child-onscroll.html = TIMEOUT
@@ -2572,7 +2563,6 @@ BUG37896 WIN DEBUG : fast/text/firstline/001.html = PASS CRASH
 BUG37896 LINUX MAC DEBUG : fast/text/firstline/001.html = PASS CRASH TIMEOUT
 // Added in http://trac.webkit.org/changeset/55587
 BUG37896 LINUX DEBUG : fast/images/svg-as-background.html = TIMEOUT
-BUG37869 MAC LINUX SKIP : inspector/timeline-network-resource.html = CRASH
 // Three flaky tests noticed during a sheriff rotation.
 BUG37962 MAC LINUX DEBUG : fast/dom/HTMLElement/bdo.html = CRASH PASS
 BUG37962 LINUX DEBUG : fast/forms/multiple-form-submission-protection-mouse.html = CRASH PASS
@@ -2822,9 +2812,6 @@ BUG46872 : fast/preloader = TEXT
 BUG46872 : fast/dom/HTMLLinkElement/prefetch.html = TIMEOUT
 BUG46872 : http/tests/loading/preload-slow-loading.php = TEXT
 
-// Became a flaky crash in http://trac.webkit.org/log/?verbose=on&rev=61417&stop_rev=61393
-BUG46974 WIN : inspector/audits-panel-functional.html = CRASH PASS
-
 BUG47035 WIN DEBUG : fast/loader/stateobjects/document-destroyed-navigate-back-with-fragment-scroll.html = PASS TEXT
 
 // CSS3 Hyphenation landed in http://trac.webkit.org/changeset/61548

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list