Bug 15565 - DumpRenderTree needs to communicate dump's file type to run-webkit-tests
Summary: DumpRenderTree needs to communicate dump's file type to run-webkit-tests
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 523.x (Safari 3)
Hardware: Mac OS X 10.4
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks: 15558
  Show dependency treegraph
 
Reported: 2007-10-19 10:53 PDT by Eric Seidel (no email)
Modified: 2008-07-21 02:18 PDT (History)
2 users (show)

See Also:


Attachments
Add Content-Type support to DumpRenderTree and run-webkit-tests (11.48 KB, patch)
2008-07-04 19:58 PDT, Eric Seidel (no email)
no flags Details | Formatted Diff | Diff
Add Content-Type support to DumpRenderTree and run-webkit-tests (128.07 KB, patch)
2008-07-05 00:23 PDT, Eric Seidel (no email)
no flags Details | Formatted Diff | Diff
Add Content-Type support to DumpRenderTree and run-webkit-tests (18.52 KB, patch)
2008-07-05 00:36 PDT, Eric Seidel (no email)
sam: review+
Details | Formatted Diff | Diff
Move expected.txt files to expected.webarchive (no other changes) (109.58 KB, patch)
2008-07-05 00:37 PDT, Eric Seidel (no email)
sam: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Eric Seidel (no email) 2007-10-19 10:53:01 PDT
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.
Comment 1 Eric Seidel (no email) 2008-07-04 19:58:59 PDT
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(-)
Comment 2 Eric Seidel (no email) 2008-07-05 00:23:05 PDT
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(-)
Comment 3 Eric Seidel (no email) 2008-07-05 00:23:49 PDT
Comment on attachment 22093 [details]
Add Content-Type support to DumpRenderTree and run-webkit-tests

Sadly, this seems to fail to understand file moves. :(
Comment 4 Eric Seidel (no email) 2008-07-05 00:36:59 PDT
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(-)
Comment 5 Eric Seidel (no email) 2008-07-05 00:37:03 PDT
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(-)
Comment 6 Eric Seidel (no email) 2008-07-09 15:44:51 PDT
r35076
Comment 7 David Kilzer (:ddkilzer) 2008-07-20 15:36:02 PDT
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.

Comment 8 Eric Seidel (no email) 2008-07-20 23:34:28 PDT
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.
Comment 9 David Kilzer (:ddkilzer) 2008-07-21 02:18:59 PDT
(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.