Bug 15754 – webarchive layout tests fail when WebKit directory path contains symlinks

• Component: Tools / Tests
• Status: RESOLVED FIXED

[Anders Carlsson]

The diffs all look like:

--- /tmp/layout-test-results/webarchive/archive-empty-frame-dom-expected.txt	2007-10-29 11:55:19.000000000 -0700
+++ /tmp/layout-test-results/webarchive/archive-empty-frame-dom-actual.txt	2007-10-29 11:55:19.000000000 -0700
@@ -29,7 +29,7 @@
 		<key>WebResourceTextEncodingName</key>
 		<string>UTF-8</string>
 		<key>WebResourceURL</key>
-		<string>file:///LayoutTests/webarchive/archive-empty-frame-dom.html</string>
+		<string>file:///Users/andersca/WebKit/OpenSource/LayoutTests/webarchive/archive-empty-frame-dom.html</string>
 	</dict>
 	<key>WebSubframeArchives</key>
 	<array>

Running run-webkit-tests from elsewhere works fine.

[David Kilzer (:ddkilzer)]

There is code in WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm that attempts to normalize the directories embedded in .webarchive files to make the test results repeatable.  Apparently, it is not working as expected in this case.

It would be interesting to see what cwdURL in serializeWebArchiveToXML(WebArchive*) is in cases where it works and where it doesn't.

[David Kilzer (:ddkilzer)]

Anders' ~/WebKit directory is a symlink to a directory on /Volumes.  So the code in DRT to remove directory paths probably isn't resolving the symlink when it should (or is resolving the symlink when it should not).

[David Kilzer (:ddkilzer)]

Created attachment 19422 [details]
Patch v1

Proposed fix.

[Geoffrey Garen]

This patch looks OK to me, but I don't think it will fix the whole problem: there are a few webarchive tests that are not located in LayoutTests/webarchive. For example, there are svg webarchive tests.

[David Kilzer (:ddkilzer)]

Created attachment 19447 [details]
Patch v2

(In reply to comment #4)
> This patch looks OK to me, but I don't think it will fix the whole problem:
> there are a few webarchive tests that are not located in
> LayoutTests/webarchive. For example, there are svg webarchive tests.

Thanks for catching this.  I fixed this by searching backwards in the URL for "/LayoutTests/" instead of searching forward for "/LayoutTests/webarchive/".  Assuming we never create any subdirectories named "LayoutTests" under "LayoutTests" with webarchive tests in them, this will just work!

I also ran all of the layout tests this time.  The SVG tests did fail with the previous patch.  They all pass now with this patch, as do LayoutTests/webarchive.

Sorry it took so long to fix this.

[Darin Adler]

Comment on attachment 19447 [details]
Patch v2

r=me

[David Kilzer (:ddkilzer)]

Committed revision 30666.