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

yurys at chromium.org yurys at chromium.org
Wed Dec 22 15:37:05 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit e5026cc27b40ce7bd4f3f55df4e1faa69b4347b0
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 9 12:38:34 2010 +0000

    2010-11-09  Yury Semikhatsky  <yurys at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: debugger-autocontinue-on-syntax-error.html should restore debugger state to disabled
            https://bugs.webkit.org/show_bug.cgi?id=49244
    
            * inspector/debugger-autocontinue-on-syntax-error-expected.txt:
            * inspector/debugger-autocontinue-on-syntax-error.html:
            * platform/chromium/inspector/debugger-autocontinue-on-syntax-error-expected.txt: Renamed from LayoutTests/platform/chromium-win/inspector/debugger-autocontinue-on-syntax-error-expected.txt.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71623 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c369cb1..8991c58 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-09  Yury Semikhatsky  <yurys at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: debugger-autocontinue-on-syntax-error.html should restore debugger state to disabled
+        https://bugs.webkit.org/show_bug.cgi?id=49244
+
+        * inspector/debugger-autocontinue-on-syntax-error-expected.txt:
+        * inspector/debugger-autocontinue-on-syntax-error.html:
+        * platform/chromium/inspector/debugger-autocontinue-on-syntax-error-expected.txt: Renamed from LayoutTests/platform/chromium-win/inspector/debugger-autocontinue-on-syntax-error-expected.txt.
+
 2010-11-09  Dai Mikurube  <dmikurube at google.com>
 
         Reviewed by Kent Tamura.
diff --git a/LayoutTests/inspector/debugger-autocontinue-on-syntax-error-expected.txt b/LayoutTests/inspector/debugger-autocontinue-on-syntax-error-expected.txt
index 4b31b6e..52f6d3a 100644
--- a/LayoutTests/inspector/debugger-autocontinue-on-syntax-error-expected.txt
+++ b/LayoutTests/inspector/debugger-autocontinue-on-syntax-error-expected.txt
@@ -4,5 +4,5 @@ Tests that debugger won't stop on syntax errors even if "pause on uncaught excep
 
 Debugger was enabled.
 Page reloaded.
-DONE.
+Debugger was disabled.
 
diff --git a/LayoutTests/inspector/debugger-autocontinue-on-syntax-error.html b/LayoutTests/inspector/debugger-autocontinue-on-syntax-error.html
index fd56208..918ef5f 100644
--- a/LayoutTests/inspector/debugger-autocontinue-on-syntax-error.html
+++ b/LayoutTests/inspector/debugger-autocontinue-on-syntax-error.html
@@ -19,8 +19,7 @@ function test()
     function reloadInspectedPage()
     {
         InspectorTest.reloadPage(function() {
-            InspectorTest.addResult("DONE.");
-            InspectorTest.completeTest();
+            InspectorTest.completeDebuggerTest();
         });
     }
 
diff --git a/LayoutTests/platform/chromium-win/inspector/debugger-autocontinue-on-syntax-error-expected.txt b/LayoutTests/platform/chromium-win/inspector/debugger-autocontinue-on-syntax-error-expected.txt
deleted file mode 100644
index bca3ec8..0000000
--- a/LayoutTests/platform/chromium-win/inspector/debugger-autocontinue-on-syntax-error-expected.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-CONSOLE MESSAGE: line 1: Uncaught SyntaxError: Unexpected token )
-CONSOLE MESSAGE: line 1: Uncaught SyntaxError: Unexpected token )
-Tests that debugger won't stop on syntax errors even if "pause on uncaught exceptions" is on.
-
-Debugger was enabled.
-Page reloaded.
-DONE.
diff --git a/LayoutTests/platform/chromium/inspector/debugger-autocontinue-on-syntax-error-expected.txt b/LayoutTests/platform/chromium/inspector/debugger-autocontinue-on-syntax-error-expected.txt
new file mode 100755
index 0000000..76635ef
--- /dev/null
+++ b/LayoutTests/platform/chromium/inspector/debugger-autocontinue-on-syntax-error-expected.txt
@@ -0,0 +1,7 @@
+CONSOLE MESSAGE: line 1: Uncaught SyntaxError: Unexpected token )
+CONSOLE MESSAGE: line 1: Uncaught SyntaxError: Unexpected token )
+Tests that debugger won't stop on syntax errors even if "pause on uncaught exceptions" is on.
+
+Debugger was enabled.
+Page reloaded.
+Debugger was disabled.

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list