[Chromium] fast/dom/resource-locations-in-created-html-document.html fails on win32
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 4 Aug 2011 01:44:14 +0000 (01:44 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 4 Aug 2011 01:44:14 +0000 (01:44 +0000)
https://bugs.webkit.org/show_bug.cgi?id=65521

Patch by Noel Gordon <noel.gordon@gmail.com> on 2011-08-03
Reviewed by Adam Barth.

file: scheme URI paths on Windows include the disk drive reference (C: for example).
Refer to http://blogs.msdn.com/b/ie/archive/2006/12/06/file-uris-in-windows.aspx.

* fast/dom/resource-locations-in-created-html-document.html:
* platform/chromium/test_expectations.txt:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@92339 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/fast/dom/resource-locations-in-created-html-document.html
LayoutTests/platform/chromium/test_expectations.txt

index 6fcf3d9478eb31b0e5a03054a4a559b52ef883b3..bc14a2eafa4df50c9ff0d5c9efc8e44fbb6c459f 100644 (file)
@@ -1,3 +1,16 @@
+2011-08-03  Noel Gordon  <noel.gordon@gmail.com>
+
+        [Chromium] fast/dom/resource-locations-in-created-html-document.html fails on win32
+        https://bugs.webkit.org/show_bug.cgi?id=65521
+
+        Reviewed by Adam Barth.
+
+        file: scheme URI paths on Windows include the disk drive reference (C: for example).
+        Refer to http://blogs.msdn.com/b/ie/archive/2006/12/06/file-uris-in-windows.aspx.
+
+        * fast/dom/resource-locations-in-created-html-document.html:
+        * platform/chromium/test_expectations.txt:
+
 2011-08-03  Ryosuke Niwa  <rniwa@webkit.org>
 
         Revert an erroneous rebaseline from r92315.
index bd31ed5d92a1c5e5a4f6adc22c521b11b19dbc1d..a2368140a9acfc24dcdb9295f3d4e9305bde8a5d 100644 (file)
         htmlDoc.open();
         htmlDoc.write('<html><img id="theImage" src="/test"></html>');
 
-        if (htmlDoc.getElementById('theImage').src == 'file:///test')
+        var path = htmlDoc.getElementById('theImage').src;
+
+        if (path == 'file:///test')
+            document.getElementById('result').innerHTML = 'SUCCESS';
+        else if (/^file:\/\/\/[C-Z]:\/test$/.test(path))  // MS Windows.
             document.getElementById('result').innerHTML = 'SUCCESS';
     }
     </script>
index 92d4fdc8b46ed40d2347bf328aa89a2b46c31a20..117f5504cf7a4bfd911ed912dcd48a3f66db7be9 100644 (file)
@@ -1041,13 +1041,6 @@ BUGCR10323 WIN : http/tests/xmlhttprequest/xmlhttprequest-no-content-length-onPr
 
 // Post-MERGE failures: these will all need to be fixed one day
 
-// This test assumes we're using unix paths and looks for a file:///test
-// path.  We correctly return file:///C:/test on Windows.  We should fix
-// upstream
-// Expectations for this test changed upstream. We should fix this test, but
-// it doesn't need to block the current release
-BUGCR10325 WIN : fast/dom/resource-locations-in-created-html-document.html = FAIL
-
 // GURL/KURL difference in handling of "http:".
 // New test. We should fix it, but it doesn't need to block the current release
 BUGCR7386 : http/tests/security/postMessage/invalid-origin-throws-exception.html = FAIL