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

ojan at chromium.org ojan at chromium.org
Wed Dec 22 16:39:01 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 033ce71b8bc798ad569d47e07d896f6977099d03
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 29 22:02:12 2010 +0000

    2010-11-29  Gavin Peters  <gavinp at chromium.org>
    
            Reviewed by Ojan Vafai.
    
            unloadable-script not testing both cases
            https://bugs.webkit.org/show_bug.cgi?id=50177
    
            * http/tests/misc/unloadable-script-expected.txt:
            * http/tests/misc/unloadable-script.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72830 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4f9ab7e..f8291bf 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-29  Gavin Peters  <gavinp at chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        unloadable-script not testing both cases
+        https://bugs.webkit.org/show_bug.cgi?id=50177
+
+        * http/tests/misc/unloadable-script-expected.txt:
+        * http/tests/misc/unloadable-script.html:
+
 2010-11-29  Cosmin Truta  <ctruta at chromium.org>
 
         Reviewed by Nikolas Zimmermann.
diff --git a/LayoutTests/http/tests/misc/unloadable-script-expected.txt b/LayoutTests/http/tests/misc/unloadable-script-expected.txt
index fbe11b0..4a9a7b9 100644
--- a/LayoutTests/http/tests/misc/unloadable-script-expected.txt
+++ b/LayoutTests/http/tests/misc/unloadable-script-expected.txt
@@ -1,6 +1,9 @@
 CONSOLE MESSAGE: line 0: Not allowed to load local resource: foobar
+CONSOLE MESSAGE: line 0: Not allowed to load local resource: foobar
 Test for bug 13584: <script> code wrongly assumes requests can't fail.
 
 No crash == SUCCESS.
 
 onerror called (good!)
+
+onerror called (good!)
diff --git a/LayoutTests/http/tests/misc/unloadable-script.html b/LayoutTests/http/tests/misc/unloadable-script.html
index fbc4096..4f20549 100644
--- a/LayoutTests/http/tests/misc/unloadable-script.html
+++ b/LayoutTests/http/tests/misc/unloadable-script.html
@@ -25,7 +25,7 @@ function log(message) {
         document.getElementById('test_script').src = "file:///foobar";
         
         script = document.createElement("script");
-        script.setAttribute("src", "resources/foobar");
+        script.setAttribute("src", "file:///foobar");
         document.body.appendChild(script);
     </script>
 </body>

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list