WebKit Bugzilla
New
Browse
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
RESOLVED FIXED
51147
More rebaselining needed for new-run-webkit-tests update
https://bugs.webkit.org/show_bug.cgi?id=51147
Summary
More rebaselining needed for new-run-webkit-tests update
Cosmin Truta
Reported
2010-12-15 15:34:43 PST
While working on
bug 51018
, I missed some expectation files that did not show up in my testing. The regression
bug 51135
occurred upon landing the patch for
bug 36983
.
Attachments
Rebaseline
(3.18 KB, patch)
2010-12-15 15:56 PST
,
Cosmin Truta
jamesr
: review-
Details
Formatted Diff
Diff
Rebaseline
(6.10 KB, patch)
2010-12-16 10:27 PST
,
Cosmin Truta
no flags
Details
Formatted Diff
Diff
Show Obsolete
(1)
View All
Add attachment
proposed patch, testcase, etc.
Cosmin Truta
Comment 1
2010-12-15 15:56:32 PST
Created
attachment 76702
[details]
Rebaseline
James Robinson
Comment 2
2010-12-15 16:45:37 PST
Comment on
attachment 76702
[details]
Rebaseline The change to LayoutTests/http/tests/misc/authentication-sent-to-redirect-expected.txt should not be necessary.
Cosmin Truta
Comment 3
2010-12-16 10:27:56 PST
Created
attachment 76781
[details]
Rebaseline In addition to the Chromium-related rebaselining, I am also fixing plugins/document-open.html.
Cosmin Truta
Comment 4
2010-12-16 10:31:48 PST
(In reply to
comment #2
)
> The change to LayoutTests/http/tests/misc/authentication-sent-to-redirect-expected.txt should not be necessary.
For some odd reason, even with the new change done by the author, I still had to add newlines for this test to the expectation files from platform/chromium-mac/ and platform/chromium-win/. I tested all rebaselines on chromium-mac and chromium-linux.
WebKit Commit Bot
Comment 5
2010-12-16 10:53:49 PST
Comment on
attachment 76781
[details]
Rebaseline Rejecting
attachment 76781
[details]
from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-3', 'apply-attachment', '--non-interactive', 76781]" exit_code: 2 Last 500 characters of output: ailed to merge in the changes. Patch failed at 0001 2010-12-16 Yury Semikhatsky <
yurys@chromium.org
> When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at WebKitTools/Scripts/update-webkit line 132. Failed to run "['WebKitTools/Scripts/update-webkit']" exit_code: 2 Full output:
http://queues.webkit.org/results/7154067
Cosmin Truta
Comment 6
2010-12-16 11:24:59 PST
(In reply to
comment #5
)
> (From update of
attachment 76781
[details]
) > Rejecting
attachment 76781
[details]
from commit-queue.
I don't understand this failure: "CONFLICT (content): Merge conflict in WebCore/ChangeLog. Failed to merge in the changes." I did not submit a WebCore/ChangeLog. Could this be another tooling malfunction, perhaps?
Cosmin Truta
Comment 7
2010-12-16 12:44:14 PST
Setting cq? flag again.
WebKit Commit Bot
Comment 8
2010-12-16 13:09:03 PST
Comment on
attachment 76781
[details]
Rebaseline Rejecting
attachment 76781
[details]
from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-3', 'apply-attachment', '--non-interactive', 76781]" exit_code: 2 Last 500 characters of output: ailed to merge in the changes. Patch failed at 0001 2010-12-16 Yury Semikhatsky <
yurys@chromium.org
> When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at WebKitTools/Scripts/update-webkit line 132. Failed to run "['WebKitTools/Scripts/update-webkit']" exit_code: 2 Full output:
http://queues.webkit.org/results/7108087
WebKit Commit Bot
Comment 9
2010-12-16 13:39:43 PST
Comment on
attachment 76781
[details]
Rebaseline Rejecting
attachment 76781
[details]
from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-3', 'apply-attachment', '--non-interactive', 76781]" exit_code: 2 Last 500 characters of output: ailed to merge in the changes. Patch failed at 0001 2010-12-16 Yury Semikhatsky <
yurys@chromium.org
> When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at WebKitTools/Scripts/update-webkit line 132. Failed to run "['WebKitTools/Scripts/update-webkit']" exit_code: 2 Full output:
http://queues.webkit.org/results/7108088
Adam Barth
Comment 10
2010-12-16 13:46:09 PST
Comment on
attachment 76781
[details]
Rebaseline Clearing flags on attachment: 76781 Committed
r74211
: <
http://trac.webkit.org/changeset/74211
>
Adam Barth
Comment 11
2010-12-16 13:46:15 PST
All reviewed patches have been landed. Closing bug.
Eric Seidel (no email)
Comment 12
2010-12-16 14:21:30 PST
Sorry, the queue got upset. Still not sure how its repository got corrupted so. I'm fixing it now.
Note
You need to
log in
before you can comment on or make changes to this bug.
Top of Page
Format For Printing
XML
Clone This Bug