| Summary: | Make fast/dom/object-embed-plugin-scripting.html compatible with non-Mac ports | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | Robert Hogan <robert> | ||||||||||
| Component: | Tools / Tests | Assignee: | Robert Hogan <robert> | ||||||||||
| Status: | RESOLVED FIXED | ||||||||||||
| Severity: | Normal | CC: | aroben, commit-queue, dbates, dglazkov, eric, evan, ggaren, ossy | ||||||||||
| Priority: | P2 | ||||||||||||
| Version: | 528+ (Nightly build) | ||||||||||||
| Hardware: | PC | ||||||||||||
| OS: | OS X 10.5 | ||||||||||||
| Attachments: |
|
||||||||||||
|
Description
Robert Hogan
2011-05-02 05:39:50 PDT
Created attachment 91914 [details]
Patch
Created attachment 91915 [details]
Patch
Comment on attachment 91915 [details]
Patch
LGTM.
Comment on attachment 91915 [details] Patch Rejecting attachment 91915 [details] from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-7', 'apply-..." exit_code: 2 Last 500 characters of output: rm/chromium/test_expectations.txt patching file LayoutTests/platform/qt/Skipped patching file LayoutTests/plugins/object-embed-plugin-scripting-expected.txt patching file LayoutTests/plugins/object-embed-plugin-scripting.html LayoutTests/plugins/resources/apple.gif: unknown git binary patch format at /mnt/git/webkit-commit-queue/Tools/Scripts/VCSUtils.pm line 1825. Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Eric Seidel', u'--force']" exit_code: 29 Full output: http://queues.webkit.org/results/8533416 Looks like svn-apply is still sick? Created attachment 92978 [details]
Patch
Comment on attachment 92978 [details] Patch Rejecting attachment 92978 [details] from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-7', 'apply-..." exit_code: 2 Last 500 characters of output: m bug 59930. Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force']" exit_code: 2 Parsed 5 diffs from patch file(s). patching file LayoutTests/ChangeLog patch: **** Only garbage was found in the patch input. rm 'LayoutTests/fast/dom/resources/articles.m4a' patching file LayoutTests/platform/chromium/test_expectations.txt patching file LayoutTests/platform/qt/Skipped Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force']" exit_code: 2 Full output: http://queues.webkit.org/results/8684044 (In reply to comment #6) > Created an attachment (id=92978) [details] > Patch How did you create this patch? (In reply to comment #8) > (In reply to comment #6) > > Created an attachment (id=92978) [details] [details] > > Patch > > How did you create this patch? git. is there something wrong with props of the gif? (In reply to comment #9) > (In reply to comment #8) > > (In reply to comment #6) > > > Created an attachment (id=92978) [details] [details] [details] > > > Patch > > > > How did you create this patch? > > git. is there something wrong with props of the gif? No. The issue is that this patch contains a diff that removes an empty file. Unfortunately svn-{apply, unapply} fails to handle such diffs. We need to fix bug #29684. Therefore, we cannot land this patch via the commit queue; => we will need to land this patch by hand. (In reply to comment #10) > No. The issue is that this patch contains a diff that removes an empty file. For completeness, the empty file that is being removed is LayoutTests/fast/dom/resources/articles.m4a. Committed r86440: <http://trac.webkit.org/changeset/86440> (In reply to comment #12) > Committed r86440: <http://trac.webkit.org/changeset/86440> fast/dom/object-embed-plugin-scripting.html fails on our Qt Snow Leopard bot: http://build.webkit.sed.hu/waterfall Could you fix it, or add this test to qt-mac/Skipped list? --- /buildbot/snowleopard-qt-release/snowleopard-qt-intel-release/build/layout-test-results/plugins/object-embed-plugin-scripting-expected.txt 2011-05-14 01:59:22.000000000 -0700 +++ /buildbot/snowleopard-qt-release/snowleopard-qt-intel-release/build/layout-test-results/plugins/object-embed-plugin-scripting-actual.txt 2011-05-14 01:59:22.000000000 -0700 @@ -2,22 +2,22 @@ Each test below states its expected outcome. -plugin <object> with nested plugin <embed>: should have a plugin and does +plugin <object> with nested plugin <embed>: should have a plugin and does not -plugin <embed> netsted in plugin <object>: should have a plugin and does +plugin <embed> netsted in plugin <object>: should have a plugin and does not empty <object> with nested plugin <embed>: should not have a plugin and does not -plugin <embed> nested in empty <object>: should have a plugin and does +plugin <embed> nested in empty <object>: should have a plugin and does not plugin <embed> nested in image <object>: should not have a plugin and does not plugin <embed> nested in empty <object> nested in plugin <object>: should not have a plugin and does not -standalone plugin <embed>: should have a plugin and does +standalone plugin <embed>: should have a plugin and does not -plugin <object> with nested plugin <embed> of the same name should have a plugin and does +plugin <object> with nested plugin <embed> of the same name should have a plugin and does not -empty <object> with nested plugin <embed> of the same name should have a plugin and does +empty <object> with nested plugin <embed> of the same name should have a plugin and does not Robert, could you make the Qt Mac bot green again, please? Created attachment 93672 [details]
Patch
Comment on attachment 93672 [details]
Patch
r=me
The commit-queue encountered the following flaky tests while processing attachment 93672 [details]: http/tests/websocket/tests/bad-handshake-crash.html bug 54370 (author: abarth@webkit.org) The commit-queue is continuing to process your patch. Comment on attachment 93672 [details] Patch Clearing flags on attachment: 93672 Committed r86613: <http://trac.webkit.org/changeset/86613> All reviewed patches have been landed. Closing bug. |