Bug 15565 – DumpRenderTree needs to communicate dump's file type to run-webkit-tests

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Eric Seidel (no email)]

DumpRenderTree needs to communicate dump's file type to run-webkit-tests

It needs to do this for webarchives (.webarchive) and .png files and .pdf files.

[Eric Seidel (no email)]

Created attachment 22090 [details]
Add Content-Type support to DumpRenderTree and run-webkit-tests

 WebKitTools/DumpRenderTree/cg/ImageDiffCG.cpp      |    4 +-
 .../DumpRenderTree/cg/PixelDumpSupportCG.cpp       |    2 +-
 WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm   |    5 ++
 WebKitTools/Scripts/run-webkit-tests               |   64 +++++++++++++-------
 4 files changed, 50 insertions(+), 25 deletions(-)

[Eric Seidel (no email)]

Created attachment 22093 [details]
Add Content-Type support to DumpRenderTree and run-webkit-tests

 .../archive-empty-frame-dom-expected.txt           |   54 ----
 .../archive-empty-frame-dom-expected.webarchive    |   54 ++++
 .../archive-empty-frame-source-expected.txt        |   54 ----
 .../archive-empty-frame-source-expected.webarchive |   54 ++++
 .../archive-with-unencoded-url-expected.txt        |   88 -------
 .../archive-with-unencoded-url-expected.webarchive |   88 +++++++
 .../webarchive/test-body-background-expected.txt   |   86 -------
 .../test-body-background-expected.webarchive       |   86 +++++++
 .../webarchive/test-css-import-expected.txt        |  114 ---------
 .../webarchive/test-css-import-expected.webarchive |  114 +++++++++
 .../test-duplicate-resources-expected.txt          |  259 --------------------
 .../test-duplicate-resources-expected.webarchive   |  259 ++++++++++++++++++++
 LayoutTests/webarchive/test-frameset-expected.txt  |  152 ------------
 .../webarchive/test-frameset-expected.webarchive   |  152 ++++++++++++
 LayoutTests/webarchive/test-img-src-expected.txt   |   87 -------
 .../webarchive/test-img-src-expected.webarchive    |   87 +++++++
 LayoutTests/webarchive/test-input-src-expected.txt |   89 -------
 .../webarchive/test-input-src-expected.webarchive  |   89 +++++++
 LayoutTests/webarchive/test-link-href-expected.txt |   52 ----
 .../webarchive/test-link-href-expected.webarchive  |   52 ++++
 .../webarchive/test-object-data-expected.txt       |   87 -------
 .../test-object-data-expected.webarchive           |   87 +++++++
 .../webarchive/test-script-src-expected.txt        |   46 ----
 .../webarchive/test-script-src-expected.webarchive |   46 ++++
 .../webarchive/test-table-background-expected.txt  |   90 -------
 .../test-table-background-expected.webarchive      |   90 +++++++
 .../webarchive/test-td-background-expected.txt     |   93 -------
 .../test-td-background-expected.webarchive         |   93 +++++++
 .../webarchive/test-xml-stylesheet-expected.txt    |   51 ----
 .../test-xml-stylesheet-expected.webarchive        |   52 ++++
 WebKitTools/DumpRenderTree/cg/ImageDiffCG.cpp      |    4 +-
 .../DumpRenderTree/cg/PixelDumpSupportCG.cpp       |    2 +-
 WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm   |    5 +
 WebKitTools/Scripts/run-webkit-tests               |  160 +++++++------
 34 files changed, 1497 insertions(+), 1479 deletions(-)

[Eric Seidel (no email)]

Comment on attachment 22093 [details]
Add Content-Type support to DumpRenderTree and run-webkit-tests

Sadly, this seems to fail to understand file moves. :(

[Eric Seidel (no email)]

Created attachment 22094 [details]
Add Content-Type support to DumpRenderTree and run-webkit-tests

 WebKitTools/DumpRenderTree/cg/ImageDiffCG.cpp      |    4 +-
 .../DumpRenderTree/cg/PixelDumpSupportCG.cpp       |    2 +-
 WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm   |    5 +
 WebKitTools/Scripts/run-webkit-tests               |  160 +++++++++++---------
 4 files changed, 94 insertions(+), 77 deletions(-)

[Eric Seidel (no email)]

Created attachment 22095 [details]
Move expected.txt files to expected.webarchive (no other changes)

 .../archive-empty-frame-dom-expected.txt           |   54 ----
 .../archive-empty-frame-dom-expected.webarchive    |   54 ++++
 .../archive-empty-frame-source-expected.txt        |   54 ----
 .../archive-empty-frame-source-expected.webarchive |   54 ++++
 .../archive-with-unencoded-url-expected.txt        |   88 -------
 .../archive-with-unencoded-url-expected.webarchive |   88 +++++++
 .../webarchive/test-body-background-expected.txt   |   86 -------
 .../test-body-background-expected.webarchive       |   86 +++++++
 .../webarchive/test-css-import-expected.txt        |  114 ---------
 .../webarchive/test-css-import-expected.webarchive |  114 +++++++++
 .../test-duplicate-resources-expected.txt          |  259 --------------------
 .../test-duplicate-resources-expected.webarchive   |  259 ++++++++++++++++++++
 LayoutTests/webarchive/test-frameset-expected.txt  |  152 ------------
 .../webarchive/test-frameset-expected.webarchive   |  152 ++++++++++++
 LayoutTests/webarchive/test-img-src-expected.txt   |   87 -------
 .../webarchive/test-img-src-expected.webarchive    |   87 +++++++
 LayoutTests/webarchive/test-input-src-expected.txt |   89 -------
 .../webarchive/test-input-src-expected.webarchive  |   89 +++++++
 LayoutTests/webarchive/test-link-href-expected.txt |   52 ----
 .../webarchive/test-link-href-expected.webarchive  |   52 ++++
 .../webarchive/test-object-data-expected.txt       |   87 -------
 .../test-object-data-expected.webarchive           |   87 +++++++
 .../webarchive/test-script-src-expected.txt        |   46 ----
 .../webarchive/test-script-src-expected.webarchive |   46 ++++
 .../webarchive/test-table-background-expected.txt  |   90 -------
 .../test-table-background-expected.webarchive      |   90 +++++++
 .../webarchive/test-td-background-expected.txt     |   93 -------
 .../test-td-background-expected.webarchive         |   93 +++++++
 .../webarchive/test-xml-stylesheet-expected.txt    |   51 ----
 .../test-xml-stylesheet-expected.webarchive        |   52 ++++
 30 files changed, 1403 insertions(+), 1402 deletions(-)

[Eric Seidel (no email)]

r35076

[David Kilzer (:ddkilzer)]

It's unfortunate that the webarchive test results now end in *.webarchive.  They really are NOT webarchive files, so anyone trying to double-click on them in Mac OS X will wonder why they're blank when loaded.

[Eric Seidel (no email)]

Oh?  They're not webarchive files?  I guess that's why Safari hits an ASSERT when trying to load them.   Had I realized that, I would not have had them change to *.webarchive.

It's very easy to make them .txt again.  A single line patch to run-webkit-tests will fix that.

[David Kilzer (:ddkilzer)]

(In reply to comment #8)
> Oh?  They're not webarchive files?  I guess that's why Safari hits an ASSERT
> when trying to load them.   Had I realized that, I would not have had them
> change to *.webarchive.

They start out as webarchives in DumpRenderTree, but then I "convert" them to plain text and massage some paths so that the result is the same on all Macs.  :)

> It's very easy to make them .txt again.  A single line patch to
> run-webkit-tests will fix that.

Thanks!  I'll look into that.